From df39b2aeda35b895f0c57f9945cec1a218bf27bb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 12 Nov 2022 01:45:30 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20221108.7 (#45042)
[release/6.0] Update dependencies from dotnet/arcade
---
NuGet.config | 8 --------
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 4 ++--
eng/common/dotnet-install.sh | 4 ++--
global.json | 4 ++--
5 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 3d9d049ad23..1e2458c409a 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 deca4db3bf6..34b0846cce2 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 8e53fc12358..621d735f30c 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 fdfeea66e7d..b09ea669f9c 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 28ed39115e2..2bddd26bf7d 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"
}
}
--
GitLab