From 158aa38075ea7b4b6fccd115093362b1f91a04ea Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 17 Feb 2022 01:35:46 +0000 Subject: [PATCH 01/27] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22115.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.2-servicing.22064.8 to 6.0.3-servicing.22115.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22053.6 to 4.0.1-1.22114.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.2 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) --- NuGet.config | 5 +++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 55 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ee0fa704..686a78535 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,14 +9,17 @@ + + + @@ -39,9 +42,11 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f48fcebc2..fd75044a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + 10db7350e1288caf09e684e1b219f8f5b08eca02 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 10db7350e1288caf09e684e1b219f8f5b08eca02 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,23 +103,23 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c0649a412b8865957af7610cc9f035484f4997a + 3300bcb7f24fa81995a6adf67ddb7da9a6fab0ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c0649a412b8865957af7610cc9f035484f4997a + 3300bcb7f24fa81995a6adf67ddb7da9a6fab0ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ad241b9633924db40503de19cb502bb0aca7718 + ba13948446da002973d174e3d1c8843f844e6fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fb76229895cae74c1adc62c2411a0730a2f3759b + d974f4b15a6baa1235d4e8e80728b3e3d0899277 https://github.com/dotnet/fsharp @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 9942dc957472b9bf179b11742bc161ef6c79691e + 25e7a33de1c9e1d4840014db03c59bc4424c6188 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a + ee0a97a0009c0e048789126253fea7994db676ac https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 72fdc7630..dfc970222 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.2-servicing.22064.7 + 6.0.3-servicing.22115.6 - 6.0.2-servicing.22064.8 + 6.0.3-servicing.22115.10 @@ -56,32 +56,32 @@ - 6.0.102-servicing.22069.2 - 6.0.102-servicing.22069.2 + 6.0.103-servicing.22116.12 + 6.0.103-servicing.22116.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.1 + 6.0.2 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22115.5 + 6.0.3-servicing.22115.5 + 6.0.3 + 6.0.3 + 6.0.3 + 6.0.3 2.1.0 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22116.1 + 6.0.3-servicing.22116.1 + 6.0.3 + 6.0.3 @@ -183,7 +183,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0 + 6.0.2 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From feeef451aface7509bd58587c8364ae65e1f2315 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 17 Feb 2022 17:48:04 +0000 Subject: [PATCH 02/27] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.102 to 6.0.103 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.102-servicing.22068.7 to 6.0.103-servicing.22116.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100 to 6.0.103 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22114.6 to 4.0.1-1.22116.5 (parent: Microsoft.NET.Sdk) - Remove source-build aspnetcore patch to always build targeting packs because the backported fix is flowing in --- NuGet.config | 4 ++ eng/Version.Details.xml | 50 +++++++++---------- eng/Versions.props | 20 ++++---- ...uild-App.Ref-and-the-targeting-packs.patch | 32 ------------ 4 files changed, 39 insertions(+), 67 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch diff --git a/NuGet.config b/NuGet.config index 686a78535..2e2a1f985 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -17,6 +18,7 @@ + @@ -40,10 +42,12 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd75044a2..8b910af4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 10db7350e1288caf09e684e1b219f8f5b08eca02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0300fa1ff7d5c8be96d11383e99b7b5b0e4fb8 + 488cbc431f0adaeaf050a414a91bf748e884be84 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0300fa1ff7d5c8be96d11383e99b7b5b0e4fb8 + 488cbc431f0adaeaf050a414a91bf748e884be84 - - https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 488cbc431f0adaeaf050a414a91bf748e884be84 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3300bcb7f24fa81995a6adf67ddb7da9a6fab0ab + becb321cbd4c942cd818cee3116cda638db95637 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3300bcb7f24fa81995a6adf67ddb7da9a6fab0ab + becb321cbd4c942cd818cee3116cda638db95637 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 25e7a33de1c9e1d4840014db03c59bc4424c6188 + ff289c438fabbdb4755f3c92c976763705140bd9 diff --git a/eng/Versions.props b/eng/Versions.props index dfc970222..b3fa9d079 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.102 + 6.0.103 @@ -44,20 +44,20 @@ - 6.0.2 - 6.0.2 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 + 6.0.3 + 6.0.3 + 6.0.3-servicing.22116.12 + 6.0.3-servicing.22116.12 + 6.0.3-servicing.22116.12 + 6.0.3-servicing.22116.12 0.2.0 - 6.0.103-servicing.22116.12 - 6.0.103-servicing.22116.12 + 6.0.103-servicing.22116.37 + 6.0.103-servicing.22116.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100 + 6.0.103 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch b/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch deleted file mode 100644 index ef507ed95..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c5211f8557f2fb019416cf1f6c01142965270479 Mon Sep 17 00:00:00 2001 -From: Doug Bunting <6431421+dougbu@users.noreply.github.com> -Date: Sun, 16 Jan 2022 22:55:10 -0800 -Subject: [PATCH] Always build App.Ref and the targeting packs - set - `$(IsTargetingPackBuilding)` to `true` unconditionally - leave all _use_ of - `$(IsTargetingPackBuilding)` - -See https://github.com/dotnet/aspnetcore/issues/39471 for details and backporting. ---- - Directory.Build.props | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index e100d883e9..d71b308905 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -138,11 +138,7 @@ - Microsoft.AspNetCore.App.Ref - aspnetcore-runtime - aspnetcore-targeting-pack -- -- -- false -- true -+ true - - + 5.0.0 ++ 5.0.0 + 4.7.0 + 4.7.0 + 4.7.0 +diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +index 358de5541e3..abf6d26d9ef 100644 +--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj ++++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +@@ -23,11 +23,11 @@ + + + +- ++ + + + +- ++ + + + From fd02f367582bd39cceab09dafa9af0fb4b9dc4ba Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Feb 2022 19:49:53 +0000 Subject: [PATCH 04/27] Merged PR 21346: [internal/release/6.0.1xx] 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.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220221.9 - **Date Produced**: February 21, 2022 7:09:27 PM UTC - **Commit**: 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1] - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.103 to 6.0.103][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.103 to 6.0.103][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbecb321&targetVersion=GC3d6f35b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC488cbc4&targetVersion=GC988d95c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2e2a1f985..3161d5b43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,9 +18,11 @@ - + + + @@ -47,10 +49,12 @@ - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb83a052c..a01508080 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 488cbc431f0adaeaf050a414a91bf748e884be84 + 988d95c1dbb18d71685650fc73344f7b92740ad8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 488cbc431f0adaeaf050a414a91bf748e884be84 + 988d95c1dbb18d71685650fc73344f7b92740ad8 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 488cbc431f0adaeaf050a414a91bf748e884be84 + 988d95c1dbb18d71685650fc73344f7b92740ad8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - becb321cbd4c942cd818cee3116cda638db95637 + 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - becb321cbd4c942cd818cee3116cda638db95637 + 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3 diff --git a/eng/Versions.props b/eng/Versions.props index b3fa9d079..0cdc7ec3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.103-servicing.22116.37 - 6.0.103-servicing.22116.37 + 6.0.103-servicing.22121.9 + 6.0.103-servicing.22121.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6ffc948a34f3d2cb6aa6953b4d3e717bdea19be0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 24 Feb 2022 23:02:01 +0000 Subject: [PATCH 05/27] Merged PR 21441: [internal/release/6.0.1xx] 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.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22121.10 to 6.0.103-servicing.22123.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220224.11 - **Date Produced**: February 24, 2022 8:11:47 PM UTC - **Commit**: 574686d9d185bd75770481fa76a82a0871210af4 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3] - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3] - **Microsoft.NETCor... --- NuGet.config | 16 +++++++----- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------ 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3161d5b43..bcfae53a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,8 @@ - + + @@ -15,12 +16,13 @@ - + - + + @@ -44,17 +46,19 @@ - + + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b1761316..e800715b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 988d95c1dbb18d71685650fc73344f7b92740ad8 + f165acec106eb72d2a9e6a91c48b462884cb1c55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 988d95c1dbb18d71685650fc73344f7b92740ad8 + f165acec106eb72d2a9e6a91c48b462884cb1c55 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 988d95c1dbb18d71685650fc73344f7b92740ad8 + f165acec106eb72d2a9e6a91c48b462884cb1c55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3 + 67f3050c6c9efe0a24ba64bdbb1d825d93711902 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3 + 67f3050c6c9efe0a24ba64bdbb1d825d93711902 diff --git a/eng/Versions.props b/eng/Versions.props index 0cdc7ec3f..8dfdee191 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.3 6.0.3 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 0.2.0 - 6.0.103-servicing.22121.9 - 6.0.103-servicing.22121.9 + 6.0.103-servicing.22124.14 + 6.0.103-servicing.22124.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.3-servicing.22115.5 - 6.0.3-servicing.22115.5 + 6.0.3-servicing.22123.9 + 6.0.3-servicing.22123.9 6.0.3 6.0.3 6.0.3 From 2d7bc7059f07504b6aa718511505bfae9c52bd55 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 24 Feb 2022 23:07:49 +0000 Subject: [PATCH 06/27] Merged PR 21459: [internal/release/6.0.1xx] 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.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220224.18 - **Date Produced**: February 24, 2022 10:36:20 PM UTC - **Commit**: 36d5c10d65ec7577234f1b72c25e21b9512f1895 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1] - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.3 to 6.0.3][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC67f3050&targetVersion=GC36d5c10&_a=files [2]: https://dev.azure.com/dnceng/intern... --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index bcfae53a4..16f4f035a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,10 +22,7 @@ - - - - + @@ -55,10 +52,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e800715b0..8462909e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b96c6f9f788aee704113c6765c56810faa382a + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b96c6f9f788aee704113c6765c56810faa382a + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b96c6f9f788aee704113c6765c56810faa382a + 1217354ca79000178dca5bca83fe6ec490e1d2d6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b96c6f9f788aee704113c6765c56810faa382a + 1217354ca79000178dca5bca83fe6ec490e1d2d6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating f165acec106eb72d2a9e6a91c48b462884cb1c55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 67f3050c6c9efe0a24ba64bdbb1d825d93711902 + 36d5c10d65ec7577234f1b72c25e21b9512f1895 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 67f3050c6c9efe0a24ba64bdbb1d825d93711902 + 36d5c10d65ec7577234f1b72c25e21b9512f1895 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ba13948446da002973d174e3d1c8843f844e6fe2 + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d974f4b15a6baa1235d4e8e80728b3e3d0899277 + 560f243910f407df33fd5cdf06e2a857684f4bc7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8dfdee191..a137a23de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.3-servicing.22115.6 + 6.0.3-servicing.22123.7 - 6.0.3-servicing.22115.10 + 6.0.3-servicing.22124.2 @@ -56,8 +56,8 @@ - 6.0.103-servicing.22124.14 - 6.0.103-servicing.22124.14 + 6.0.103-servicing.22124.18 + 6.0.103-servicing.22124.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.3-servicing.22116.1 - 6.0.3-servicing.22116.1 + 6.0.3-servicing.22124.3 + 6.0.3-servicing.22124.3 6.0.3 6.0.3 From 10e0e1e567e4b25f0ddf7650bd9867df40fd54cb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Mar 2022 01:07:52 +0000 Subject: [PATCH 07/27] Merged PR 21560: [internal/release/6.0.1xx] 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.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22123.6 to 6.0.104-servicing.22164.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (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.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22124.2 to 6.0.4-servicing.22165.3 (parent:... --- NuGet.config | 9 ++ eng/Version.Details.xml | 104 +++++++++--------- eng/Versions.props | 48 ++++---- eng/common/templates/steps/source-build.yml | 4 +- ...lectionMetadataLoadContextVersion-pr.patch | 44 -------- src/redist/targets/GenerateLayout.targets | 4 +- 6 files changed, 90 insertions(+), 123 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch diff --git a/NuGet.config b/NuGet.config index 9ee0fa704..24f6a0170 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -37,11 +42,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfb68c294..d99be542c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded @@ -48,34 +48,34 @@ 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 - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f165acec106eb72d2a9e6a91c48b462884cb1c55 + 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f165acec106eb72d2a9e6a91c48b462884cb1c55 + 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f165acec106eb72d2a9e6a91c48b462884cb1c55 + 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36d5c10d65ec7577234f1b72c25e21b9512f1895 + 50891b83aa9eff002c8a5fb36ba422c4e2390b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36d5c10d65ec7577234f1b72c25e21b9512f1895 + 50891b83aa9eff002c8a5fb36ba422c4e2390b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f426c90a9589dabc16d114aa91bfea9f21f8571 + 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 560f243910f407df33fd5cdf06e2a857684f4bc7 + fcb07d637abf53791e2c55c63d9207fc3232fe83 https://github.com/dotnet/fsharp @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - ff289c438fabbdb4755f3c92c976763705140bd9 + 27d9215906a62c0a550ba19cd275a2dc94ad88b3 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - ee0a97a0009c0e048789126253fea7994db676ac + 52e9452f82e26f9fcae791e84c082ae22f1ef66f https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 6a0c76e05..175fcafd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.3-servicing.22123.7 + 6.0.4-servicing.22164.7 - 6.0.3-servicing.22124.2 + 6.0.4-servicing.22165.3 - 6.0.103 + 6.0.104 @@ -44,44 +44,44 @@ - 6.0.3 - 6.0.3 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 + 6.0.4 + 6.0.4 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 0.2.0 - 6.0.103-servicing.22124.18 - 6.0.103-servicing.22124.18 + 6.0.104-servicing.22168.3 + 6.0.104-servicing.22168.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.2 + 6.0.3 - 6.0.3-servicing.22123.9 - 6.0.3-servicing.22123.9 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 + 6.0.4-servicing.22164.4 + 6.0.4-servicing.22164.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 2.1.0 - 6.0.3-servicing.22124.3 - 6.0.3-servicing.22124.3 - 6.0.3 - 6.0.3 + 6.0.4-servicing.22165.2 + 6.0.4-servicing.22165.2 + 6.0.4 + 6.0.4 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.103 + 6.0.104 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -183,7 +183,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.2 + 6.0.4 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch b/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch deleted file mode 100644 index 721dc2879..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Sat, 19 Feb 2022 12:12:32 +0000 -Subject: [PATCH] Define SystemReflectionMetadataLoadContextVersion property - for package references - -System.Reflection.MetadataLoadContext references were using an incorrect version.props property which breaks source-build. -In 6.0.3 SystemReflectionMetadataVersion was revved but not SystemReflectionMetadataLoadContextVersion therefore breaking -the build because a System.Reflection.MetadataLoadContext with the SystemReflectionMetadataVersion does not exist. ---- - eng/Versions.props | 1 + - src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 5e9d0039096..34034aa87ba 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -86,6 +86,7 @@ - 5.0.0 - - 5.0.0 -+ 5.0.0 - 4.7.0 - 4.7.0 - 4.7.0 -diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -index 358de5541e3..abf6d26d9ef 100644 ---- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -@@ -23,11 +23,11 @@ - - - -- -+ - - - -- -+ - - - diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index a6a968ae9..5c9b2f490 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -85,13 +85,15 @@ $(SharedFrameworkRid) linux-x64 $(AspNetCoreSharedFxInstallerRid) - x64 + x64 + aarch64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) From 4ff8f79c3d19dd742f0b2b184a23759727673632 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Mar 2022 01:08:23 +0000 Subject: [PATCH 08/27] Merged PR 21732: [internal/release/6.0.2xx] 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.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.201-servicing.22123.7 to 6.0.202-servicing.22165.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (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.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0... --- NuGet.config | 10 ++ eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 50 ++++---- eng/common/templates/steps/source-build.yml | 4 +- ...lectionMetadataLoadContextVersion-pr.patch | 44 ------- src/redist/targets/GenerateLayout.targets | 4 +- 6 files changed, 98 insertions(+), 130 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch diff --git a/NuGet.config b/NuGet.config index 9a84139e5..58f43c70c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -35,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9930299ff..93bf591cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1217354ca79000178dca5bca83fe6ec490e1d2d6 + 167140c0529a64c91f7a82249583ce27e52d28dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded @@ -48,34 +48,34 @@ 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 - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c911002ab43b7b989ed67090f2a48d9073d5118d + 578ba6d8016785b53d7a96248ed6ccf211843b05 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 + 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 + 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 + 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11428db5b702966c7750a82c099718a398a1aa15 + a980151203a073b56b87d3ffe92ee6af68a27494 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11428db5b702966c7750a82c099718a398a1aa15 + a980151203a073b56b87d3ffe92ee6af68a27494 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f426c90a9589dabc16d114aa91bfea9f21f8571 + 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 560f243910f407df33fd5cdf06e2a857684f4bc7 + fcb07d637abf53791e2c55c63d9207fc3232fe83 https://github.com/dotnet/fsharp @@ -135,20 +135,20 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - 4a231cedcaf6b93b04d07e5f7670e88e5fa937fe + e9cfb5413a6a7a7b5bfc3b9a73671be2b18642cf linker - + https://github.com/dotnet/roslyn - dbffaa4a4e4507b8e8dcf0cae6e3209d32113391 + 5d10d428050c0d6afef30a072c4ae68776621877 - + https://github.com/dotnet/msbuild - ae57d105c6094d8d59fe42f557ad0dcb46ec285e + a02f73656613e752c73ff442cdd72540f4b09f57 @@ -166,13 +166,13 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - ee0a97a0009c0e048789126253fea7994db676ac + 52e9452f82e26f9fcae791e84c082ae22f1ef66f - + https://github.com/dotnet/emsdk - ee0a97a0009c0e048789126253fea7994db676ac + 52e9452f82e26f9fcae791e84c082ae22f1ef66f https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index b1a71dbe8..5e18e0d67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.3-servicing.22123.7 + 6.0.4-servicing.22164.7 - 6.0.3-servicing.22124.2 + 6.0.4-servicing.22165.3 - 6.0.201 + 6.0.202 @@ -44,44 +44,44 @@ - 6.0.3 - 6.0.3 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 - 6.0.3-servicing.22124.1 + 6.0.4 + 6.0.4 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 + 6.0.4-servicing.22167.10 0.2.0 - 6.0.201-servicing.22124.17 - 6.0.201-servicing.22124.17 + 6.0.202-servicing.22168.4 + 6.0.202-servicing.22168.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.2 + 6.0.3 - 6.0.3-servicing.22123.9 - 6.0.3-servicing.22123.9 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 + 6.0.4-servicing.22164.4 + 6.0.4-servicing.22164.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 2.1.0 - 6.0.3-servicing.22124.3 - 6.0.3-servicing.22124.3 - 6.0.3 - 6.0.3 + 6.0.4-servicing.22165.2 + 6.0.4-servicing.22165.2 + 6.0.4 + 6.0.4 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.201 + 6.0.202 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -182,8 +182,8 @@ 15.2.301-preview.13.2 12.1.301-preview.13.2 15.2.301-preview.13.2 - 6.0.2-mauipre.1.22102.15 - 6.0.2 + $(MicrosoftNETCoreAppRefPackageVersion) + 6.0.4 $(MicrosoftNETWorkloadEmscriptenManifest60200Version) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch b/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch deleted file mode 100644 index 721dc2879..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Sat, 19 Feb 2022 12:12:32 +0000 -Subject: [PATCH] Define SystemReflectionMetadataLoadContextVersion property - for package references - -System.Reflection.MetadataLoadContext references were using an incorrect version.props property which breaks source-build. -In 6.0.3 SystemReflectionMetadataVersion was revved but not SystemReflectionMetadataLoadContextVersion therefore breaking -the build because a System.Reflection.MetadataLoadContext with the SystemReflectionMetadataVersion does not exist. ---- - eng/Versions.props | 1 + - src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 5e9d0039096..34034aa87ba 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -86,6 +86,7 @@ - 5.0.0 - - 5.0.0 -+ 5.0.0 - 4.7.0 - 4.7.0 - 4.7.0 -diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -index 358de5541e3..abf6d26d9ef 100644 ---- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -@@ -23,11 +23,11 @@ - - - -- -+ - - - -- -+ - - - diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index a6a968ae9..5c9b2f490 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -85,13 +85,15 @@ $(SharedFrameworkRid) linux-x64 $(AspNetCoreSharedFxInstallerRid) - x64 + x64 + aarch64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) From 22cdfa11a3f73fdb5452f1382ff0c5b450aeeda2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Mar 2022 00:19:13 +0000 Subject: [PATCH 09/27] Merged PR 21924: [internal/release/6.0.1xx] 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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220321.26 - **Date Produced**: March 21, 2022 11:47:29 PM UTC - **Commit**: 53f7e9bf207e1a7bbe8253692a2087d42f549e18 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.104-servicing.22168.3 to 6.0.104-servicing.22171.26][1] - **Microsoft.NET.Sdk**: [from 6.0.104-servicing.22168.3 to 6.0.104-servicing.22171.26][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2] - **dotnet-dev-certs**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2] - **dotnet-user-secrets**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC50891b8&targetVersion=GC53f7e9b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC578ba6d&targetVersion=GCcdabbaa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24f6a0170..e86386cd5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d99be542c..71485c017 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 50891b83aa9eff002c8a5fb36ba422c4e2390b0e + 53f7e9bf207e1a7bbe8253692a2087d42f549e18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 50891b83aa9eff002c8a5fb36ba422c4e2390b0e + 53f7e9bf207e1a7bbe8253692a2087d42f549e18 diff --git a/eng/Versions.props b/eng/Versions.props index 175fcafd5..b03df2ec8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.4 6.0.4 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 0.2.0 - 6.0.104-servicing.22168.3 - 6.0.104-servicing.22168.3 + 6.0.104-servicing.22171.26 + 6.0.104-servicing.22171.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 322355cbc9cc064eb1b7cd3c11091e0bcb39bf06 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Mar 2022 01:09:30 +0000 Subject: [PATCH 10/27] Merged PR 21900: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220321.27 - **Date Produced**: March 22, 2022 12:41:39 AM UTC - **Commit**: bee413db0346cd7d46697e5ef00267cf4234c355 - **Branch**: refs/heads/internal/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.202-servicing.22168.4 to 6.0.202-servicing.22171.27][2] - **Microsoft.NET.Sdk**: [from 6.0.202-servicing.22168.4 to 6.0.202-servicing.22171.27][2] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][3] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][3] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3] - **dotnet-dev-certs**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3] - **dotnet-user-secrets**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa980151&targetVersion=GCbee413d&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC578ba6d&targetVersion=GCcdabbaa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120) [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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 58f43c70c..4205579dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93bf591cf..5180e1313 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 578ba6d8016785b53d7a96248ed6ccf211843b05 + cdabbaa6ffb048ff964474b934f54bfde1cfc6ff https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a980151203a073b56b87d3ffe92ee6af68a27494 + bee413db0346cd7d46697e5ef00267cf4234c355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a980151203a073b56b87d3ffe92ee6af68a27494 + bee413db0346cd7d46697e5ef00267cf4234c355 diff --git a/eng/Versions.props b/eng/Versions.props index 5e18e0d67..3de1c20c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.4 6.0.4 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 - 6.0.4-servicing.22167.10 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 + 6.0.4-servicing.22171.7 0.2.0 - 6.0.202-servicing.22168.4 - 6.0.202-servicing.22168.4 + 6.0.202-servicing.22171.27 + 6.0.202-servicing.22171.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 915d644e451858f4f7c6e1416ea202695ddd54fb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Mar 2022 19:04:48 +0000 Subject: [PATCH 11/27] Merged PR 21937: [internal/release/6.0.1xx] 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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220322.6 - **Date Produced**: March 22, 2022 6:16:01 PM UTC - **Commit**: 50e695e438ba9f826633d4127d891d53fd972314 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.104-servicing.22171.26 to 6.0.104-servicing.22172.6][1] - **Microsoft.NET.Sdk**: [from 6.0.104-servicing.22171.26 to 6.0.104-servicing.22172.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **dotnet-dev-certs**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **dotnet-user-secrets**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC53f7e9b&targetVersion=GC50e695e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcdabbaa&targetVersion=GCf9ae0f5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e86386cd5..b8a901099 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71485c017..6be2a00c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f7e9bf207e1a7bbe8253692a2087d42f549e18 + 50e695e438ba9f826633d4127d891d53fd972314 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f7e9bf207e1a7bbe8253692a2087d42f549e18 + 50e695e438ba9f826633d4127d891d53fd972314 diff --git a/eng/Versions.props b/eng/Versions.props index b03df2ec8..6eb21299d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.4 6.0.4 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 0.2.0 - 6.0.104-servicing.22171.26 - 6.0.104-servicing.22171.26 + 6.0.104-servicing.22172.6 + 6.0.104-servicing.22172.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f8a55617d250f5db711e7425428671da5f1967a3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Mar 2022 20:11:28 +0000 Subject: [PATCH 12/27] Merged PR 21938: [internal/release/6.0.2xx] 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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220322.7 - **Date Produced**: March 22, 2022 7:37:17 PM UTC - **Commit**: 48cdb7a16e8277e63c5bb52f97bb02198d1a9759 - **Branch**: refs/heads/internal/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.202-servicing.22171.27 to 6.0.202-servicing.22172.7][1] - **Microsoft.NET.Sdk**: [from 6.0.202-servicing.22171.27 to 6.0.202-servicing.22172.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **dotnet-dev-certs**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] - **dotnet-user-secrets**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbee413d&targetVersion=GC48cdb7a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcdabbaa&targetVersion=GCf9ae0f5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4205579dd..e885f4e2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5180e1313..4d2b4672a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cdabbaa6ffb048ff964474b934f54bfde1cfc6ff + f9ae0f5d30be2de3c0de61b5673bd8873231d70a https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 65f76a98c392556c2c395b78a9e4ab2bd9750bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bee413db0346cd7d46697e5ef00267cf4234c355 + 48cdb7a16e8277e63c5bb52f97bb02198d1a9759 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bee413db0346cd7d46697e5ef00267cf4234c355 + 48cdb7a16e8277e63c5bb52f97bb02198d1a9759 diff --git a/eng/Versions.props b/eng/Versions.props index 3de1c20c5..94207a722 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.4 6.0.4 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 - 6.0.4-servicing.22171.7 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 + 6.0.4-servicing.22172.4 0.2.0 - 6.0.202-servicing.22171.27 - 6.0.202-servicing.22171.27 + 6.0.202-servicing.22172.7 + 6.0.202-servicing.22172.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a89f33d29dc0154b83275f59844a38a724d81fa Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Apr 2022 12:58:57 -0700 Subject: [PATCH 13/27] Update branding to 6.0.105 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6a0c76e05..678e2a40a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 9ab192a3a9b84df50585773dcc404b1f38ae832a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Apr 2022 12:59:02 -0700 Subject: [PATCH 14/27] Update branding to 6.0.203 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b1a71dbe8..acb24212e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From e70e2b3f4943ddf073114bf56349fa7abe7a63fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 15:11:36 +0000 Subject: [PATCH 15/27] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.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 b91798abb..ce998415d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/source-build-reference-packages - 7cdb7a26c89847fcd5dc72ef5eba659030f57666 + e5429803f3e9064da8a857b561a07489800f3f29 From aca24a9b5ad3f7d7dc98d09bda4f4f32858d8d96 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Apr 2022 13:27:03 -0700 Subject: [PATCH 16/27] [6.0.1xx] Update asp.net template versions (#13543) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3c78b3b55..7f1b5381e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.15 + 5.0.16 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.23 + 3.1.24 3.2.1 4.8.0-rc2.19462.10 From 753cdcf45f3f141318a9b003a0adab64665bf5e3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Apr 2022 13:30:37 -0700 Subject: [PATCH 17/27] [6.0.2xx] Update asp.net template versions (#13544) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e93ceedc3..2300d2523 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.15 + 5.0.16 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.23 + 3.1.24 3.2.1 4.8.0-rc2.19462.10 From 8d32713c4ed6f9e49b5b4cb18bf42ac733aef3f4 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 12 Apr 2022 17:36:01 -0700 Subject: [PATCH 18/27] update global.json and Versions.props for .NET SDK 6.0.104 (#13607) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f1b5381e..b34c1170a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.103 + 6.0.104 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 4947d6f9a..8f624df61 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.103" + "dotnet": "6.0.104" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 660c499ef65aa11165344956bff0a64b789e4397 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 13 Apr 2022 07:58:07 -0700 Subject: [PATCH 19/27] Windows SDK projection update (#13612) --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 0c141e3cb..8543f5e5c 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,10 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.24 - 10.0.18362.24 - 10.0.19041.24 - 10.0.20348.24 - 10.0.22000.24 + 10.0.17763.25 + 10.0.18362.25 + 10.0.19041.25 + 10.0.20348.25 + 10.0.22000.25 From ef856a09d16f0a5a3b9fd46ef64a49ab219ab3c0 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 13 Apr 2022 07:58:28 -0700 Subject: [PATCH 20/27] Windows SDK projection update (#13613) --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 0c141e3cb..8543f5e5c 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,10 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.24 - 10.0.18362.24 - 10.0.19041.24 - 10.0.20348.24 - 10.0.22000.24 + 10.0.17763.25 + 10.0.18362.25 + 10.0.19041.25 + 10.0.20348.25 + 10.0.22000.25 From f17fb6728cfc56b6e10f86d79524d0ad372537de Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Apr 2022 08:02:27 -0700 Subject: [PATCH 21/27] Final branding for 6.0.300 (#13608) --- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f98b402e3..28c0cb2ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,11 +10,11 @@ 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1bbe3f77b..f311e197b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - $([MSBuild]::Add($(VersionFeature), 23)) - $([MSBuild]::Add($(VersionFeature), 15)) + $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 17)) From 4464c99669f23f444000ede610ffabfeae5a2d3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Apr 2022 15:10:21 +0000 Subject: [PATCH 22/27] Update dependencies from https://github.com/dotnet/arcade build 20220412.5 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22206.7 -> To Version 6.0.0-beta.22212.5 --- NuGet.config | 11 +++-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index e885f4e2b..f03617759 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,21 @@ - + + + - - - @@ -41,15 +40,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35c32467d..19158a728 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 1ce62f442..9f4b10e46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22206.7 + 6.0.0-beta.22212.5 diff --git a/global.json b/global.json index b50ccb2be..b645142d3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.103", + "dotnet": "6.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" } } From 5ac5af9b4820b158d92a19fb238ba8f53bfe505b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 08:54:04 -0700 Subject: [PATCH 23/27] Update dependencies from https://github.com/dotnet/arcade build 20220412.5 (#13619) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22206.7 -> To Version 6.0.0-beta.22212.5 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 11 +++-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8a901099..28408ac24 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,20 @@ - + + + - - - @@ -42,15 +41,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 507d23dd5..131a316f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3bdc249c2..ee8500d06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22206.7 + 6.0.0-beta.22212.5 diff --git a/global.json b/global.json index b50ccb2be..b645142d3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.103", + "dotnet": "6.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" } } From f47eaa666b7099c0b7ed6c1b13532962498cfb51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:30:44 -0700 Subject: [PATCH 24/27] Update dependencies from https://github.com/dotnet/arcade build 20220412.5 (#13626) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22206.7 -> To Version 6.0.0-beta.22212.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 630899ac1..ae8bd64c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 1a6b24397e50146d0fece9cfb9c0b87275691e6f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 28c0cb2ba..60da7aa12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22206.7 + 6.0.0-beta.22212.5 diff --git a/global.json b/global.json index b50ccb2be..b645142d3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.103", + "dotnet": "6.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" } } From 6c8f85b46e60eb389de0952646e690a78ea5e3f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:44:12 -0700 Subject: [PATCH 25/27] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13622) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22213.1 Co-authored-by: dotnet-maestro[bot] --- 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 ae8bd64c7..2aeef5ed3 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 - 7cdb7a26c89847fcd5dc72ef5eba659030f57666 + 60845bf36f0dd6dd310070548a58cb8ad3ab513c From 28696f02e1a1496c051d092e59d08f425a71e50f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 10:04:10 -0700 Subject: [PATCH 26/27] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13624) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22208.1 -> To Version 6.0.0-servicing.22213.1 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 11 +++-------- eng/Version.Details.xml | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index e885f4e2b..f03617759 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,21 @@ - + + + - - - @@ -41,15 +40,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35c32467d..de2cfd9e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/source-build-reference-packages - e5429803f3e9064da8a857b561a07489800f3f29 + 60845bf36f0dd6dd310070548a58cb8ad3ab513c From d419470991d88a7b15c2316e9642ac4f76abd6e5 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 13 Apr 2022 20:27:25 -0700 Subject: [PATCH 27/27] Add patch for linker prebuilt (#13630) (#13633) Co-authored-by: Michael Simons --- ...e-BannedApiAnalyzers-usage-in-source.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch 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 new file mode 100644 index 000000000..f7d7668dc --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch @@ -0,0 +1,24 @@ +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 +