Skip to content

Commit 335a66e

Browse files
authored
Merge pull request #8676 from dotnet/darc-release/8.0.1xx-451810e1-e4e5-44df-8681-104dcaf46d13
[release/8.0.1xx] Update dependencies from dotnet/arcade
2 parents 4d0f12a + 9169aea commit 335a66e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Dependency>
1818
</ProductDependencies>
1919
<ToolsetDependencies>
20-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25064.11">
20+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
2121
<Uri>https://github.com/dotnet/arcade</Uri>
22-
<Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
22+
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
2323
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

eng/common/sdk-task.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

eng/common/tools.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
384384

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
388-
$defaultXCopyMSBuildVersion = '17.8.1-2'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
388+
$defaultXCopyMSBuildVersion = '17.12.0'
389389

390390
if (!$vsRequirements) {
391391
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "8.0.112"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6"
77
}
88
}

0 commit comments

Comments
 (0)