[release/7.0] Update dependencies from dotnet/arcade (#44972)

* Update dependencies from https://github.com/dotnet/arcade build 20221108.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22513.4 -> To Version 7.0.0-beta.22558.4 * Revert "Adding `init-nuget` to Linux ARM64 (#44745)" This reverts commit 905fdae. * Revert "Adding nuget --version workaround" This reverts commit b4e2e8c. Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: William Godbe <[email protected]>
dotnet · Nov 10, 2022 · 5918bc9 · 5918bc9
1 parent 33d20ad
commit 5918bc9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 45 deletions.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -489,13 +489,13 @@ stages:
               $(_InternalRuntimeDownloadArgs)
           displayName: Run build.sh
         - script: git clean -xfd src/**/obj/;
-            ./dockerbuild.sh bionic --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs --init-nuget
+            ./dockerbuild.sh bionic --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs
             -p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=deb
             $(_BuildArgs)
             $(_InternalRuntimeDownloadArgs)
           displayName: Build Debian installers
         - script: git clean -xfd src/**/obj/;
-            ./dockerbuild.sh rhel --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs --init-nuget
+            ./dockerbuild.sh rhel --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs
             -p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm
             -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
             $(_BuildArgs)
@@ -568,7 +568,7 @@ stages:
               $(_InternalRuntimeDownloadArgs)
           displayName: Run build.sh
         - script: git clean -xfd src/**/obj/;
-            ./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs  --init-nuget
+            ./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs
             -p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm
             -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
             $(_BuildArgs)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -302,22 +302,22 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22513.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
+      <Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22513.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22558.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
+      <Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22513.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22558.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
+      <Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22513.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22558.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
+      <Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -134,8 +134,8 @@
     <MicrosoftEntityFrameworkCoreVersion>7.0.0</MicrosoftEntityFrameworkCoreVersion>
     <MicrosoftEntityFrameworkCoreDesignVersion>7.0.0</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22513.4</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22513.4</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22558.4</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22558.4</MicrosoftDotNetBuildTasksTemplatingVersion>
     <!-- Packages from dotnet/source-build-externals -->
     <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/xdt -->

diff --git a/eng/build.sh b/eng/build.sh
@@ -33,7 +33,6 @@ target_arch='x64'
 configuration=''
 runtime_source_feed=''
 runtime_source_feed_key=''
-init_nuget=false
 
 if [ "$(uname)" = "Darwin" ]; then
     target_os_name='osx'
@@ -83,8 +82,6 @@ Options:
     --runtime-source-feed             Additional feed that can be used when downloading .NET runtimes and SDKs
     --runtime-source-feed-key         Key for feed that can be used when downloading .NET runtimes and SDKs
 
-    --init-nuget                      Run nuget --version.
-
 Description:
     This build script installs required tools and runs an MSBuild command on this repository
     This script can be used to invoke various targets, such as targets to produce packages
@@ -211,9 +208,6 @@ while [[ $# -gt 0 ]]; do
         -ci)
             ci=true
             ;;
-        -init-nuget)
-            init_nuget=true
-            ;;
         -binarylog|-bl)
             binary_log=true
             ;;
@@ -365,30 +359,6 @@ export MSBUILDDEBUGPATH="$log_dir"
 _tmp_restore=$restore
 restore=true
 
-if [[ "$init_nuget" == true ]]; then
-    InitializeBuildTool
-
-    function RunBuildTool {
-        "$_InitializeBuildTool" "$@" || {
-        local exit_code=$?
-        # We should not Write-PipelineTaskError here because that message shows up in the build summary
-        # The build already logged an error, that's the reason it failed. Producing an error here only adds noise.
-        echo "Build failed with exit code $exit_code. Check errors above."
-        if [[ "$ci" == "true" ]]; then
-            Write-PipelineSetResult -result "Failed" -message "nuget execution failed."
-            # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
-            # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
-            ExitWithExitCode 0
-        else
-            ExitWithExitCode $exit_code
-        fi
-        }
-    }
-
-    echo 'Running dotnet nuget --version (issue: https://github.com/NuGet/Home/issues/12159#issuecomment-1278360511)'
-    RunBuildTool "nuget" "--version"
-fi
-
 InitializeToolset
 
 restore=$_tmp_restore=

diff --git a/global.json b/global.json
@@ -27,7 +27,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22513.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4"
   }
 }