Skip to content

Commit 231ec1d

Browse files
committed
Merged PR 51692: [release/9.0] Update dependencies from dotnet/arcade (#5189)
[release/9.0] Update dependencies from dotnet/arcade (#5189) [release/9.0] Update dependencies from dotnet/arcade ---- #### AI description (iteration 1) #### PR Classification This pull request performs a dependency update by bumping dotnet/arcade versions and refining related configurations. #### PR Summary The changes update several build-tool dependency versions to 9.0.0-beta.25366.1 while cleaning up related configuration files and adjusting a tool initialization check. - `eng/Version.Details.xml`: Updated arcade dependency versions and SHA values. - `NuGet.config`: Removed internal package source entries. - `eng/Versions.props` and `global.json`: Updated arcade-related dependency versions. - `eng/common/tools.ps1`: Modified the MSBuild initialization logic to include an additional environment variable check. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
2 parents e6a3168 + 7cf4629 commit 231ec1d

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,29 +152,29 @@
152152
</Dependency>
153153
</ProductDependencies>
154154
<ToolsetDependencies>
155-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25366.1">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
157+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25325.4">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25366.1">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
161+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25325.4">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25366.1">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
165+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25325.4">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25366.1">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
169+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25366.1">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
173+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25325.4">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25366.1">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
177+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksArchivesVersion>
16-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksInstallersVersion>
15+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksArchivesVersion>
16+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksInstallersVersion>
1717
<!-- corefx -->
1818
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1919
<SystemDataSqlClientVersion>4.9.0</SystemDataSqlClientVersion>

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
@@ -3,8 +3,8 @@
33
"dotnet": "9.0.107"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25325.4",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25366.1",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)