From e8a1742faf95cd3048445ed24fe269bccda37e71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 22:53:58 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/sdk build 20220328.11 (#13479) [release/6.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b928d799..8473875a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 50565d62db55b5c74f1f1dd014375e30f7ff52e5 - + https://github.com/dotnet/sdk - 24e38f35e21aa86e33211bccef2d60673d62ce66 + 84b9882ed6bf24c128e2919baa06ffc28a6b638d - + https://github.com/dotnet/sdk - 24e38f35e21aa86e33211bccef2d60673d62ce66 + 84b9882ed6bf24c128e2919baa06ffc28a6b638d diff --git a/eng/Versions.props b/eng/Versions.props index 30056fc82..e8531dbff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.8 - 6.0.300-preview.22178.8 + 6.0.300-preview.22178.11 + 6.0.300-preview.22178.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5eaa033de552d8a06d5e2c07273b7749d419796c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Mar 2022 23:11:10 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/sdk build 20220328.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.11 -> To Version 6.0.300-preview.22178.12 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22174.5 -> To Version 6.0.300-preview.22178.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8473875a8..0fac4c52d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 50565d62db55b5c74f1f1dd014375e30f7ff52e5 + e9956e12143288613ffd82b759e4bd615e94f3bc - + https://github.com/dotnet/templating - 50565d62db55b5c74f1f1dd014375e30f7ff52e5 + e9956e12143288613ffd82b759e4bd615e94f3bc - + https://github.com/dotnet/templating - 50565d62db55b5c74f1f1dd014375e30f7ff52e5 + e9956e12143288613ffd82b759e4bd615e94f3bc - + https://github.com/dotnet/sdk - 84b9882ed6bf24c128e2919baa06ffc28a6b638d + 8b054513807e6e62dc0c6135cd93ec6813adb72e - + https://github.com/dotnet/sdk - 84b9882ed6bf24c128e2919baa06ffc28a6b638d + 8b054513807e6e62dc0c6135cd93ec6813adb72e diff --git a/eng/Versions.props b/eng/Versions.props index e8531dbff..dfaae54ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22174.5 + 6.0.300-preview.22178.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.11 - 6.0.300-preview.22178.11 + 6.0.300-preview.22178.12 + 6.0.300-preview.22178.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22174.5 + 6.0.300-preview.22178.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 00f8bcd9ceced8b8be0a22a09820c027f9343a1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Mar 2022 06:55:39 +0000 Subject: [PATCH 03/14] Update dependencies from https://github.com/dotnet/sdk build 20220328.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.12 -> To Version 6.0.300-preview.22178.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.0.3-beta.22176.1 -> To Version 12.0.3-beta.22178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fac4c52d..b3d280ca9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating e9956e12143288613ffd82b759e4bd615e94f3bc - + https://github.com/dotnet/sdk - 8b054513807e6e62dc0c6135cd93ec6813adb72e + 8fd04f4a194748c54ea7e0f6e39a12f8b0d02cb4 - + https://github.com/dotnet/sdk - 8b054513807e6e62dc0c6135cd93ec6813adb72e + 8fd04f4a194748c54ea7e0f6e39a12f8b0d02cb4 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 17f2bc5e7a620204148150a536cb37a68ce03f1e + 6da0245a7ce4bb8483b8d1f2993c8ecaea967ad9 - + https://github.com/dotnet/fsharp - 17f2bc5e7a620204148150a536cb37a68ce03f1e + 6da0245a7ce4bb8483b8d1f2993c8ecaea967ad9 @@ -135,9 +135,9 @@ 75765f2afc7425f47efde1a59a8eb86cf81658f9 - + https://github.com/dotnet/linker - eab62f9046510f4dce671103470e0be9bc68b04b + 01c4f5905959c29f86781b85187bb676fc517ee9 linker @@ -146,9 +146,9 @@ f81a859bb414665faafaf9f48b15d76c30df06a0 - + https://github.com/dotnet/msbuild - 058a0262c6b37fba7bb55ec03315232d5d83be6e + 1160f4e0e21969ec6db1529439a9e029ea256b2b diff --git a/eng/Versions.props b/eng/Versions.props index dfaae54ac..8ab302437 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.12 - 6.0.300-preview.22178.12 + 6.0.300-preview.22178.13 + 6.0.300-preview.22178.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 197e06982e566f26ad1b150d66b725c57df99ff5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 29 Mar 2022 10:22:40 -0700 Subject: [PATCH 04/14] Update implicit version for March release --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1cf223da9..1bbe3f77b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - $([MSBuild]::Add($(VersionFeature), 22)) - $([MSBuild]::Add($(VersionFeature), 14)) + $([MSBuild]::Add($(VersionFeature), 23)) + $([MSBuild]::Add($(VersionFeature), 15)) From d1a04c77336d9ab659a8f57cf5a97d3a712e7ae1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 19:56:54 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220329.1 (#13487) [release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3d280ca9..267a51ed3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/source-build-reference-packages - a4550df3cb245c4dfd9601c67f86a27a88aad962 + dfdfa4ee297fe8daa90cd623c5b612abf3f60873 From b68528f6e4638d6512e70d2d9dd11462daf68f23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Mar 2022 21:21:04 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/sdk build 20220329.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.13 -> To Version 6.0.300-preview.22179.7 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.300-preview.22178.2 -> To Version 6.0.300-preview.22179.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 267a51ed3..e08e70d88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - e9956e12143288613ffd82b759e4bd615e94f3bc + a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/templating - e9956e12143288613ffd82b759e4bd615e94f3bc + a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/templating - e9956e12143288613ffd82b759e4bd615e94f3bc + a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 8fd04f4a194748c54ea7e0f6e39a12f8b0d02cb4 + a794c8e3eed9c28e6bf076837c0647353d0e3088 - + https://github.com/dotnet/sdk - 8fd04f4a194748c54ea7e0f6e39a12f8b0d02cb4 + a794c8e3eed9c28e6bf076837c0647353d0e3088 diff --git a/eng/Versions.props b/eng/Versions.props index 8ab302437..34ab4da3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22178.2 + 6.0.300-preview.22179.3 @@ -56,8 +56,8 @@ - 6.0.300-preview.22178.13 - 6.0.300-preview.22178.13 + 6.0.300-preview.22179.7 + 6.0.300-preview.22179.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22178.2 + 6.0.300-preview.22179.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From ed92a34e14cdea16556f3c55886ede2611593647 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Mar 2022 22:22:57 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/sdk build 20220329.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.13 -> To Version 6.0.300-preview.22179.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.2 -> To Version 6.0.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++----------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e08e70d88..66ccd23ee 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 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - a794c8e3eed9c28e6bf076837c0647353d0e3088 + 395ee52bf2672f1f30eff393fb9823b249d1be31 - + https://github.com/dotnet/sdk - a794c8e3eed9c28e6bf076837c0647353d0e3088 + 395ee52bf2672f1f30eff393fb9823b249d1be31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ad241b9633924db40503de19cb502bb0aca7718 + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fb76229895cae74c1adc62c2411a0730a2f3759b + 560f243910f407df33fd5cdf06e2a857684f4bc7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 34ab4da3a..711a619ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.2-servicing.22064.7 + 6.0.3-servicing.22123.7 - 6.0.2-servicing.22064.8 + 6.0.3-servicing.22124.2 @@ -44,44 +44,44 @@ - 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.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.300-preview.22179.7 - 6.0.300-preview.22179.7 + 6.0.300-preview.22179.9 + 6.0.300-preview.22179.9 $(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.22123.9 + 6.0.3-servicing.22123.9 + 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.22124.3 + 6.0.3-servicing.22124.3 + 6.0.3 + 6.0.3 From be1de896246c96a53474e69ae7f11b02943f1995 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 01:06:28 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/sdk build 20220329.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22178.13 -> To Version 6.0.300-preview.22179.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.2 -> To Version 6.0.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66ccd23ee..f780e5e7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 395ee52bf2672f1f30eff393fb9823b249d1be31 + 83fa3101fc591e536182a3d7e11afb2af4451053 - + https://github.com/dotnet/sdk - 395ee52bf2672f1f30eff393fb9823b249d1be31 + 83fa3101fc591e536182a3d7e11afb2af4451053 diff --git a/eng/Versions.props b/eng/Versions.props index 711a619ba..24219dd38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22179.9 - 6.0.300-preview.22179.9 + 6.0.300-preview.22179.12 + 6.0.300-preview.22179.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3552c0c745ccb599966cb939f827259c7cce412c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 03:05:53 +0000 Subject: [PATCH 09/14] Update dependencies from https://github.com/dotnet/sdk build 20220329.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22179.12 -> To Version 6.0.300-preview.22179.13 Dependency coherency updates NuGet.Build.Tasks From Version 6.2.0-preview.2.123 -> To Version 6.2.0-preview.3.131 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f780e5e7c..1882e1c32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 83fa3101fc591e536182a3d7e11afb2af4451053 + 1bdcbe784bba3c3a2b5782e2895648cccd51057c - + https://github.com/dotnet/sdk - 83fa3101fc591e536182a3d7e11afb2af4451053 + 1bdcbe784bba3c3a2b5782e2895648cccd51057c @@ -151,9 +151,9 @@ 1160f4e0e21969ec6db1529439a9e029ea256b2b - + https://github.com/nuget/nuget.client - 8bda466765accefccf516850745ad30dceeab381 + bc4b41f3ca294ccc8aedc8af5159c215943e1ed2 diff --git a/eng/Versions.props b/eng/Versions.props index 24219dd38..e4a91c645 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22179.12 - 6.0.300-preview.22179.12 + 6.0.300-preview.22179.13 + 6.0.300-preview.22179.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dfc566c7d5b9fe3db00726f5446edefaa95fc4fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 05:32:24 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/sdk build 20220329.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22179.12 -> To Version 6.0.300-preview.22179.17 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.2.0-2.22172.6 -> To Version 4.2.0-3.22179.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1882e1c32..92dbc7294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 1bdcbe784bba3c3a2b5782e2895648cccd51057c + 499994760294854e9c5e479e9ccddcd6342fcbc1 - + https://github.com/dotnet/sdk - 1bdcbe784bba3c3a2b5782e2895648cccd51057c + 499994760294854e9c5e479e9ccddcd6342fcbc1 @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - f81a859bb414665faafaf9f48b15d76c30df06a0 + 8525a1e194a1624dd4f3cb58c4e516745fb4cd63 - + https://github.com/dotnet/msbuild - 1160f4e0e21969ec6db1529439a9e029ea256b2b + ce7523296d7ddb70fb61a68e84bc2ff38e012e35 diff --git a/eng/Versions.props b/eng/Versions.props index e4a91c645..df871dfda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22179.13 - 6.0.300-preview.22179.13 + 6.0.300-preview.22179.17 + 6.0.300-preview.22179.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14f2cf31bd480bcbf023015dcad26642992235c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Mar 2022 19:15:24 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/sdk build 20220330.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22179.12 -> To Version 6.0.300-preview.22180.6 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.2.0-2.22172.6 -> To Version 4.2.0-3.22179.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92dbc7294..1e310aa3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating a3441bf58ca476d7415197bcf86349d254abe120 - + https://github.com/dotnet/sdk - 499994760294854e9c5e479e9ccddcd6342fcbc1 + 8d98fcc1b94921ff366ae9c91b0ecefb3308c35b - + https://github.com/dotnet/sdk - 499994760294854e9c5e479e9ccddcd6342fcbc1 + 8d98fcc1b94921ff366ae9c91b0ecefb3308c35b diff --git a/eng/Versions.props b/eng/Versions.props index df871dfda..07d446f53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22179.17 - 6.0.300-preview.22179.17 + 6.0.300-preview.22180.6 + 6.0.300-preview.22180.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From abff1f8b19adce3b6dff1b55a90c4c3a1ca61e8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Mar 2022 00:19:52 +0000 Subject: [PATCH 12/14] Update dependencies from https://github.com/dotnet/sdk build 20220330.9 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22179.12 -> To Version 6.0.300-preview.22180.9 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.300-preview.22179.3 -> To Version 6.0.300-preview.22180.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e310aa3e..5f9605f5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - a3441bf58ca476d7415197bcf86349d254abe120 + b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/templating - a3441bf58ca476d7415197bcf86349d254abe120 + b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/templating - a3441bf58ca476d7415197bcf86349d254abe120 + b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - 8d98fcc1b94921ff366ae9c91b0ecefb3308c35b + eb5e7c9a4e3be4190ae62c0b390e529514e17415 - + https://github.com/dotnet/sdk - 8d98fcc1b94921ff366ae9c91b0ecefb3308c35b + eb5e7c9a4e3be4190ae62c0b390e529514e17415 diff --git a/eng/Versions.props b/eng/Versions.props index 07d446f53..6d0f78ba9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22179.3 + 6.0.300-preview.22180.3 @@ -56,8 +56,8 @@ - 6.0.300-preview.22180.6 - 6.0.300-preview.22180.6 + 6.0.300-preview.22180.9 + 6.0.300-preview.22180.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22179.3 + 6.0.300-preview.22180.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 5ad51d6f86b1f6f9b246d91c62c47af34cdad975 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 31 Mar 2022 00:35:58 +0000 Subject: [PATCH 13/14] Remove source-build patches that were backported --- ...tem.Threading.Tasks.DataFlow-version.patch | 28 ------------- ...03-remove-Microsoft.DotNet-prebuilts.patch | 25 ----------- ...st-build-of-csi-vbi-for-source-build.patch | 41 ------------------- 3 files changed, 94 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch b/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch deleted file mode 100644 index f48a864fe..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 23 Nov 2021 16:13:36 +0000 -Subject: [PATCH] Update System.Threading.Tasks.DataFlow version - -Addresses: -NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version. [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] -NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] -NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] - -Backport issue: https://github.com/dotnet/source-build/issues/2311 ---- - build/packages.targets | 2 +- - 1 file changed, 1 insertions(+), 1 deletions(-) - -diff --git a/build/packages.targets b/build/packages.targets -index a0aa4cc..ef5a1cc 100644 ---- a/build/packages.targets -+++ b/build/packages.targets -@@ -58,7 +59,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch b/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch deleted file mode 100644 index 28d60fc27..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7260c572b1ce424f7ff3a64aa3227417c6a7a676 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Fri, 8 Oct 2021 00:56:41 +0000 -Subject: [PATCH] remove Microsoft.DotNet prebuilts - -Pull request for applying this patch: https://github.com/dotnet/roslyn/pull/57159 ---- - eng/Tools.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Tools.props b/eng/Tools.props -index 1579b510558..944448855ee 100644 ---- a/eng/Tools.props -+++ b/eng/Tools.props -@@ -1,6 +1,6 @@ - - -- -+ - @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 560f243910f407df33fd5cdf06e2a857684f4bc7 - + https://github.com/dotnet/fsharp - 6da0245a7ce4bb8483b8d1f2993c8ecaea967ad9 + 429f69989460da0182a5d4ba40ee2036856d8921 - + https://github.com/dotnet/fsharp - 6da0245a7ce4bb8483b8d1f2993c8ecaea967ad9 + 429f69989460da0182a5d4ba40ee2036856d8921 diff --git a/eng/Versions.props b/eng/Versions.props index 6d0f78ba9..8dec04b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22180.9 - 6.0.300-preview.22180.9 + 6.0.300-preview.22180.11 + 6.0.300-preview.22180.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)