From 29578262e1c384aedb492b8cd87147998078e11e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Apr 2022 23:17:34 +0000 Subject: [PATCH 01/15] Merged PR 22281: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://github.com/dotnet/sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220413.3 - **Date Produced**: April 13, 2022 10:52:12 AM UTC - **Commit**: 3456e28c08f10074a5cfd1e2522acefa8f515210 - **Branch**: refs/heads/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-preview.22212.3 to 6.0.300-preview.22213.3][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-preview.22212.3 to 6.0.300-preview.22213.3][6] - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22211.2 to 4.2.0-4.22212.4][7] [6]: https://github.com/dotnet/sdk/compare/8963eb7...3456e28 [7]: https://github.com/dotnet/roslyn/compare/8b5c5b8...f2d278f [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.2.0-4.22211.2 to 4.2.0-4.22212.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) --- 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 0cd745f93..d6bf90f60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 115aeb115de1387d8ba427b9bfdf072d7dd64914 - + https://github.com/dotnet/sdk - 8963eb7d0f371d688809146cf75c847987420b86 + 3456e28c08f10074a5cfd1e2522acefa8f515210 - + https://github.com/dotnet/sdk - 8963eb7d0f371d688809146cf75c847987420b86 + 3456e28c08f10074a5cfd1e2522acefa8f515210 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8b5c5b8e817c4299f2693ce7a16fe1465de1d9c4 + f2d278f9a5131b7944d6ac5fecf2ce5b0a98195f diff --git a/eng/Versions.props b/eng/Versions.props index 4b4ef5512..af3bb634f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22212.3 - 6.0.300-preview.22212.3 + 6.0.300-preview.22213.3 + 6.0.300-preview.22213.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1c5091589d5b0fc9878d597e6723cdf17873fd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Apr 2022 15:55:14 +0000 Subject: [PATCH 02/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1 --- NuGet.config | 4 ---- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 28408ac24..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf180107c..656e24ddd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - 60845bf36f0dd6dd310070548a58cb8ad3ab513c + bb35f199756a8b45dacb1025d72419f6ea5ff1a4 From 91c6682f9e2a0afda3c169c4d6807a12180e66c8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 20 Apr 2022 23:43:56 +0000 Subject: [PATCH 03/15] Merged PR 22483: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.300-preview.22208.4 to 6.0.300-rtm.22215.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: fr... --- NuGet.config | 11 +- eng/Version.Details.xml | 108 ++++++++--------- eng/Versions.props | 46 +++---- ...lease-6.0-Build-ProjectTemplates-in-.patch | 113 ------------------ ...e-BannedApiAnalyzers-usage-in-source.patch | 24 ---- src/redist/targets/GenerateLayout.targets | 25 ++-- 6 files changed, 96 insertions(+), 231 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch diff --git a/NuGet.config b/NuGet.config index cbce2d136..3e42736a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ + - - - - + + + @@ -40,11 +40,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6bf90f60..502343b6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + e5f183b656a0e8bc087108130a5a9b54ae94494e https://github.com/dotnet/test-templates @@ -90,42 +90,42 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://github.com/dotnet/templating - 115aeb115de1387d8ba427b9bfdf072d7dd64914 + 60a2f73de55434984bbe3d5ad9281b3863355b31 - - https://github.com/dotnet/sdk - 3456e28c08f10074a5cfd1e2522acefa8f515210 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 679e847e5414a9035443a3faf25799e71590f051 - - https://github.com/dotnet/sdk - 3456e28c08f10074a5cfd1e2522acefa8f515210 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 679e847e5414a9035443a3faf25799e71590f051 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcb07d637abf53791e2c55c63d9207fc3232fe83 + 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b - + https://github.com/dotnet/fsharp 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 - + https://github.com/dotnet/fsharp 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 @@ -135,9 +135,9 @@ 717d0cf94925e9cf67466dbee46c1019930eb212 - + https://github.com/dotnet/linker - 01c4f5905959c29f86781b85187bb676fc517ee9 + 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 linker diff --git a/eng/Versions.props b/eng/Versions.props index af3bb634f..46320c3cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.4-servicing.22164.7 + 6.0.3-servicing.22123.7 - 6.0.4-servicing.22165.3 + 6.0.5-servicing.22215.9 - 6.0.300-preview.22208.4 + 6.0.300 @@ -44,44 +44,44 @@ - 6.0.4 - 6.0.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 + 6.0.5 + 6.0.5 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 0.2.0 - 6.0.300-preview.22213.3 - 6.0.300-preview.22213.3 + 6.0.300-rtm.22220.16 + 6.0.300-rtm.22220.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.3 + 6.0.2 - 6.0.4-servicing.22164.4 - 6.0.4-servicing.22164.4 - 6.0.4 - 6.0.4 - 6.0.4 - 6.0.4 + 6.0.5-servicing.22213.9 + 6.0.5-servicing.22213.9 + 6.0.5 + 6.0.5 + 6.0.5 + 6.0.5 2.1.0 - 6.0.4-servicing.22165.2 - 6.0.4-servicing.22165.2 - 6.0.4 - 6.0.4 + 6.0.5-servicing.22215.11 + 6.0.5-servicing.22215.11 + 6.0.5 + 6.0.5 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22208.4 + 6.0.300 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch deleted file mode 100644 index 7ada1a116..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Godbe -Date: Wed, 23 Mar 2022 09:11:11 -0700 -Subject: [PATCH] Revert "Revert "[release/6.0] Build ProjectTemplates in - Source-Build (#40650)" (#40805)" - -This reverts commit a351c437ac7bc9f9be96de51832608438a7a37df. ---- - Directory.Build.props | 3 +++ - Directory.Build.targets | 9 +++++++-- - .../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 9 ++++++++- - ...pNetCore.Components.WebAssembly.Authentication.csproj | 9 ++++++++- - 4 files changed, 26 insertions(+), 4 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 8f0ac59422..721f099a77 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -30,6 +30,9 @@ - $(MSBuildProjectName.EndsWith('.Test')) OR - $(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true - true -+ true - true - true - true -+ Condition="'$(ExcludeFromSourceBuild)' == '' and -+ '$(DotNetBuildFromSource)' == 'true' and -+ '$(IsAspNetCoreApp)' != 'true' and -+ '$(MSBuildProjectName)' != '$(TargetingPackName)' and -+ '$(IsAnalyzersProject)' != 'true' and -+ '$(IsProjectTemplateProject)' != 'true'">true - - -diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -index 8ae5d1c43d..8e0f53957e 100644 ---- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -+++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -@@ -1,6 +1,6 @@ -  - -- -+ - - - $(DefaultNetCoreTargetFramework) -@@ -25,6 +25,7 @@ - - $(MSBuildThisFileDirectory)Interop\ - -+ CheckForSourceBuild; - CompileInterop; - IncludeCompileInteropOutput; - $(ResolveStaticWebAssetsInputsDependsOn) -@@ -91,5 +92,11 @@ - - - -+ -+ -+ -+ -+ -+ - - -diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -index 8d6a000d74..35c79a73eb 100644 ---- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -@@ -1,6 +1,6 @@ - - -- -+ - - - $(DefaultNetCoreTargetFramework) -@@ -26,6 +26,7 @@ - - $(MSBuildThisFileDirectory)Interop\ - -+ CheckForSourceBuild; - CompileInterop; - IncludeCompileInteropOutput; - $(ResolveStaticWebAssetsInputsDependsOn) -@@ -93,4 +94,10 @@ - - - -+ -+ -+ -+ -+ -+ - diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch deleted file mode 100644 index f7d7668dc..000000000 --- a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Wed, 13 Apr 2022 21:30:39 +0000 -Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build - -Removes prebuilt. -Patch for https://github.com/dotnet/linker/pull/2742 ---- - src/linker/Mono.Linker.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj -index 391300aa..d276003e 100644 ---- a/src/linker/Mono.Linker.csproj -+++ b/src/linker/Mono.Linker.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - runtime; build; native; contentfiles; analyzers; buildtransitive - all - diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5c9b2f490..e05004e17 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -82,22 +82,21 @@ dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - $(SharedFrameworkRid) - linux-x64 - $(AspNetCoreSharedFxInstallerRid) - x64 - aarch64 + $(SharedFrameworkRid) + linux-x64 + $(AspNetCoreInstallerRid) + x64 + aarch64 - aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) - aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid).wixlib + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) - aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) aspnetcore_base_runtime.version From 8473146e7d8d3de5d9558239c46e62d12314d52b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 Apr 2022 15:36:17 +0000 Subject: [PATCH 04/15] Merged PR 22532: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.Net.Compilers.Toolset**: from 4.2.0-4.22212.4 to 4.2.0-4.22220.2 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 6.2.0-rc.140 to 6.2.0-rc.146 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220421.4 - **Date Produced**: April 21, 2022 9:07:16 AM UTC - **Commit**: ac00abef032d4d576a844d7f1287119a9d20166e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22220.16 to 6.0.300-rtm.22221.4][4] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22220.16 to 6.0.300-rtm.22221.4][4] - **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.3][5] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][6] - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22212.4 to 4.2.0-4.22220.2][7] - **NuGet.Build.Tasks**: [from 6.2.0-rc.140 to 6.2.0-rc.146][8] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC679e847&targetVersion=GCac00abe&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc24d9a9&targetVersion=GCbe98e88&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1f426c9&targetVersion=GC0c636f9&_a=files [7]: https://github.com/dotnet/roslyn/compare/f2d278f...1e40aa1 [8]: https://github.com/nuget/nuget.client/compare/6f54dbd...b8a6126 [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 502343b6d..1eafa497a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,19 +103,19 @@ https://github.com/dotnet/templating 60a2f73de55434984bbe3d5ad9281b3863355b31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 679e847e5414a9035443a3faf25799e71590f051 + ac00abef032d4d576a844d7f1287119a9d20166e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 679e847e5414a9035443a3faf25799e71590f051 + ac00abef032d4d576a844d7f1287119a9d20166e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f426c90a9589dabc16d114aa91bfea9f21f8571 + 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee https://dev.azure.com/dnceng/internal/_git/dotnet-wpf @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - f2d278f9a5131b7944d6ac5fecf2ce5b0a98195f + 1e40aa11ca0b522e201320f70d469de40f211b2c @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - + https://github.com/nuget/nuget.client - 6f54dbd49fcda01ca8d71eb4fa4eea6ef54379ab + b8a61266d9a6780cb7eb9c1942695cf813fdef0a diff --git a/eng/Versions.props b/eng/Versions.props index 46320c3cd..c2eb24464 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ - 6.0.3-servicing.22123.7 + 6.0.4-servicing.22164.7 @@ -56,15 +56,15 @@ - 6.0.300-rtm.22220.16 - 6.0.300-rtm.22220.16 + 6.0.300-rtm.22221.4 + 6.0.300-rtm.22221.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.2 + 6.0.3 From e6afe7a97e7cdaf5531978cba171a47ed8e7fbf6 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 27 Apr 2022 14:57:58 -0700 Subject: [PATCH 05/15] Add a direct reference to a newer version of this package --- .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index fb083d8a5..04fed4562 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -7,5 +7,7 @@ + + \ No newline at end of file From 2d73d3d8bffdd63ed094b4a0b00c99bab52b2542 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 29 Apr 2022 12:50:28 -0500 Subject: [PATCH 06/15] Remove sha from source tarball repo dir names (#13726) --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- src/SourceBuild/tarball/content/repos/Directory.Build.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 76297fd3b..ff9296640 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -119,7 +119,7 @@ - $(SourceBuildRepoName).$(RepoSha)/ + $(SourceBuildRepoName)/ $(TarballSourceDir)$(SourceDir) $(TarballSourceDir)$(SourceDir)eng/ $(TarballRepoSourceEngDir)Version.Details.xml diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index e61a6e689..100183a09 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -11,7 +11,7 @@ $(RepositoryName) - $(SubmoduleDirectory)$(SourceDirectory).$(GitCommitHash)/ + $(SubmoduleDirectory)$(SourceDirectory)/ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 From 01764815debb74c7bb79162dbec21f0a22cf9e4f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 29 Apr 2022 14:37:32 -0500 Subject: [PATCH 07/15] Update smoke-test prereq artifact to include architecture (#13725) --- src/SourceBuild/tarball/content/build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 52c3341e0..5976d8446 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -189,7 +189,7 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz $(ResultingPrebuiltPackagesDir) From 53fd800db005f06233e5c6fbe9c9550a9948eea0 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 3 May 2022 10:25:02 -0700 Subject: [PATCH 08/15] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx' (#13734) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1 * Remove sha from source tarball repo dir names (#13726) * Update smoke-test prereq artifact to include architecture (#13725) Co-authored-by: dotnet-maestro[bot] Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Michael Simons --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- src/SourceBuild/tarball/content/build.proj | 2 +- src/SourceBuild/tarball/content/repos/Directory.Build.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 76297fd3b..ff9296640 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -119,7 +119,7 @@ - $(SourceBuildRepoName).$(RepoSha)/ + $(SourceBuildRepoName)/ $(TarballSourceDir)$(SourceDir) $(TarballSourceDir)$(SourceDir)eng/ $(TarballRepoSourceEngDir)Version.Details.xml diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 52c3341e0..5976d8446 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -189,7 +189,7 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index e61a6e689..100183a09 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -11,7 +11,7 @@ $(RepositoryName) - $(SubmoduleDirectory)$(SourceDirectory).$(GitCommitHash)/ + $(SubmoduleDirectory)$(SourceDirectory)/ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 From 5a1062a0059f376df49c70d66a07368e3da86352 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 May 2022 10:28:19 -0700 Subject: [PATCH 09/15] Update branding to 6.0.106 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ee8500d06..313775ae7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 604e870a20469a09d9dcb04dc99ab7c5cb792679 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 9 Mar 2022 13:54:57 -0300 Subject: [PATCH 10/15] Add Mariner 2.0 and Arm64 RHEL builds --- .vsts-ci.yml | 20 ++++++++++ src/redist/targets/GenerateLayout.targets | 4 +- src/redist/targets/GenerateRPMs.targets | 38 ++++++++++++++++--- .../targets/GetRuntimeInformation.targets | 11 +++++- .../targets/packaging/rpm/dotnet-config.json | 7 +--- 5 files changed, 66 insertions(+), 14 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e8e58caf9..4a1ca1503 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -198,6 +198,15 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm + _TestArg: '' + _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true' Build_Arm_Debug: _BuildConfig: Debug _DockerParameter: '' @@ -306,6 +315,17 @@ stages: # already published by Build_LinuxPortable_Release_x64 _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' Build_LinuxPortable_Release_x64: _BuildConfig: Release _DockerParameter: '' diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5c9b2f490..afd1c4e0a 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -46,11 +46,13 @@ $(CoreSetupRid) - $(Architecture) + $(InstallerTargetArchitecture) $(CoreSetupRid) $(Architecture) + $(OSName)-$(InstallerTargetArchitecture) + rhel.7-aarch64 x64 x86 diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 935684431..a82f068fc 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -91,9 +91,6 @@ $(MicrosoftNETCoreAppRefMajorMinorPatchVersion) - - $(NetStandardTargetingPackMajorMinorPatchVersion) - $(AspNetCoreRuntimeMajorMinorPatchVersion) @@ -109,9 +106,6 @@ $(NetCoreAppHostPackRpmPackageName) - - $(NetStandardTargetingPackRpmPackageName) - $(AspNetCoreSharedFxRpmPackageName) @@ -121,6 +115,10 @@ $(Version) + + amd64 + aarch64 + $(SdkBrandName) @@ -133,6 +131,27 @@ + + + + + + + + + + + + + + + + @@ -186,6 +205,12 @@ SkipUnchangedFiles="False" UseHardlinksIfPossible="False"/> + + $(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(SdkRPMInstallerFile) $(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(RepoRoot)/Documentation/manpages $(RepoRoot)/test/EndToEnd/EndToEnd.csproj diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 5133c3a38..753c965d8 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -37,8 +37,15 @@ Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid) - $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(Architecture) - $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(Architecture) + + $(Architecture) + aarch64 + + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(InstallerTargetArchitecture) + + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(InstallerTargetArchitecture) + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.2-$(InstallerTargetArchitecture) + diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index ed3ccbfeb..1a9d84999 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -14,7 +14,7 @@ "changelog_message": "Bootstrap loop package" }, "control": { - "architecture": "amd64" + "architecture": "%SDK_RPM_PACKAGE_ARCHITECTURE%" }, "copyright": ".NET Foundation and contributors", "license": { @@ -34,10 +34,7 @@ "package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%", "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%" }, - { - "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" - }, +%SDK_RPM_NETSTANDARD_TARGETINGPACK_DEPENDENCY% { "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" From 2e472083560f6655d9f19326248a48c0281153c7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 3 May 2022 18:56:39 -0500 Subject: [PATCH 11/15] Fix two broken path references (#13745) --- src/SourceBuild/tarball/content/prep.sh | 2 +- .../Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 56e00219f..e7fc6d550 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -108,7 +108,7 @@ if [ "$buildBootstrap" == "true" ]; then cp $SCRIPT_ROOT/scripts/bootstrap/buildBootstrapPreviouslySB.csproj $workingDir # Copy NuGet.config from the installer repo to have the right feeds - cp $SCRIPT_ROOT/src/installer.*/NuGet.config $workingDir + cp $SCRIPT_ROOT/src/installer/NuGet.config $workingDir # Get PackageVersions.props from existing prev-sb archive echo " Retrieving PackageVersions.props from existing archive" diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj index c00725cc7..daf090289 100644 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj @@ -13,7 +13,7 @@ 15.7.179 - + Configuration=netstandard_Debug Configuration=netstandard_Release {D68133BD-1E63-496E-9EDE-4FBDBF77B486} From a1dc2f68e4e5e81e4dde8d1dd7a0f25c08dbfc53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 May 2022 21:19:18 +0000 Subject: [PATCH 12/15] Update dependencies from https://github.com/dotnet/arcade build 20220504.3 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 656e24ddd..d1175a5ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 313775ae7..feaa399e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22212.5 + 6.0.0-beta.22254.3 diff --git a/global.json b/global.json index b645142d3..c751a7b2d 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" } } From 831257f764d735ebf42f3628ccc42cc7f95de706 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 21:26:54 +0000 Subject: [PATCH 13/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220504.1 (#13758) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 656e24ddd..5024e6131 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - bb35f199756a8b45dacb1025d72419f6ea5ff1a4 + eba16eaac0a3f27f6e37c88313717776d4f38710 From 5631e9af9ece57ca36023157b974b6599964034d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 May 2022 23:25:36 +0000 Subject: [PATCH 14/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220504.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22254.1 -> To Version 6.0.0-servicing.22254.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5024e6131..0e7efd866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - eba16eaac0a3f27f6e37c88313717776d4f38710 + 6998584e7856a384d12fa7d0f898daec9be22c13 From 9269ff9cc420da27d32c4ff52e52e44dfd4a0851 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 May 2022 23:31:33 +0000 Subject: [PATCH 15/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220509.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22254.2 -> To Version 6.0.0-servicing.22259.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ecc839b6..e44fd82fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/source-build-reference-packages - 6998584e7856a384d12fa7d0f898daec9be22c13 + b1f5e7bc4d52db0031868cdd5e90b76118c2c31a