diff --git a/NuGet.config b/NuGet.config index 3d9d049ad235c3dacedfc799606559537737966d..1e2458c409ad5db51451646e43bccff30fc6b453 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,8 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-943474c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-943474ca/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-efcore --> - <add key="darc-int-dotnet-efcore-41de762" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629/nuget/v3/index.json" /> - <add key="darc-int-dotnet-efcore-41de762-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-efcore-41de762-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629-1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-efcore --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> @@ -27,12 +23,8 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-efcore --> - <add key="darc-int-dotnet-efcore-41de762-1" value="true" /> - <add key="darc-int-dotnet-efcore-41de762-2" value="true" /> - <add key="darc-int-dotnet-efcore-41de762" value="true" /> <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-943474c" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index deca4db3bf65201da86f3657f5481ff5686481b7..34b0846cce2ca828bf4e141c1f5bf1044ff8d7bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -280,22 +280,22 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha> + <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22558.2"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22558.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha> + <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22558.2"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22558.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha> + <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.2"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha> + <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 8e53fc123582568827dd3f9920a647336877f7cb..621d735f30c57971bacfd9cf5fe3ad6534ebff0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,8 +131,8 @@ <MicrosoftEntityFrameworkCoreVersion>6.0.11</MicrosoftEntityFrameworkCoreVersion> <MicrosoftEntityFrameworkCoreDesignVersion>6.0.11</MicrosoftEntityFrameworkCoreDesignVersion> <!-- Packages from dotnet/arcade --> - <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksInstallersVersion> - <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksTemplatingVersion> + <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksInstallersVersion> + <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksTemplatingVersion> </PropertyGroup> <!-- diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d43f076dbfc9896fc85f2ca451a122..b09ea669f9c0aa85ceb501f218ffca02e278b264 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index 28ed39115e2754962847c4c80171c82b28772f59..2bddd26bf7d0f04218f8ccea343753ab844d8780 100644 --- a/global.json +++ b/global.json @@ -29,7 +29,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.7" } }