Skip to content

Commit af77884

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240109.4 (#6952)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23620.2 -> To Version 8.0.0-beta.24059.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent f7a3b61 commit af77884

File tree

5 files changed

+31
-18
lines changed

5 files changed

+31
-18
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23620.2">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
12+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23620.2">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24059.4">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
16+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23620.2">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24059.4">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
20+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23620.2">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24059.4">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
24+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23620.2">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24059.4">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
28+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3131
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -39,9 +39,9 @@
3939
<Uri>https://github.com/dotnet/xharness</Uri>
4040
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23620.2">
42+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24059.4">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
44+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
4545
</Dependency>
4646
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
4747
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<DotNetRuntime80Version>8.0.0</DotNetRuntime80Version>
8282
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8383
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
84-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23620.2</MicrosoftDotNetXUnitExtensionsVersion>
84+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24059.4</MicrosoftDotNetXUnitExtensionsVersion>
8585
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8686
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8787
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

eng/common/tools.ps1

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,15 @@ function InitializeBuildTool() {
601601
ExitWithExitCode 1
602602
}
603603
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
604-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
604+
605+
# Use override if it exists - commonly set by source-build
606+
if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
607+
$initializeBuildToolFramework="net8.0"
608+
} else {
609+
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
610+
}
611+
612+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
605613
} elseif ($msbuildEngine -eq "vs") {
606614
try {
607615
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

eng/common/tools.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,12 @@ function InitializeBuildTool {
341341
# return values
342342
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
343343
_InitializeBuildToolCommand="msbuild"
344-
_InitializeBuildToolFramework="net8.0"
344+
# use override if it exists - commonly set by source-build
345+
if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
346+
_InitializeBuildToolFramework="net8.0"
347+
else
348+
_InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
349+
fi
345350
}
346351

347352
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.100",
3+
"dotnet": "8.0.101",
44
"runtimes": {
55
"dotnet/x64": [
66
"$(DotNetRuntime60Version)"
@@ -11,8 +11,8 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23620.2",
15-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23620.2",
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4",
15+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24059.4",
1616
"Microsoft.Build.Traversal": "3.2.0",
1717
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
1818
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"

0 commit comments

Comments
 (0)