Skip to content

Commit 38d9d05

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into merge/release/8.0.4xx-to-release/9.0.1xx
2 parents 68a0ae5 + c89e2c9 commit 38d9d05

File tree

5 files changed

+64
-68
lines changed

5 files changed

+64
-68
lines changed

‎NuGet.config

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,23 @@
2424
<!-- Begin: Package sources from dotnet-aspire -->
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-emsdk -->
27-
<add key="darc-pub-dotnet-emsdk-b567cdb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b567cdb6/nuget/v3/index.json" />
2827
<!-- End: Package sources from dotnet-emsdk -->
2928
<!-- Begin: Package sources from dotnet-aspnetcore -->
30-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da/nuget/v3/index.json" />
3129
<!-- End: Package sources from dotnet-aspnetcore -->
3230
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
33-
<add key="darc-pub-DotNet-msbuild-Trusted-9dcc26a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-9dcc26a5/nuget/v3/index.json" />
31+
<add key="darc-pub-DotNet-msbuild-Trusted-481b855" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-481b855f/nuget/v3/index.json" />
3432
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3533
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3634
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3735
<!-- Begin: Package sources from dotnet-runtime -->
38-
<add key="darc-int-dotnet-runtime-3c298d9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f/nuget/v3/index.json" />
3936
<!-- End: Package sources from dotnet-runtime -->
4037
<!-- Begin: Package sources from dotnet-templating -->
4138
<add key="darc-pub-dotnet-templating-861f0ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-861f0ec-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-3/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-861f0ec-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-2/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-861f0ec-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-1/nuget/v3/index.json" />
4242
<!-- End: Package sources from dotnet-templating -->
4343
<!-- Begin: Package sources from dotnet-windowsdesktop -->
44-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bd9e6e96/nuget/v3/index.json" />
4544
<!-- End: Package sources from dotnet-windowsdesktop -->
4645
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4746
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -68,15 +67,12 @@
6867
<!-- Begin: Package sources from dotnet-templating -->
6968
<!-- End: Package sources from dotnet-templating -->
7069
<!-- Begin: Package sources from dotnet-aspnetcore -->
71-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="true" />
7270
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
7371
<!-- End: Package sources from DotNet-msbuild-Trusted -->
7472
<!-- End: Package sources from dotnet-aspnetcore -->
7573
<!-- Begin: Package sources from dotnet-runtime -->
76-
<add key="darc-int-dotnet-runtime-3c298d9" value="true" />
7774
<!-- End: Package sources from dotnet-runtime -->
7875
<!-- Begin: Package sources from dotnet-windowsdesktop -->
79-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9" value="true" />
8076
<!-- End: Package sources from dotnet-windowsdesktop -->
8177
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8278
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>b567cdb6b8b461de79f2a2536a22ca3a67f2f33e</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.41">
76+
<Dependency Name="Microsoft.Build" Version="17.12.43">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
78+
<Sha>481b855f7315f967f9c14b83d4391ae05b7be1af</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.41-preview-25359-01">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.43-preview-25404-04">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
82+
<Sha>481b855f7315f967f9c14b83d4391ae05b7be1af</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.41-preview-25359-01">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.43-preview-25404-04">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
87+
<Sha>481b855f7315f967f9c14b83d4391ae05b7be1af</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">
@@ -97,43 +97,43 @@
9797
<Sha>47d4e3f91e4e5414b6dafbf14288b9c5a798ef99</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25329.7">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25404.5">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
102+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25329.7">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25404.5">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
107+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25329.7">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25404.5">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
112+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25329.7">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25404.5">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
116+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25329.7">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25404.5">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
120+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25329.7">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25404.5">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
124+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25329.7">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25404.5">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
128+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25329.7">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25404.5">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
132+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25329.7">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25404.5">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
136+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.7-servicing.25317.2">
139139
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25380.1">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
594+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25380.1">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
598+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25380.1">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
602+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25325.4">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25380.1">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
606+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25325.4">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25380.1">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
610+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25325.4">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25380.1">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
614+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25380.1">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
619+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.7">
@@ -631,14 +631,14 @@
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632632
<Sha>e156e649f28395d9d0ee1e848225a689b59e0fd3</Sha>
633633
</Dependency>
634-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25326.1">
634+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25381.1">
635635
<Uri>https://github.com/dotnet/scenario-tests</Uri>
636-
<Sha>270606f9f338c1c2dfb255b6f18bbcb5f085a06c</Sha>
636+
<Sha>0898abbb5899ef400b8372913c2320295798a687</Sha>
637637
</Dependency>
638638
<!-- Intermediate is necessary for source build. -->
639-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25326.1">
639+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25381.1">
640640
<Uri>https://github.com/dotnet/scenario-tests</Uri>
641-
<Sha>270606f9f338c1c2dfb255b6f18bbcb5f085a06c</Sha>
641+
<Sha>0898abbb5899ef400b8372913c2320295798a687</Sha>
642642
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
643643
</Dependency>
644644
<!--

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.41</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.41-preview-25359-01</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.43</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.43-preview-25404-04</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
@@ -204,14 +204,14 @@
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/roslyn -->
207-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25329.7</MicrosoftNetCompilersToolsetVersion>
208-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25329.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisPackageVersion>
210-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisCSharpPackageVersion>
211-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
207+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25404.5</MicrosoftNetCompilersToolsetVersion>
208+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25404.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisPackageVersion>
210+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisCSharpPackageVersion>
211+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
215215
</PropertyGroup>
216216
<PropertyGroup>
217217
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -261,7 +261,7 @@
261261
<PropertyGroup Label="Infrastructure and test only dependencies">
262262
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
263263
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
264-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25326.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
264+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25381.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
265265
</PropertyGroup>
266266
<PropertyGroup Label="Manually updated">
267267
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25325.4</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25325.4</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25325.4</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25380.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25380.1</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25380.1</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25380.1</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
416416

417417
# Locate Visual Studio installation or download x-copy msbuild.
418418
$vsInfo = LocateVisualStudio $vsRequirements
419-
if ($vsInfo -ne $null) {
419+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
420420
# Ensure vsInstallDir has a trailing slash
421421
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
422422
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)