From c125386caec39f9de42f96fa92392ce569430bfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 23:26:05 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#15151) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.22602.3 to 8.0.0-alpha.1.22628.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.22603.1 to 8.0.0-alpha.1.22631.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.5.0-beta.22612.4 to 12.5.0-beta.23053.5 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.1-beta.22612.4 to 7.0.1-beta.23053.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221214-01 to 17.6.0-preview-20230103-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22612.2 to 8.0.100-1.23053.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22613.14 to 4.5.0-3.23053.22 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.5.0-preview-22615-01 to 17.5.0-preview-23054-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.5.0-preview.3.130 to 6.5.0-preview.3.136 (parent: Microsoft.NET.Sdk) - Update ProjectBuildTests.cs - Don't crossgen ILLink which is no longer bundled - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8 - Merge remote-tracking branch 'upstream/darc-main-e0248016-a57a-4ad2-aa0c-03ad8d093d6b' into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8 - Add SuppressTfmSupportBuildWarnings=true in source-build - Merge branch 'darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8 - Update GenerateLayout logic to use DotNetBuildFromSourceFlavor vs DotNetBuildOffline - Add CA nowarn workaround - --amend --- eng/Version.Details.xml | 140 +++++++++--------- eng/Versions.props | 50 +++---- .../build-configuration.json | 4 + eng/common/native/init-compiler.sh | 79 +++++----- eng/common/templates/job/job.yml | 6 + eng/common/templates/job/onelocbuild.yml | 14 +- eng/common/tools.ps1 | 3 +- eng/common/tools.sh | 4 +- global.json | 4 +- .../repo-projects/Directory.Build.props | 1 + .../content/repo-projects/aspnetcore.proj | 8 +- src/redist/targets/Crossgen.targets | 3 - src/redist/targets/GenerateLayout.targets | 18 +-- test/EndToEnd/ProjectBuildTests.cs | 13 -- 14 files changed, 172 insertions(+), 175 deletions(-) create mode 100644 eng/common/BuildConfiguration/build-configuration.json diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67eaddb0f..e8a23af71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - c3b86bdbd46ba1dcb6d59b5c92120636065d9ebb + 86613c3d3e69faabc3f66fd722073f8d69225ffa - + https://github.com/dotnet/windowsdesktop - c3b86bdbd46ba1dcb6d59b5c92120636065d9ebb + 86613c3d3e69faabc3f66fd722073f8d69225ffa - + https://github.com/dotnet/windowsdesktop - c3b86bdbd46ba1dcb6d59b5c92120636065d9ebb + 86613c3d3e69faabc3f66fd722073f8d69225ffa - + https://github.com/dotnet/windowsdesktop - c3b86bdbd46ba1dcb6d59b5c92120636065d9ebb + 86613c3d3e69faabc3f66fd722073f8d69225ffa - + https://github.com/dotnet/runtime - 1a37caf773a3b857ccff49a31be3333d4fdc491f + 7bbee52b2aaa22f3116b96aedb6a758a2d5bd63b - + https://github.com/dotnet/runtime - 1a37caf773a3b857ccff49a31be3333d4fdc491f + 7bbee52b2aaa22f3116b96aedb6a758a2d5bd63b - + https://github.com/dotnet/runtime - 1a37caf773a3b857ccff49a31be3333d4fdc491f + 7bbee52b2aaa22f3116b96aedb6a758a2d5bd63b - + https://github.com/dotnet/runtime - 1a37caf773a3b857ccff49a31be3333d4fdc491f + 7bbee52b2aaa22f3116b96aedb6a758a2d5bd63b - + https://github.com/dotnet/runtime - 1a37caf773a3b857ccff49a31be3333d4fdc491f + 7bbee52b2aaa22f3116b96aedb6a758a2d5bd63b - + https://github.com/dotnet/runtime - 1a37caf773a3b857ccff49a31be3333d4fdc491f + 7bbee52b2aaa22f3116b96aedb6a758a2d5bd63b @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1a37caf773a3b857ccff49a31be3333d4fdc491f + 7bbee52b2aaa22f3116b96aedb6a758a2d5bd63b - + https://github.com/dotnet/aspnetcore - 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf + 09b0db035fb8415c02bf1a3406a425841aa56a13 - + https://github.com/dotnet/aspnetcore - 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf + 09b0db035fb8415c02bf1a3406a425841aa56a13 - + https://github.com/dotnet/aspnetcore - 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf + 09b0db035fb8415c02bf1a3406a425841aa56a13 - + https://github.com/dotnet/aspnetcore - 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf + 09b0db035fb8415c02bf1a3406a425841aa56a13 - + https://github.com/dotnet/aspnetcore - 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf + 09b0db035fb8415c02bf1a3406a425841aa56a13 - + https://github.com/dotnet/aspnetcore - 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf + 09b0db035fb8415c02bf1a3406a425841aa56a13 - + https://github.com/dotnet/aspnetcore - 232ec2e3a48b0c1f60dd02617891ca84b87aa9bf + 09b0db035fb8415c02bf1a3406a425841aa56a13 https://github.com/dotnet/test-templates @@ -102,65 +102,65 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 99c01747309cac187b8999f23291555b1607337c + 45a2b2f8cbe8891e0cab2fba9ea5d59592c64319 - + https://github.com/dotnet/sdk - 99c01747309cac187b8999f23291555b1607337c + 45a2b2f8cbe8891e0cab2fba9ea5d59592c64319 - + https://github.com/dotnet/sdk - 99c01747309cac187b8999f23291555b1607337c + 45a2b2f8cbe8891e0cab2fba9ea5d59592c64319 - + https://github.com/dotnet/sdk - 99c01747309cac187b8999f23291555b1607337c + 45a2b2f8cbe8891e0cab2fba9ea5d59592c64319 - + https://github.com/dotnet/winforms - 4f4829de9a3b4c56496a60ec18d774ca40956b53 + 6e68ae1ea0c5a740e818250bd5c0a1002ddc4611 - + https://github.com/dotnet/wpf - ca0aecdb68840ba5d66ade7414e0ad5ee0cd73a5 + bc71e8f53137917a9a6b78e679cf0c6c15020a2b - + https://github.com/dotnet/fsharp - 3130e06ce88bc3d6171f5127cdb9972e776af911 + 794b7c259d9646a7eb685dad865aa27da7940a21 - + https://github.com/dotnet/fsharp - 3130e06ce88bc3d6171f5127cdb9972e776af911 + 794b7c259d9646a7eb685dad865aa27da7940a21 - + https://github.com/microsoft/vstest - d7b66728d22dd5cdee5fb1e2bc385f9f2cd03171 + 3df8944ab0f4581c8077c867e8c76c35db81acd2 - + https://github.com/dotnet/linker - 2db841fc5f6bc7592b66ffe3bd0e1c888d022f93 + 72d05e415bbc6801af9b2963d6fd8a8dc261f2ae linker - + https://github.com/dotnet/roslyn - c80d6495d55ebbd64372755d236d0e5971b2dfc7 + bfd06c888292f8b6eaa616b0583566792f931024 - + https://github.com/dotnet/msbuild - eb5ebc23a99af31731a6b6c403ceda0b44aa9966 + 762ae6c6bbeb21471d4d685a061ed05b47cfcb05 - + https://github.com/nuget/nuget.client - 0e7accb78d0df80cda1bffbcf1d522945e8a1112 + 743503cb3c7e9ced2602ee2e29c38d63cc339451 @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - cb37e1f67041bfc6484ec47525bda461606efe92 + 5a5ae41c42e475e280342b668e668ff34539e36d - + https://github.com/dotnet/arcade - cb37e1f67041bfc6484ec47525bda461606efe92 + 5a5ae41c42e475e280342b668e668ff34539e36d - + https://github.com/dotnet/arcade - cb37e1f67041bfc6484ec47525bda461606efe92 + 5a5ae41c42e475e280342b668e668ff34539e36d https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ d047202874ad79d72c75b6354c0f8a9a12d1b054 - + https://github.com/dotnet/xliff-tasks - e3a6aaa38a3ad2284de2d50ff65ae4a8916db003 + ca611a68bb48cedf72a782d41622453cb2dab100 diff --git a/eng/Versions.props b/eng/Versions.props index bc9ec2b98..556f81186 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22612.4 + 8.0.0-beta.23052.2 @@ -34,11 +34,11 @@ - 8.0.0-alpha.1.22602.3 + 8.0.0-alpha.1.22628.4 - 8.0.0-alpha.1.22603.1 + 8.0.0-alpha.1.22631.1 @@ -58,46 +58,46 @@ - 8.0.0-alpha.1.22615.1 - 8.0.0-alpha.1.22615.1 - 8.0.0-alpha.1.22615.1 - 8.0.0-alpha.1.22615.1 - 8.0.0-alpha.1.22615.1 - 8.0.0-alpha.1.22615.1 - 8.0.0-alpha.1.22615.1 + 8.0.0-alpha.1.23053.19 + 8.0.0-alpha.1.23053.19 + 8.0.0-alpha.1.23053.19 + 8.0.0-alpha.1.23053.19 + 8.0.0-alpha.1.23053.19 + 8.0.0-alpha.1.23053.19 + 8.0.0-alpha.1.23053.19 0.2.0 - 8.0.100-alpha.1.22615.13 - 8.0.100-alpha.1.22615.13 - 8.0.100-alpha.1.22615.13 + 8.0.100-alpha.1.23054.22 + 8.0.100-alpha.1.23054.22 + 8.0.100-alpha.1.23054.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.23053.7 - 8.0.0-alpha.1.22605.1 - 8.0.0-alpha.1.22605.1 - 8.0.0-alpha.1.22605.1 - 8.0.0-alpha.1.22605.1 - 8.0.0-alpha.1.22605.1 - 8.0.0-alpha.1.22605.1 + 8.0.0-alpha.1.23053.7 + 8.0.0-alpha.1.23053.7 + 8.0.0-alpha.1.23053.7 + 8.0.0-alpha.1.23053.7 + 8.0.0-alpha.1.23053.7 + 8.0.0-alpha.1.23053.7 2.1.0 - 8.0.0-alpha.1.22614.1 - 8.0.0-alpha.1.22614.1 - 8.0.0-alpha.1.22614.1 - 8.0.0-alpha.1.22614.1 + 8.0.0-alpha.1.23053.1 + 8.0.0-alpha.1.23053.1 + 8.0.0-alpha.1.23053.1 + 8.0.0-alpha.1.23053.1 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221214-01 + 17.6.0-preview-20230103-01 8.0.0-alpha.1.22557.12 diff --git a/eng/common/BuildConfiguration/build-configuration.json b/eng/common/BuildConfiguration/build-configuration.json new file mode 100644 index 000000000..3d1cc8989 --- /dev/null +++ b/eng/common/BuildConfiguration/build-configuration.json @@ -0,0 +1,4 @@ +{ + "RetryCountLimit": 1, + "RetryByAnyError": false +} diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 292ebb653..c670cb796 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -1,30 +1,25 @@ -#!/usr/bin/env bash +#!/bin/sh # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # # NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! -if [[ "$#" -lt 3 ]]; then +if [ -z "$build_arch" ] || [ -z "$compiler" ]; then echo "Usage..." - echo "init-compiler.sh