Skip to content

Commit 1fd229d

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20231103.1 (#2300)
1 parent 43a52d5 commit 1fd229d

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23528.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23553.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
8+
<Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23528.2">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23553.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
12+
<Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23528.2">
14+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23553.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
16+
<Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
<PropertyGroup>
1515
<SystemCollectionsImmutableVersion>8.0.0-rc.1.23419.4</SystemCollectionsImmutableVersion>
1616
<MicrosoftBclTimeProviderVersion>8.0.0-rc.1.23419.4</MicrosoftBclTimeProviderVersion>
17-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23528.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
17+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23553.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
1818
</PropertyGroup>
1919
</Project>

eng/common/tools.sh

+6-1
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
},
1818
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2",
20-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23528.2"
19+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1",
20+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23553.1"
2121
}
2222
}

0 commit comments

Comments
 (0)