Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20230…
Browse files Browse the repository at this point in the history
…616.6 (#2162)

[main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] committed Jun 19, 2023
1 parent c29db40 commit ca4ccab
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23309.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23316.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23309.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23316.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23309.8">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23316.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<!--Package versions-->
<PropertyGroup>
<MicrosoftBclTimeProviderVersion>8.0.0-preview.4.23220.7</MicrosoftBclTimeProviderVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23309.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23316.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
</Project>
4 changes: 4 additions & 0 deletions eng/common/dotnet-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ cpuname=$(uname -m)
case $cpuname in
arm64|aarch64)
buildarch=arm64
if [ "$(getconf LONG_BIT)" -lt 64 ]; then
# This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
buildarch=arm
fi
;;
loongarch64)
buildarch=loongarch64
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
}

# Minimum VS version to require.
$vsMinVersionReqdStr = '16.8'
$vsMinVersionReqdStr = '17.6'
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)

# If the version of msbuild is going to be xcopied,
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "8.0.100-preview.4.23260.5"
"version": "8.0.100-preview.5.23303.2"
},
"tools": {
"dotnet": "8.0.100-preview.4.23260.5",
"dotnet": "8.0.100-preview.5.23303.2",
"runtimes": {
"dotnet": [
"6.0.14",
Expand All @@ -16,7 +16,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23309.8"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23316.6",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23316.6"
}
}

0 comments on commit ca4ccab

Please sign in to comment.