From 0ebf7e7d7c3e2a93356301b5e8d9f5fa5c27a548 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 15:54:47 +0000 Subject: [PATCH 1/3] 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 --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 8 ++++---- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7cb10daf21b9..372e9c6eb4dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 665843ccd4de..5c3cf29db762 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -302,22 +302,22 @@ https://github.com/dotnet/runtime cd2d83798383716204eb580eb5c89ef5b73b8ec2 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 diff --git a/eng/Versions.props b/eng/Versions.props index 030499652c19..20753713c666 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,8 +134,8 @@ 7.0.0 7.0.0 - 7.0.0-beta.22513.4 - 7.0.0-beta.22513.4 + 7.0.0-beta.22558.4 + 7.0.0-beta.22558.4 7.0.0-alpha.1.22505.1 diff --git a/global.json b/global.json index 6aacb21feb2e..036d4a00133b 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "7.0.100-rtm.22478.12" + "version": "7.0.100" }, "tools": { - "dotnet": "7.0.100-rtm.22478.12", + "dotnet": "7.0.100", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -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" } } From 3a39346bd6dfad60010c34462a720648cb34d68c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 10 Nov 2022 10:49:45 -0800 Subject: [PATCH 2/3] Revert "Adding `init-nuget` to Linux ARM64 (#44745)" This reverts commit 905fdaeac11abd955419e6f5a1ab0348c7624c98. --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index bfb716fa44fb..4a18bc21bfa5 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -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) From 71938013f1c050103b75aa7457093359267e8902 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 10 Nov 2022 10:49:57 -0800 Subject: [PATCH 3/3] Revert "Adding nuget --version workaround" This reverts commit b4e2e8cd56895611231e955efefecc672e538b33. --- .azure/pipelines/ci.yml | 4 ++-- eng/build.sh | 30 ------------------------------ 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 4a18bc21bfa5..bc52c55d6136 100644 --- 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) diff --git a/eng/build.sh b/eng/build.sh index 093b04affdd4..a6b6ba99be44 100755 --- 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=