Skip to content

Replace Obsolete APIs #5234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 24 commits into from
Closed

Replace Obsolete APIs #5234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
34816bf
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 18, 2021
6d4450b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Aug 18, 2021
7703941
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 18, 2021
5991094
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 19, 2021
799d80d
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Aug 19, 2021
f68efe7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Aug 19, 2021
c1f930c
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 19, 2021
4d50cfa
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 20, 2021
afd0727
Accessibility: Port "GetClickablePoint returns error value when the e…
ryalanms Aug 20, 2021
04d5051
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 23, 2021
b65cdc5
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 23, 2021
50fb028
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 24, 2021
d5013fb
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 24, 2021
d04fb52
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 24, 2021
0c4d481
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 25, 2021
7ca62fe
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 25, 2021
0e0bf10
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 25, 2021
fa13a2f
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 26, 2021
0660667
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 26, 2021
7fa466e
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 27, 2021
8fa13be
[release/6.0-rc1] Update dependencies from dotnet/winforms (#5208)
dotnet-maestro[bot] Aug 30, 2021
d26acd0
Respond to PR feedback from https://github.com/dotnet/wpf/pull/5208 (…
eerhardt Aug 30, 2021
3f4f3a2
Replace Obsolete APIs
singhashish-wpf Sep 1, 2021
b9ae186
Change to NotSupportedException for Compatibility.
singhashish-wpf Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,12 @@
<Import Sdk="Microsoft.DotNet.Arcade.Wpf.Sdk"
Project="Sdk.targets"
Condition="!Exists('$(WpfArcadeSdkProps)') Or !Exists('$(WpfArcadeSdkTargets)')"/>

<!-- Temporarily remove analyzers from framework references until we can update to VS 2022 which handles them correctly
https://github.com/dotnet/wpf/issues/5224 -->
<Target Name="_RemoveFrameworkReferenceAnalyzers" AfterTargets="ResolveTargetingPackAssets">
<ItemGroup>
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != ''" />
</ItemGroup>
</Target>
</Project>
100 changes: 50 additions & 50 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,107 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-rc.1.21417.4">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-rc.1.21430.13">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>02ef8f0eba399925a34aeeb55642871511378e9e</Sha>
<Sha>bab479fa2de8644d36533ef8c35022ff4d6e0c13</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rc.1.21417.4">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rc.1.21430.13">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>02ef8f0eba399925a34aeeb55642871511378e9e</Sha>
<Sha>bab479fa2de8644d36533ef8c35022ff4d6e0c13</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rc.1.21417.2">
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rc.1.21419.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>552adb9a860d3e46354669315bbf72aa421ccdc1</Sha>
<Sha>4bc1c55c0abcb0ff62bdb534168a51be2224fe3f</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21418.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21418.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21418.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21418.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21418.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
44 changes: 22 additions & 22 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,44 @@
<VersionPrefix>6.0.0</VersionPrefix>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<SystemIOPackagingVersion>6.0.0-rc.1.21417.1</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-rc.1.21417.1</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>6.0.0-rc.1.21430.11</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-rc.1.21430.11</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.0-rc.1.21417.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.0-rc.1.21430.13</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-rc.1.21417.1</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-rc.1.21417.1</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-rc.1.21430.11</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-rc.1.21430.11</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21417.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21417.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21417.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.1.21417.1</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-rc.1.21417.1</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-rc.1.21417.1</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-rc.1.21417.1</SystemReflectionMetadataLoadContextVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21430.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21430.11</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21430.11</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.1.21430.11</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-rc.1.21430.11</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-rc.1.21430.11</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-rc.1.21430.11</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<SystemCodeDomPackageVersion>6.0.0-rc.1.21417.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-rc.1.21417.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-rc.1.21417.1</SystemDiagnosticsEventLogPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-rc.1.21430.11</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-rc.1.21430.11</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-rc.1.21430.11</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-rc.1.21417.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-rc.1.21417.1</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-rc.1.21417.1</SystemWindowsExtensionsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-rc.1.21430.11</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-rc.1.21430.11</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-rc.1.21430.11</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21413.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21413.4</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21413.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21418.12</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21418.12</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21418.12</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
Expand Down Expand Up @@ -80,6 +80,6 @@
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetWpfDncEngVersion>6.0.0-rc.1.21417.2</MicrosoftDotNetWpfDncEngVersion>
<MicrosoftDotNetWpfDncEngVersion>6.0.0-rc.1.21419.3</MicrosoftDotNetWpfDncEngVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions eng/common/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ function InitializeCustomToolset {
}

function Build {
TryLogClientIpAddress
InitializeToolset
InitializeCustomToolset

Expand Down
17 changes: 12 additions & 5 deletions eng/common/post-build/sourcelink-validation.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ $global:RepoFiles = @{}
$MaxParallelJobs = 16

$MaxRetries = 5
$RetryWaitTimeInSeconds = 30

# Wait time between check for system load
$SecondsBetweenLoadChecks = 10
Expand Down Expand Up @@ -99,9 +100,9 @@ $ValidatePackage = {
$Status = 200
$Cache = $using:RepoFiles

$totalRetries = 0
$attempts = 0

while ($totalRetries -lt $using:MaxRetries) {
while ($attempts -lt $using:MaxRetries) {
if ( !($Cache.ContainsKey($FilePath)) ) {
try {
$Uri = $Link -as [System.URI]
Expand All @@ -113,7 +114,7 @@ $ValidatePackage = {
else {
# If it's not a github link, we want to break out of the loop and not retry.
$Status = 0
$totalRetries = $using:MaxRetries
$attempts = $using:MaxRetries
}
}
catch {
Expand All @@ -123,9 +124,15 @@ $ValidatePackage = {
}

if ($Status -ne 200) {
$totalRetries++
$attempts++

if ($totalRetries -ge $using:MaxRetries) {
if ($attempts -lt $using:MaxRetries)
{
$attemptsLeft = $using:MaxRetries - $attempts
Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds"
Start-Sleep -Seconds $using:RetryWaitTimeInSeconds
}
else {
if ($NumFailedLinks -eq 0) {
if ($FailedFiles.Value -eq 0) {
Write-Host
Expand Down
1 change: 1 addition & 0 deletions eng/common/sdk-task.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ try {
}

if ($restore) {
Try-LogClientIpAddress
Build 'Restore'
}

Expand Down
Loading