From 2ebbcc51868fe9e16f81c22e9d78481cdb5a208d Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Wed, 1 Sep 2021 12:46:29 -0700 Subject: [PATCH 01/93] Add x64 emulation support to pkg installers --- src/redist/targets/GeneratePKG.targets | 7 +- .../osx/clisdk/Distribution-Template-x64 | 90 +++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 700ee7ab7..39a79152d 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -14,6 +14,7 @@ com.microsoft.dotnet.dev.$(Version).osx.$(Architecture) /usr/local/share/dotnet + /usr/local/share/dotnet/x64 $(MSBuildThisFileDirectory)packaging/osx/clisdk $(SdkPkgSourcesRootDirectory)/scripts @@ -22,7 +23,8 @@ $(SdkPkgDestinationScriptsDirectory)/postinstall $(PkgIntermediateDirectory)/resources - $(SdkPkgSourcesRootDirectory)/Distribution-Template + $(SdkPkgSourcesRootDirectory)/Distribution-Template + $(SdkPkgSourcesRootDirectory)/Distribution-Template-x64 $(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml $(PkgIntermediateDirectory)/$(SdkComponentId).pkg @@ -96,6 +98,9 @@ 10.13 11.0 + + $(x64EmulationPkgInstallDirectory) + $(Version) diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 new file mode 100644 index 000000000..9b8c79e48 --- /dev/null +++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 @@ -0,0 +1,90 @@ + + + {CLISdkBrandName} ({arch}) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {NetCoreAppTargetingPackComponentId}.pkg + {NetStandardTargetingPackComponentId}.pkg + {NetCoreAppHostPackComponentId}.pkg + {SharedFxComponentId}.pkg + {HostFxrComponentId}.pkg + {SharedHostComponentId}.pkg + {CLISdkComponentId}.pkg + + From 5112087bfdc7b27a0c0348907224b26f9cebd033 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 16 Sep 2021 10:46:49 -0700 Subject: [PATCH 02/93] Update implicit versions to target the October releases for RC2 --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 7892cc38b..5a43b5790 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - 19 - 10 + 20 + 11 From 1cb68395e69469eeea3362a2c35b582953ade0f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 23:14:23 +0000 Subject: [PATCH 03/93] [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk (#12000) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21459.6 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rc.2.21459.6 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21459.12 to 6.0.0-rtm.21464.18 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21459.13 to 6.0.0-rc.2.21465.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21457.19 to 4.0.0-5.21466.5 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21460-01 to 17.0.0-preview-21465-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.0.0-preview.4.243 to 6.0.0-rc.244 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21460.1 to 0.1.0-alpha.1.21460.1 (parent: Microsoft.NET.Sdk) - React to https://github.com/dotnet/templating/issues/3898 --- eng/Version.Details.xml | 106 ++++++++++++++--------------- eng/Versions.props | 44 ++++++------ test/EndToEnd/ProjectBuildTests.cs | 10 +-- 3 files changed, 80 insertions(+), 80 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36793d075..0a35ce58d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,45 @@ - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d @@ -47,34 +47,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 https://github.com/dotnet/test-templates @@ -89,32 +89,32 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - 79209eac8a27bcabf5a064a88abb95f32b91d863 + d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/templating - 79209eac8a27bcabf5a064a88abb95f32b91d863 + d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 608c77bf1451ee87374541a1b4b04d3bfa9abd66 + 07d3e02bd24011a4bb03e5a6881059b331bbefab - + https://github.com/dotnet/sdk - 608c77bf1451ee87374541a1b4b04d3bfa9abd66 + 07d3e02bd24011a4bb03e5a6881059b331bbefab - + https://github.com/dotnet/winforms - 08b8359d86475f6c5caf2e13b66fb9706e225acf + 66889940e6dd576e0a34f8fb87b6994c9d30fa9e - + https://github.com/dotnet/wpf - 0336b71d5a9c2036e0edbbbe5831453e4d242701 + 8d901b581073bde84dd6f793774b2362637428cf https://github.com/dotnet/fsharp @@ -135,19 +135,19 @@ linker - + https://github.com/dotnet/roslyn - dae39045cd460ba44053ff2af2217da126c25dbf + 756dad67d3f52e4c3872e83af07f158dcb5092d0 - + https://github.com/dotnet/msbuild - 8f208e60995dce87ecd5f0edd313b23ef1d67bb8 + d231437ce1ca297c1db96a33e099b95b2544bb40 - + https://github.com/nuget/nuget.client - f82431ecc38a28f396d527446834c7de679a6722 + f4ae349ec18d1ac5d5e7d1b0ed753e1300e9e157 https://github.com/Microsoft/ApplicationInsights-dotnet @@ -164,7 +164,7 @@ https://github.com/dotnet/source-build - ca07d8763334fa66011ed496d444d68355fb9511 + 3fb25b8db3bec654e37e71a5b2b7fde14444bc2f diff --git a/eng/Versions.props b/eng/Versions.props index 1b7f35177..8c5980591 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,15 +24,15 @@ - 6.0.0-rc.2.21459.12 + 6.0.0-rtm.21464.18 - 6.0.0-rc.2.21459.13 + 6.0.0-rc.2.21465.5 - 6.0.100-rc.2.21459.6 + 6.0.100-rtm.21465.1 @@ -45,44 +45,44 @@ - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 0.2.0 - 6.0.100-rc.2.21460.35 - 6.0.100-rc.2.21460.35 + 6.0.100-rc.2.21466.9 + 6.0.100-rc.2.21466.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21460.8 + 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 2.1.0 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 + 6.0.0-rc.2.21465.8 + 6.0.0-rc.2.21465.8 + 6.0.0-rc.2.21465.8 + 6.0.0-rc.2.21465.8 diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 63a4a3dd4..4a9f97435 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -102,7 +102,7 @@ namespace EndToEnd.Tests .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) .Should().Pass(); - + var selfContainedPublishDir = new DirectoryInfo(projectDirectory) .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault() .Sub("win-arm64").Sub("publish"); @@ -110,7 +110,7 @@ namespace EndToEnd.Tests selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly); selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly); } - + [WindowsOnlyFact] public void ItCanPublishArm64Wpf() { @@ -165,7 +165,7 @@ namespace EndToEnd.Tests public void DotnetNewShowsCuratedListCorrectly() { string locale = System.Threading.Thread.CurrentThread.CurrentUICulture.Name; - if (!string.IsNullOrWhiteSpace(locale) + if (!string.IsNullOrWhiteSpace(locale) && !locale.StartsWith("en", StringComparison.OrdinalIgnoreCase)) { Console.WriteLine($"[{nameof(DotnetNewShowsCuratedListCorrectly)}] CurrentUICulture: {locale}"); @@ -176,7 +176,7 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ [\w \.]+webapp,razor\s+\[C#\][\w\ \/]+ -[\w \.]+blazorwasm\s+\[C#\][\w\ \/]+ +[\w \.]+blazorserver\s+\[C#\][\w\ \/]+ [\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+ "; @@ -247,7 +247,7 @@ namespace EndToEnd.Tests /// /// The test checks if the template creates the template for correct framework by default. - /// For .NET 6 the templates should create the projects targeting net6.0 + /// For .NET 6 the templates should create the projects targeting net6.0 /// [Theory] [InlineData("console")] From 653bf5e07b0734bcad93e7db5f7acedc27e265fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 00:01:20 +0000 Subject: [PATCH 04/93] Update dependencies from https://github.com/dotnet/sdk build 20210916.13 (#12006) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21465.8 to 6.0.0-rc.2.21465.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21465.8 to 6.0.0-rc.2.21465.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rc.2.21465.8 to 6.0.0-rc.2.21465.13 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21465.8 to 6.0.0-rc.2.21465.13 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21465.8 to 6.0.0-rc.2.21465.13 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21465.5 to 6.0.0-rc.2.21465.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a35ce58d..d2ad894a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f + 4bd576eb845e83796b7ff4f8bacab816fa763887 - + https://github.com/dotnet/windowsdesktop - c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f + 4bd576eb845e83796b7ff4f8bacab816fa763887 - + https://github.com/dotnet/windowsdesktop - c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f + 4bd576eb845e83796b7ff4f8bacab816fa763887 - + https://github.com/dotnet/windowsdesktop - c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f + 4bd576eb845e83796b7ff4f8bacab816fa763887 https://github.com/dotnet/runtime @@ -98,23 +98,23 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 07d3e02bd24011a4bb03e5a6881059b331bbefab + ce89737f438fdb9f243da82a27ff3ce08793f5db - + https://github.com/dotnet/sdk - 07d3e02bd24011a4bb03e5a6881059b331bbefab + ce89737f438fdb9f243da82a27ff3ce08793f5db https://github.com/dotnet/winforms 66889940e6dd576e0a34f8fb87b6994c9d30fa9e - + https://github.com/dotnet/wpf - 8d901b581073bde84dd6f793774b2362637428cf + 467349a5a91a5ae9e322232b9605139947b6a0cf https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8c5980591..01a18661f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 6.0.0-rc.2.21465.5 + 6.0.0-rc.2.21465.6 @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21466.9 - 6.0.100-rc.2.21466.9 + 6.0.100-rc.2.21466.13 + 6.0.100-rc.2.21466.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -79,10 +79,10 @@ - 6.0.0-rc.2.21465.8 - 6.0.0-rc.2.21465.8 - 6.0.0-rc.2.21465.8 - 6.0.0-rc.2.21465.8 + 6.0.0-rc.2.21465.13 + 6.0.0-rc.2.21465.13 + 6.0.0-rc.2.21465.13 + 6.0.0-rc.2.21465.13 From f983f47e730959498b53bec583bd6ec34325f384 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 00:47:00 +0000 Subject: [PATCH 05/93] Update dependencies from https://github.com/dotnet/sdk build 20210916.18 (#12007) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2ad894a0..fad80a14c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - ce89737f438fdb9f243da82a27ff3ce08793f5db + c167a66637bbd30d4b2787f602ea0f5657d005ac - + https://github.com/dotnet/sdk - ce89737f438fdb9f243da82a27ff3ce08793f5db + c167a66637bbd30d4b2787f602ea0f5657d005ac diff --git a/eng/Versions.props b/eng/Versions.props index 01a18661f..0af499824 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21466.13 - 6.0.100-rc.2.21466.13 + 6.0.100-rc.2.21466.18 + 6.0.100-rc.2.21466.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5adae438b28fcd53d029191df60da3e1ce0f0222 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 05:18:44 +0000 Subject: [PATCH 06/93] [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk (#12008) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21465.1 to 6.0.0-rc.2.21465.27 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21465.1 to 6.0.0-rc.2.21465.27 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21465.1 to 6.0.0-rc.2.21465.27 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21465.1 to 6.0.0-rc.2.21465.27 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21465.1 to 6.0.0-rc.2.21465.27 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21465.1 to 6.0.0-rc.2.21465.27 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fad80a14c..5c76bdc62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/aspnetcore - 62302a1590ead12281bc48d1bdf4db92c9151ee4 + 69f1ace41496deda8f273027a337b1a56ed4bbfd - + https://github.com/dotnet/aspnetcore - 62302a1590ead12281bc48d1bdf4db92c9151ee4 + 69f1ace41496deda8f273027a337b1a56ed4bbfd - + https://github.com/dotnet/aspnetcore - 62302a1590ead12281bc48d1bdf4db92c9151ee4 + 69f1ace41496deda8f273027a337b1a56ed4bbfd - + https://github.com/dotnet/aspnetcore - 62302a1590ead12281bc48d1bdf4db92c9151ee4 + 69f1ace41496deda8f273027a337b1a56ed4bbfd - + https://github.com/dotnet/aspnetcore - 62302a1590ead12281bc48d1bdf4db92c9151ee4 + 69f1ace41496deda8f273027a337b1a56ed4bbfd - + https://github.com/dotnet/aspnetcore - 62302a1590ead12281bc48d1bdf4db92c9151ee4 + 69f1ace41496deda8f273027a337b1a56ed4bbfd https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - c167a66637bbd30d4b2787f602ea0f5657d005ac + a018ebdd2ba21933766ba358360cebdd2f7fa43f - + https://github.com/dotnet/sdk - c167a66637bbd30d4b2787f602ea0f5657d005ac + a018ebdd2ba21933766ba358360cebdd2f7fa43f diff --git a/eng/Versions.props b/eng/Versions.props index 0af499824..e38ca4d65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-rc.2.21465.1 - 6.0.0-rc.2.21465.1 - 6.0.0-rc.2.21465.1 - 6.0.0-rc.2.21465.1 - 6.0.0-rc.2.21465.1 - 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.27 + 6.0.0-rc.2.21465.27 + 6.0.0-rc.2.21465.27 + 6.0.0-rc.2.21465.27 + 6.0.0-rc.2.21465.27 + 6.0.0-rc.2.21465.27 0.2.0 - 6.0.100-rc.2.21466.18 - 6.0.100-rc.2.21466.18 + 6.0.100-rc.2.21466.33 + 6.0.100-rc.2.21466.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 41c46e1973175e898664db8b2b76d1e8357d3942 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 07:39:43 +0000 Subject: [PATCH 07/93] Update dependencies from https://github.com/dotnet/sdk build 20210916.35 (#12009) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21465-01 to 17.0.0-preview-21466-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c76bdc62..ad99cc96e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - a018ebdd2ba21933766ba358360cebdd2f7fa43f + 49b7a0671c2028830e605789304c22e236cdefb5 - + https://github.com/dotnet/sdk - a018ebdd2ba21933766ba358360cebdd2f7fa43f + 49b7a0671c2028830e605789304c22e236cdefb5 @@ -140,9 +140,9 @@ 756dad67d3f52e4c3872e83af07f158dcb5092d0 - + https://github.com/dotnet/msbuild - d231437ce1ca297c1db96a33e099b95b2544bb40 + f566ba17aa02768d9cce29e8caf6679a3d1537dd diff --git a/eng/Versions.props b/eng/Versions.props index e38ca4d65..3a4ec792e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21466.33 - 6.0.100-rc.2.21466.33 + 6.0.100-rc.2.21466.35 + 6.0.100-rc.2.21466.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 21838a45d88d825a16eff66528a2134658e26cf2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 08:24:28 +0000 Subject: [PATCH 08/93] Update dependencies from https://github.com/dotnet/sdk build 20210917.1 (#12010) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21464.21 to 6.0.0-rc.2.21466.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21464.21 to 6.0.0-rc.2.21466.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21464.21 to 6.0.0-rc.2.21466.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21464.21 to 6.0.0-rc.2.21466.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21464.21 to 6.0.0-rc.2.21466.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21464.21 to 6.0.0-rc.2.21466.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21464.21 to 6.0.0-rc.2.21466.4 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.2.21451.1 to 6.0.0-rtm.21464.2 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad99cc96e..74b2bf6cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,29 +17,29 @@ https://github.com/dotnet/windowsdesktop 4bd576eb845e83796b7ff4f8bacab816fa763887 - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb https://github.com/dotnet/aspnetcore @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 49b7a0671c2028830e605789304c22e236cdefb5 + ae5d25658de058993b9f069588ad124d300810c3 - + https://github.com/dotnet/sdk - 49b7a0671c2028830e605789304c22e236cdefb5 + ae5d25658de058993b9f069588ad124d300810c3 @@ -158,9 +158,9 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/emsdk - 9838ec0843442f761488cfec9cf34612c9f675e6 + 5cac15def164fc5ab593f8a0d3159dc51acd3cdd https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 3a4ec792e..929657e9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,24 +57,24 @@ - 6.0.100-rc.2.21466.35 - 6.0.100-rc.2.21466.35 + 6.0.100-rc.2.21467.1 + 6.0.100-rc.2.21467.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21466.4 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 2.1.0 @@ -172,7 +172,7 @@ 12.0.100-rc.1.496 15.0.100-rc.1.496 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rc.2.21451.1 + 6.0.0-rtm.21464.2 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From e82da59bdb9be602dea02a3663a3591093ae011a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 09:07:40 +0000 Subject: [PATCH 09/93] Update dependencies from https://github.com/dotnet/sdk build 20210917.5 (#12011) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21466.5 to 4.0.0-5.21466.6 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74b2bf6cc..925e66adf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - ae5d25658de058993b9f069588ad124d300810c3 + 14a846d58f675ae389e657abe0475d8bc1ca4f7d - + https://github.com/dotnet/sdk - ae5d25658de058993b9f069588ad124d300810c3 + 14a846d58f675ae389e657abe0475d8bc1ca4f7d @@ -135,9 +135,9 @@ linker - + https://github.com/dotnet/roslyn - 756dad67d3f52e4c3872e83af07f158dcb5092d0 + 2e350201a39c4576bc122e3ff5b61ebc90030da2 diff --git a/eng/Versions.props b/eng/Versions.props index 929657e9d..bb887fa77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21467.1 - 6.0.100-rc.2.21467.1 + 6.0.100-rc.2.21467.5 + 6.0.100-rc.2.21467.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1b9652294ea8543d3853d1eedd81d84725bb3864 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 09:53:24 +0000 Subject: [PATCH 10/93] Update dependencies from https://github.com/dotnet/sdk build 20210917.9 (#12012) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21465.27 to 6.0.0-rc.2.21466.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21465.27 to 6.0.0-rc.2.21466.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21465.27 to 6.0.0-rc.2.21466.18 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21465.27 to 6.0.0-rc.2.21466.18 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21465.27 to 6.0.0-rc.2.21466.18 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21465.27 to 6.0.0-rc.2.21466.18 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 925e66adf..1e6421c9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,30 +51,30 @@ https://github.com/dotnet/runtime 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/aspnetcore - 69f1ace41496deda8f273027a337b1a56ed4bbfd + 1ca1df683bd96a17ee3653a657ae821b8e526c2e - + https://github.com/dotnet/aspnetcore - 69f1ace41496deda8f273027a337b1a56ed4bbfd + 1ca1df683bd96a17ee3653a657ae821b8e526c2e - + https://github.com/dotnet/aspnetcore - 69f1ace41496deda8f273027a337b1a56ed4bbfd + 1ca1df683bd96a17ee3653a657ae821b8e526c2e - + https://github.com/dotnet/aspnetcore - 69f1ace41496deda8f273027a337b1a56ed4bbfd + 1ca1df683bd96a17ee3653a657ae821b8e526c2e - + https://github.com/dotnet/aspnetcore - 69f1ace41496deda8f273027a337b1a56ed4bbfd + 1ca1df683bd96a17ee3653a657ae821b8e526c2e - + https://github.com/dotnet/aspnetcore - 69f1ace41496deda8f273027a337b1a56ed4bbfd + 1ca1df683bd96a17ee3653a657ae821b8e526c2e https://github.com/dotnet/test-templates @@ -98,14 +98,14 @@ d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 14a846d58f675ae389e657abe0475d8bc1ca4f7d + 0bdd1f07b3953fa7139cdf009facd8921db224e2 - + https://github.com/dotnet/sdk - 14a846d58f675ae389e657abe0475d8bc1ca4f7d + 0bdd1f07b3953fa7139cdf009facd8921db224e2 diff --git a/eng/Versions.props b/eng/Versions.props index bb887fa77..17d737cd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-rc.2.21465.27 - 6.0.0-rc.2.21465.27 - 6.0.0-rc.2.21465.27 - 6.0.0-rc.2.21465.27 - 6.0.0-rc.2.21465.27 - 6.0.0-rc.2.21465.27 + 6.0.0-rc.2.21466.18 + 6.0.0-rc.2.21466.18 + 6.0.0-rc.2.21466.18 + 6.0.0-rc.2.21466.18 + 6.0.0-rc.2.21466.18 + 6.0.0-rc.2.21466.18 0.2.0 - 6.0.100-rc.2.21467.5 - 6.0.100-rc.2.21467.5 + 6.0.100-rc.2.21467.9 + 6.0.100-rc.2.21467.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b701a9a1d808292cd9d517a466c4de64c15ef59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Sep 2021 12:12:31 +0000 Subject: [PATCH 11/93] Update dependencies from https://github.com/dotnet/sdk build 20210917.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rc.2.21467.9 -> To Version 6.0.100-rc.2.21467.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli From Version 6.0.100-rtm.21465.1 -> To Version 6.0.100-rc.2.21467.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e6421c9c..995581b2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,23 +89,23 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - d691479b3e793e983f4d91f3a935421df1493b08 + 2418ecbd84ef2a3180bd36f36a5e0d7c71f9a217 - + https://github.com/dotnet/templating - d691479b3e793e983f4d91f3a935421df1493b08 + 2418ecbd84ef2a3180bd36f36a5e0d7c71f9a217 - + https://github.com/dotnet/sdk - 0bdd1f07b3953fa7139cdf009facd8921db224e2 + 68a520526d3eb78ccffb8e07b65f4859bdde88f4 - + https://github.com/dotnet/sdk - 0bdd1f07b3953fa7139cdf009facd8921db224e2 + 68a520526d3eb78ccffb8e07b65f4859bdde88f4 diff --git a/eng/Versions.props b/eng/Versions.props index 17d737cd3..270943863 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-rtm.21465.1 + 6.0.100-rc.2.21467.1 @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21467.9 - 6.0.100-rc.2.21467.9 + 6.0.100-rc.2.21467.13 + 6.0.100-rc.2.21467.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 594259175af7be6137d015e8e6e9326b62b2a53e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 17:27:18 +0000 Subject: [PATCH 12/93] Update dependencies from https://github.com/dotnet/sdk build 20210917.22 (#12015) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21466-02 to 17.0.0-preview-21467-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 995581b2a..9d81ac632 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 2418ecbd84ef2a3180bd36f36a5e0d7c71f9a217 - + https://github.com/dotnet/sdk - 68a520526d3eb78ccffb8e07b65f4859bdde88f4 + 915b940d20fe461613c437320b8ba21ec5152297 - + https://github.com/dotnet/sdk - 68a520526d3eb78ccffb8e07b65f4859bdde88f4 + 915b940d20fe461613c437320b8ba21ec5152297 @@ -140,9 +140,9 @@ 2e350201a39c4576bc122e3ff5b61ebc90030da2 - + https://github.com/dotnet/msbuild - f566ba17aa02768d9cce29e8caf6679a3d1537dd + c5eef1eb28e4e3984fd41be6f25f410f698dc126 diff --git a/eng/Versions.props b/eng/Versions.props index 270943863..05abfc585 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21467.13 - 6.0.100-rc.2.21467.13 + 6.0.100-rc.2.21467.22 + 6.0.100-rc.2.21467.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6d2ca2d6e7adfd3bde3d60fdda1c8971e263acc8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 18:28:18 +0000 Subject: [PATCH 13/93] Update dependencies from https://github.com/dotnet/sdk build 20210917.24 (#12016) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d81ac632..0df275305 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,14 +98,14 @@ 2418ecbd84ef2a3180bd36f36a5e0d7c71f9a217 - + https://github.com/dotnet/sdk - 915b940d20fe461613c437320b8ba21ec5152297 + 6e19e06f824ccea870c71bea0bbe38152dfe6cd2 - + https://github.com/dotnet/sdk - 915b940d20fe461613c437320b8ba21ec5152297 + 6e19e06f824ccea870c71bea0bbe38152dfe6cd2 diff --git a/eng/Versions.props b/eng/Versions.props index 05abfc585..02f50f63d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-rc.2.21467.22 - 6.0.100-rc.2.21467.22 + 6.0.100-rc.2.21467.24 + 6.0.100-rc.2.21467.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ee8c9997fcea482031144c0e8d17674e7744f94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Sep 2021 19:19:11 +0000 Subject: [PATCH 14/93] Update dependencies from https://github.com/dotnet/sdk build 20210917.27 (#12017) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21466.4 to 6.0.0-rc.2.21467.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21466.4 to 6.0.0-rc.2.21467.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21466.4 to 6.0.0-rc.2.21467.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21466.4 to 6.0.0-rc.2.21467.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21466.4 to 6.0.0-rc.2.21467.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21466.4 to 6.0.0-rc.2.21467.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21466.4 to 6.0.0-rc.2.21467.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0df275305..f7e064c2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,29 +17,29 @@ https://github.com/dotnet/windowsdesktop 4bd576eb845e83796b7ff4f8bacab816fa763887 - + https://github.com/dotnet/runtime - 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb + 0f2d0269c59e622369e18885c9417175af04382b - + https://github.com/dotnet/runtime - 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb + 0f2d0269c59e622369e18885c9417175af04382b - + https://github.com/dotnet/runtime - 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb + 0f2d0269c59e622369e18885c9417175af04382b - + https://github.com/dotnet/runtime - 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb + 0f2d0269c59e622369e18885c9417175af04382b - + https://github.com/dotnet/runtime - 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb + 0f2d0269c59e622369e18885c9417175af04382b - + https://github.com/dotnet/runtime - 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb + 0f2d0269c59e622369e18885c9417175af04382b @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb + 0f2d0269c59e622369e18885c9417175af04382b https://github.com/dotnet/aspnetcore @@ -98,14 +98,14 @@ 2418ecbd84ef2a3180bd36f36a5e0d7c71f9a217 - + https://github.com/dotnet/sdk - 6e19e06f824ccea870c71bea0bbe38152dfe6cd2 + e89f3d77dbd6f41890b10eafd98505261fa63755 - + https://github.com/dotnet/sdk - 6e19e06f824ccea870c71bea0bbe38152dfe6cd2 + e89f3d77dbd6f41890b10eafd98505261fa63755 diff --git a/eng/Versions.props b/eng/Versions.props index 02f50f63d..722c5972b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,24 +57,24 @@ - 6.0.100-rc.2.21467.24 - 6.0.100-rc.2.21467.24 + 6.0.100-rc.2.21467.27 + 6.0.100-rc.2.21467.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21467.4 - 6.0.0-rc.2.21466.4 - 6.0.0-rc.2.21466.4 - 6.0.0-rc.2.21466.4 - 6.0.0-rc.2.21466.4 - 6.0.0-rc.2.21466.4 - 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21467.4 + 6.0.0-rc.2.21467.4 + 6.0.0-rc.2.21467.4 + 6.0.0-rc.2.21467.4 + 6.0.0-rc.2.21467.4 + 6.0.0-rc.2.21467.4 2.1.0 From f1c05e42afe2210ced6488601d12e222ee98623a Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 3 Sep 2021 19:37:57 +0200 Subject: [PATCH 15/93] Add support for s390x architecture * Add linux-s390x RIDs for net6.0 to GenerateBundledVersions * Add s390x platform in Directory.Build.props * Disable crossgen2 for the s390x target --- Directory.Build.props | 1 + src/SourceBuild/tarball/content/Directory.Build.props | 1 + src/redist/targets/Crossgen.targets | 3 ++- src/redist/targets/GenerateBundledVersions.targets | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 35439d3b3..c373c9beb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,6 +10,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) + $(BuildArchitecture) x64 diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index d4f1aa392..ce976478b 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -18,6 +18,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) + $(BuildArchitecture) x64 false diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 70f4e921a..91f6e2326 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,6 +1,7 @@ + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 7892cc38b..503e2c83d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -105,6 +105,7 @@ From e8ec98a819b694794b60ee87a71f340a732d5e05 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Fri, 17 Sep 2021 13:53:42 -0700 Subject: [PATCH 16/93] Update x64 machine detection script --- .../packaging/osx/clisdk/Distribution-Template-x64 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 index 9b8c79e48..3e3b3ebda 100644 --- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 +++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 @@ -78,10 +78,14 @@