Skip to content

Commit

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

[feature/9.x] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Jun 6, 2024
1 parent 708cda1 commit cd94a18
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>333f90a3051f084e7af42b516b6bdd7ae8e004f3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24305.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24305.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087</Sha>
<Sha>f00e1ca5808b15b206042d50cad7cc1c69d3d938</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24305.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24305.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087</Sha>
<Sha>f00e1ca5808b15b206042d50cad7cc1c69d3d938</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24305.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24305.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087</Sha>
<Sha>f00e1ca5808b15b206042d50cad7cc1c69d3d938</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24305.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24305.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087</Sha>
<Sha>f00e1ca5808b15b206042d50cad7cc1c69d3d938</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24305.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24305.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087</Sha>
<Sha>f00e1ca5808b15b206042d50cad7cc1c69d3d938</Sha>
</Dependency>
<Dependency Name="Microsoft.FileFormats" Version="1.0.530501">
<Uri>https://github.com/dotnet/diagnostics</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
-->
<PropertyGroup Label="Automated">
<!-- dotnet/arcade references -->
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24305.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24305.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24305.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24305.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24305.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24305.5</MicrosoftDotNetXUnitExtensionsVersion>
<!-- dotnet/aspnetcore references -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-preview.6.24304.8</MicrosoftAspNetCoreAppRuntimewinx64Version>
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.0-preview.6.24304.8</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
Expand Down
8 changes: 4 additions & 4 deletions eng/common/cross/build-android-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ __NDK_Version=r21
usage()
{
echo "Creates a toolchain and sysroot used for cross-compiling for Android."
echo.
echo
echo "Usage: $0 [BuildArch] [ApiLevel]"
echo.
echo
echo "BuildArch is the target architecture of Android. Currently only arm64 is supported."
echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html"
echo.
echo
echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior"
echo "by setting the TOOLCHAIN_DIR environment variable"
echo.
echo
echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation,"
echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK."
echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.28-arm64. This file is to replace '/etc/os-release', which is not available for Android."
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24305.1"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.5",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24305.5"
}
}

0 comments on commit cd94a18

Please sign in to comment.