Skip to content

Commit 684cae0

Browse files
DustinCampbellDustinCampbell
committed
Merge branch 'main' into remove-dead-syntax
2 parents 947d638 + 71902a5 commit 684cae0

File tree

694 files changed

+2381
-3080
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

694 files changed

+2381
-3080
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<_BasicReferenceAssembliesVersion>1.7.2</_BasicReferenceAssembliesVersion>
1414
<_BenchmarkDotNetPackageVersion>0.13.5.2136</_BenchmarkDotNetPackageVersion>
1515
<_MicrosoftVisualStudioExtensibilityTestingVersion>0.1.187-beta</_MicrosoftVisualStudioExtensibilityTestingVersion>
16-
<_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0</_MicrosoftCodeAnalysisAnalyzersPackageVersion>
16+
<_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.12.0-beta1.25201.17</_MicrosoftCodeAnalysisAnalyzersPackageVersion>
1717
<_RoslynDiagnosticAnalyzersPackageVersion>3.11.0-beta1.24508.2</_RoslynDiagnosticAnalyzersPackageVersion>
1818
<_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</_MicrosoftVisualStudioLanguageServicesPackageVersion>
1919
<_XunitPackageVersion>2.9.2</_XunitPackageVersion>

‎eng/SetupVSHive.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ $vsRegEdit = Join-Path (Join-Path (Join-Path $vsDir 'Common7') 'IDE') 'VSRegEdit
1212
$hive = "RoslynDev"
1313
&$vsRegEdit set "$vsDir" $hive HKCU "Roslyn\Internal\OnOff\Features" OOP64Bit dword 0
1414

15+
&$vsRegEdit set "$vsDir" $hive HKLM "Profile" DisableFirstLaunchDialog dword 1
16+
1517
Write-Host "-- VS Info --"
1618
$isolationIni = Join-Path (Join-Path (Join-Path $vsDir 'Common7') 'IDE') 'devenv.isolation.ini'
1719
Get-Content $isolationIni | Write-Host

‎eng/Version.Details.xml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,87 +6,87 @@
66
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
77
</Dependency>
88
<!-- Intermediate is necessary for source build. -->
9-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.617601">
9+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.620402">
1010
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
11-
<Sha>1556b6c639edcaee959013681afcf2e66b118537</Sha>
11+
<Sha>14f833124983b36ac4083338d0cad6caefce2489</Sha>
1212
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1313
</Dependency>
14-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25176.5">
14+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25201.17">
1515
<Uri>https://github.com/dotnet/roslyn</Uri>
16-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
16+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.14.0-3.25176.5">
18+
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.14.0-3.25201.17">
1919
<Uri>https://github.com/dotnet/roslyn</Uri>
20-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
20+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.14.0-3.25176.5">
22+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.14.0-3.25201.17">
2323
<Uri>https://github.com/dotnet/roslyn</Uri>
24-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
24+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.14.0-3.25176.5">
26+
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.14.0-3.25201.17">
2727
<Uri>https://github.com/dotnet/roslyn</Uri>
28-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
28+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25176.5">
30+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25201.17">
3131
<Uri>https://github.com/dotnet/roslyn</Uri>
32-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
32+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.14.0-3.25176.5">
34+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.14.0-3.25201.17">
3535
<Uri>https://github.com/dotnet/roslyn</Uri>
36-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
36+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25176.5">
38+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25201.17">
3939
<Uri>https://github.com/dotnet/roslyn</Uri>
40-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
40+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25176.5">
42+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25201.17">
4343
<Uri>https://github.com/dotnet/roslyn</Uri>
44-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
44+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.14.0-3.25176.5">
46+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.14.0-3.25201.17">
4747
<Uri>https://github.com/dotnet/roslyn</Uri>
48-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
48+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.14.0-3.25176.5">
50+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.14.0-3.25201.17">
5151
<Uri>https://github.com/dotnet/roslyn</Uri>
52-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
52+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.14.0-3.25176.5">
54+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.14.0-3.25201.17">
5555
<Uri>https://github.com/dotnet/roslyn</Uri>
56-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
56+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.14.0-3.25176.5">
58+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.14.0-3.25201.17">
5959
<Uri>https://github.com/dotnet/roslyn</Uri>
60-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
60+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.14.0-3.25176.5">
62+
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.14.0-3.25201.17">
6363
<Uri>https://github.com/dotnet/roslyn</Uri>
64-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
64+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0-3.25176.5">
66+
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0-3.25201.17">
6767
<Uri>https://github.com/dotnet/roslyn</Uri>
68-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
68+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25176.5">
70+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25201.17">
7171
<Uri>https://github.com/dotnet/roslyn</Uri>
72-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
72+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25176.5">
74+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25201.17">
7575
<Uri>https://github.com/dotnet/roslyn</Uri>
76-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
76+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.14.0-3.25176.5">
78+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.14.0-3.25201.17">
7979
<Uri>https://github.com/dotnet/roslyn</Uri>
80-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
80+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.14.0-3.25176.5">
82+
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.14.0-3.25201.17">
8383
<Uri>https://github.com/dotnet/roslyn</Uri>
84-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
84+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
8585
</Dependency>
8686
<!-- Intermediate is necessary for source build. -->
87-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25176.5">
87+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25201.17">
8888
<Uri>https://github.com/dotnet/roslyn</Uri>
89-
<Sha>0a79874a2ea127eafd3a95a2a474d1e38b85221d</Sha>
89+
<Sha>467f6bb29a6281fe0d0b7f8b2066281d17e83fac</Sha>
9090
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
9191
</Dependency>
9292
</ProductDependencies>
@@ -96,14 +96,14 @@
9696
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
9797
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
99+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25204.5">
100100
<Uri>https://github.com/dotnet/arcade</Uri>
101-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
101+
<Sha>97cbc7361ff28b2948c8182720c166a744049f55</Sha>
102102
</Dependency>
103103
<!-- Intermediate is necessary for source build. -->
104-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25161.4">
104+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25204.5">
105105
<Uri>https://github.com/dotnet/arcade</Uri>
106-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
106+
<Sha>97cbc7361ff28b2948c8182720c166a744049f55</Sha>
107107
<SourceBuild RepoName="arcade" ManagedOnly="true" />
108108
</Dependency>
109109
<!-- Necessary for source-build. This allows Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages

‎eng/Versions.props‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,27 @@
4949
<PropertyGroup Label="Automated">
5050
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.2-servicing.22064.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
5151
<MicrosoftNETCorePlatformsPackageVersion>6.0.1</MicrosoftNETCorePlatformsPackageVersion>
52-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.617601</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
53-
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.25161.4</MicrosoftSourceBuildIntermediatearcadePackageVersion>
54-
<MicrosoftNetCompilersToolsetPackageVersion>4.14.0-3.25176.5</MicrosoftNetCompilersToolsetPackageVersion>
55-
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.14.0-3.25176.5</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
56-
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
57-
<MicrosoftCodeAnalysisCommonPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisCommonPackageVersion>
58-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisCSharpPackageVersion>
59-
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
60-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
61-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
62-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
63-
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
64-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
65-
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
66-
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
67-
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
68-
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
69-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
70-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
71-
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.14.0-3.25176.5</MicrosoftSourceBuildIntermediateroslynPackageVersion>
72-
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.14.0-3.25176.5</MicrosoftVisualStudioLanguageServicesPackageVersion>
52+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.620402</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
53+
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.25204.5</MicrosoftSourceBuildIntermediatearcadePackageVersion>
54+
<MicrosoftNetCompilersToolsetPackageVersion>4.14.0-3.25201.17</MicrosoftNetCompilersToolsetPackageVersion>
55+
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.14.0-3.25201.17</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
56+
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
57+
<MicrosoftCodeAnalysisCommonPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisCommonPackageVersion>
58+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisCSharpPackageVersion>
59+
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
60+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
61+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
62+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
63+
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
64+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
65+
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
66+
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
67+
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
68+
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
69+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
70+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25201.17</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
71+
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.14.0-3.25201.17</MicrosoftSourceBuildIntermediateroslynPackageVersion>
72+
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.14.0-3.25201.17</MicrosoftVisualStudioLanguageServicesPackageVersion>
7373
<!--
7474
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
7575
but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
@@ -104,7 +104,7 @@
104104
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
105105
</PropertyGroup>
106106
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
107-
<MicrosoftIORedistVersion>6.1.2</MicrosoftIORedistVersion>
108-
<SystemThreadingTasksExtensionsVersion>4.6.2</SystemThreadingTasksExtensionsVersion>
107+
<MicrosoftIORedistVersion>6.1.3</MicrosoftIORedistVersion>
108+
<SystemThreadingTasksExtensionsVersion>4.6.3</SystemThreadingTasksExtensionsVersion>
109109
</PropertyGroup>
110110
</Project>

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
45+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

‎eng/common/tools.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
57+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

0 commit comments

Comments
 (0)