Skip to content

Commit 75daaaa

Browse files
authored
[release/dev17.8] Update dependencies from dotnet/arcade (#77191)
This pull request updates the following dependencies [marker]: <> (Begin:d4267b14-6904-43d2-4c93-08dc6435e9e2) ## From https://github.com/dotnet/arcade - **Subscription**: d4267b14-6904-43d2-4c93-08dc6435e9e2 - **Build**: 20250211.4 - **Date Produced**: February 11, 2025 11:57:42 PM UTC - **Commit**: a319ada170a54ee87c7a81e3309948e3d3ea7aca - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.25060.1 to 8.0.0-beta.25111.4][1] - **Microsoft.DotNet.Helix.Sdk**: [from 8.0.0-beta.25060.1 to 8.0.0-beta.25111.4][1] [1]: dotnet/arcade@c255aae...a319ada [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates sdk.version to 8.0.113 - Updates tools.dotnet to 8.0.113 [marker]: <> (End:d4267b14-6904-43d2-4c93-08dc6435e9e2)
2 parents cb474bd + c7a2b31 commit 75daaaa

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
</Dependency>
2828
</ProductDependencies>
2929
<ToolsetDependencies>
30-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
30+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
32+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
3333
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3434
</Dependency>
3535
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
@@ -50,9 +50,9 @@
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
5151
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
53+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25111.4">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
55+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
5656
</Dependency>
5757
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
5858
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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') {

eng/targets/Settings.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
1717

18+
<!-- This servicing branch needs to continue to target net7.0. This disables the SDK check for EOL target frameworks. -->
19+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
20+
1821
<!-- Disable the implicit nuget fallback folder as it makes it hard to locate and copy ref assemblies to the test output folder -->
1922
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
2023
<ToolsetPackagesDir>$(RepoRoot)build\ToolsetPackages\</ToolsetPackagesDir>

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"sdk": {
3-
"version": "8.0.110",
3+
"version": "8.0.113",
44
"allowPrerelease": false,
55
"rollForward": "disable"
66
},
77
"tools": {
8-
"dotnet": "8.0.110",
8+
"dotnet": "8.0.113",
99
"vs": {
1010
"version": "17.8.0"
1111
},
1212
"xcopy-msbuild": "17.8.1-2"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4"
1717
}
1818
}

0 commit comments

Comments
 (0)