From 1e961021e4cb1d955854d3fe2003ddb6083e91ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jan 2022 23:38:05 +0000 Subject: [PATCH 01/50] Update dependencies from https://github.com/dotnet/sdk build 20220126.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22076.9 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++----- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb9fdce5f..3277993b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 6ca80ba4d8c6f3087176440622bbdb90e78d3708 + 70cef52a878e81b9cada704b9f2f04ffdc7e7e30 - + https://github.com/dotnet/sdk - 6ca80ba4d8c6f3087176440622bbdb90e78d3708 + 70cef52a878e81b9cada704b9f2f04ffdc7e7e30 @@ -121,39 +121,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f + 28587dc14946a1c623dd6b1fb498272aff48f92e - + https://github.com/dotnet/fsharp - f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f + 28587dc14946a1c623dd6b1fb498272aff48f92e - + https://github.com/microsoft/vstest - a809880e02d8a9986e3ba1daeeeb5078fbb96be5 + d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - d0662ed8db919642177ddfd06a1c33895a69015f + 70dc7f6daaf50e8eb67afb91876b8efc8330103f linker - + https://github.com/dotnet/roslyn - f206c5d203c5562f814d3afa3c9e695250391c76 + 637de22a0f15f93be1b5b9204b767d276077c633 - + https://github.com/dotnet/msbuild - 797fd829a374a880f63fd4eea4ea6990404c48f4 + 9ef2fa86f5caa734e697f5bffea80237f8100e43 - + https://github.com/nuget/nuget.client - 9187a50daec29061772a2057490697c6c0e4c354 + f1906d3d581e0ea0bdd282134208d654f8447880 diff --git a/eng/Versions.props b/eng/Versions.props index 961d6500f..8955f3f9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.21623.5 + 6.0.200-preview.22062.10 @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.23 - 6.0.200-preview.22055.23 + 6.0.300-preview.22076.9 + 6.0.300-preview.22076.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.21623.5 + 6.0.200-preview.22062.10 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211210-01 + 17.1.0-release-20220113-05 From 464910c153a4cb80b84d770360462ee2fed50fc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 01:53:54 +0000 Subject: [PATCH 02/50] Update dependencies from https://github.com/dotnet/sdk build 20220126.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22076.11 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 3277993b8..da4cb6e26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 70cef52a878e81b9cada704b9f2f04ffdc7e7e30 + 09e66623fb1ce0ac5682517a50df4f00a5fa5ddf - + https://github.com/dotnet/sdk - 70cef52a878e81b9cada704b9f2f04ffdc7e7e30 + 09e66623fb1ce0ac5682517a50df4f00a5fa5ddf diff --git a/eng/Versions.props b/eng/Versions.props index 8955f3f9b..2efa9789f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22076.9 - 6.0.300-preview.22076.9 + 6.0.300-preview.22076.11 + 6.0.300-preview.22076.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 723a8f25cc9b8862737b79555cf3858f481eb436 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 02:42:13 +0000 Subject: [PATCH 03/50] Update dependencies from https://github.com/dotnet/sdk build 20220126.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22076.14 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 da4cb6e26..4cf0703f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 09e66623fb1ce0ac5682517a50df4f00a5fa5ddf + 629cde59e0d62e1324d7196cb900be24a81ace89 - + https://github.com/dotnet/sdk - 09e66623fb1ce0ac5682517a50df4f00a5fa5ddf + 629cde59e0d62e1324d7196cb900be24a81ace89 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 28587dc14946a1c623dd6b1fb498272aff48f92e + 3a271d5f0ff3ee996da0894a9446207087f09bd2 - + https://github.com/dotnet/fsharp - 28587dc14946a1c623dd6b1fb498272aff48f92e + 3a271d5f0ff3ee996da0894a9446207087f09bd2 diff --git a/eng/Versions.props b/eng/Versions.props index 2efa9789f..8d77a663f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22076.11 - 6.0.300-preview.22076.11 + 6.0.300-preview.22076.14 + 6.0.300-preview.22076.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 986baf26ed3f197743d340432458ef66d920f1dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 06:07:10 +0000 Subject: [PATCH 04/50] Update dependencies from https://github.com/dotnet/sdk build 20220126.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22076.21 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 4cf0703f1..190a9e45c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 629cde59e0d62e1324d7196cb900be24a81ace89 + ee627a5f5a3e93250d85026c0e51be9a5ab8ef67 - + https://github.com/dotnet/sdk - 629cde59e0d62e1324d7196cb900be24a81ace89 + ee627a5f5a3e93250d85026c0e51be9a5ab8ef67 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 3a271d5f0ff3ee996da0894a9446207087f09bd2 + 6eaa9c7d1770c575294c52ab7f3944a1842430cd - + https://github.com/dotnet/fsharp - 3a271d5f0ff3ee996da0894a9446207087f09bd2 + 6eaa9c7d1770c575294c52ab7f3944a1842430cd diff --git a/eng/Versions.props b/eng/Versions.props index 8d77a663f..551eec7cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22076.14 - 6.0.300-preview.22076.14 + 6.0.300-preview.22076.21 + 6.0.300-preview.22076.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bbd3a7224bd638bad4fc16f9182108f4d932f7bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 17:00:47 +0000 Subject: [PATCH 05/50] Update dependencies from https://github.com/dotnet/sdk build 20220127.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22077.5 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 190a9e45c..8578a2a80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - ee627a5f5a3e93250d85026c0e51be9a5ab8ef67 + 47c3dd45c70391d98068087ce73df6f8c9d419e2 - + https://github.com/dotnet/sdk - ee627a5f5a3e93250d85026c0e51be9a5ab8ef67 + 47c3dd45c70391d98068087ce73df6f8c9d419e2 diff --git a/eng/Versions.props b/eng/Versions.props index 551eec7cf..a6345c87f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22076.21 - 6.0.300-preview.22076.21 + 6.0.300-preview.22077.5 + 6.0.300-preview.22077.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59755fe85d35a017f64a092d97d71e836c480a1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 19:21:24 +0000 Subject: [PATCH 06/50] Update dependencies from https://github.com/dotnet/sdk build 20220127.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22077.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 8578a2a80..91115f38c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 47c3dd45c70391d98068087ce73df6f8c9d419e2 + c8e0d741ad056a19f0ecfef33815e7a59096c213 - + https://github.com/dotnet/sdk - 47c3dd45c70391d98068087ce73df6f8c9d419e2 + c8e0d741ad056a19f0ecfef33815e7a59096c213 diff --git a/eng/Versions.props b/eng/Versions.props index a6345c87f..3f393838c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22077.5 - 6.0.300-preview.22077.5 + 6.0.300-preview.22077.8 + 6.0.300-preview.22077.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76632510c44507cb35b1dccdb97d302463847e8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 22:03:36 +0000 Subject: [PATCH 07/50] Update dependencies from https://github.com/dotnet/sdk build 20220127.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22077.9 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 91115f38c..623ce00af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - c8e0d741ad056a19f0ecfef33815e7a59096c213 + c71ca5efe988ddff9ac80f385ce7854ec4b3398f - + https://github.com/dotnet/sdk - c8e0d741ad056a19f0ecfef33815e7a59096c213 + c71ca5efe988ddff9ac80f385ce7854ec4b3398f diff --git a/eng/Versions.props b/eng/Versions.props index 3f393838c..d876617ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22077.8 - 6.0.300-preview.22077.8 + 6.0.300-preview.22077.9 + 6.0.300-preview.22077.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6d6fe7d2589b492b062a0b95a7875db43a3a93dc Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 28 Jan 2022 01:53:49 +0000 Subject: [PATCH 08/50] Remove source-build patches that were backported --- .../0001-Fix-MicrosoftExtensionsVersion.patch | 68 -------- ...2-Update-system-command-line-version.patch | 164 ------------------ .../0001-fix-tlens-Mono.Cecil-reference.patch | 24 --- ...t.DotNet.ApiCompat-from-source-build.patch | 24 --- ...t.NETFramework.ReferenceAssemblies-f.patch | 23 --- ...e-building-all-TFMs-for-source-build.patch | 50 ------ ...y-on-MS.VS.Setup.Configuration.Inter.patch | 118 ------------- 7 files changed, 471 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0001-fix-tlens-Mono.Cecil-reference.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0002-Exclude-Microsoft.DotNet.ApiCompat-from-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch deleted file mode 100644 index 7d5d03116..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 22 Oct 2021 13:26:33 -0500 -Subject: [PATCH] Fix MicrosoftExtensionsVersion - -Move it to eng/Versions.props to make it overridable, and rename it to match an -actual package ID. - -Update paramater nullability in src/Logging/SimpleConsoleLogger.cs to be -source-compatible with the 6.0 version of these packages. - -See https://github.com/dotnet/format/issues/1400 ---- - Directory.Packages.props | 7 +++---- - eng/Versions.props | 1 + - src/Logging/SimpleConsoleLogger.cs | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c2..9b579ea 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -2,7 +2,6 @@ - - - -- 5.0.0 - - 6.0.0-preview.4.221 - -@@ -25,9 +24,9 @@ - - - -- -- -- -+ -+ -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index b1990aa..f6ddbbd 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -15,6 +15,7 @@ - - 16.11.0 - 3.3.2 -+ 5.0.0 - - 4.0.0-6.21526.21 - -diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs -index c361f84..fd8015c 100644 ---- a/src/Logging/SimpleConsoleLogger.cs -+++ b/src/Logging/SimpleConsoleLogger.cs -@@ -37,7 +37,7 @@ namespace Microsoft.CodeAnalysis.Tools.Logging - _minimalErrorLevel = minimalErrorLevel; - } - -- public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) -+ public void Log(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter) - { - if (!IsEnabled(logLevel)) - { diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch deleted file mode 100644 index 68917950e..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 19 Nov 2021 13:50:52 -0600 -Subject: [PATCH] Update system-command-line version - -Backported with https://github.com/dotnet/format/pull/1436 ---- - eng/Version.Details.xml | 8 ++++---- - eng/Versions.props | 4 ++-- - src/Commands/FormatAnalyzersCommand.cs | 4 ++-- - src/Commands/FormatCommandCommon.cs | 12 ++++++------ - src/Commands/FormatStyleCommand.cs | 4 ++-- - src/Commands/RootFormatCommand.cs | 4 ++-- - 6 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 48b181b..68c0b43 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -5,13 +5,13 @@ - https://github.com/dotnet/roslyn - c7d6f9fab845ffd943216da465022744e7d35f22 - -- -+ - https://github.com/dotnet/command-line-api -- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 -+ 09a24a79ef01a0c70655919ee3c59bb54a8574df - -- -+ - https://github.com/dotnet/command-line-api -- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 -+ 09a24a79ef01a0c70655919ee3c59bb54a8574df - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 2758207..6a02917 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -18,8 +18,8 @@ - - 4.0.0-6.21526.21 - -- 2.0.0-beta1.21473.1 -- 0.3.0-alpha.21473.1 -+ 2.0.0-beta1.21525.1 -+ 0.3.0-alpha.21525.1 - - - -- -+ - - - -\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch b/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch deleted file mode 100644 index 8458c20e5..000000000 --- a/src/SourceBuild/tarball/patches/linker/0003-Upgrade-Microsoft.NETFramework.ReferenceAssemblies-f.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 20 Oct 2021 14:38:14 +0000 -Subject: [PATCH 1/2] Upgrade Microsoft.NETFramework.ReferenceAssemblies from - 1.0.0 to 1.0.2 - -Backport PR: https://github.com/dotnet/linker/pull/2326 ---- - src/ILLink.Tasks/ILLink.Tasks.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj -index 0ecf5d1..7501ecb 100644 ---- a/src/ILLink.Tasks/ILLink.Tasks.csproj -+++ b/src/ILLink.Tasks/ILLink.Tasks.csproj -@@ -53,6 +53,6 @@ - - - -- -+ - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch deleted file mode 100644 index da26d2cb7..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 20 Oct 2021 15:19:29 -0500 -Subject: [PATCH] Restore building all TFMs for source-build - -Required for omnisharp, nuget-client, templating, sdk - -Background Issue: https://github.com/dotnet/source-build/issues/2542 -Patch removal issue: https://github.com/dotnet/source-build/issues/2556 ---- - src/Build/Microsoft.Build.csproj | 3 +-- - src/Directory.Build.props | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj -index f75408633..8dc86355a 100644 ---- a/src/Build/Microsoft.Build.csproj -+++ b/src/Build/Microsoft.Build.csproj -@@ -4,8 +4,7 @@ - - - -- net6.0 -- $(FullFrameworkTFM);net6.0 -+ $(FullFrameworkTFM);net6.0 - $(RuntimeOutputTargetFrameworks) - Microsoft.Build - Microsoft.Build -diff --git a/src/Directory.Build.props b/src/Directory.Build.props -index b0e233194..7e0c7d8c8 100644 ---- a/src/Directory.Build.props -+++ b/src/Directory.Build.props -@@ -27,13 +27,12 @@ - - - $(FullFrameworkTFM);netstandard2.0 -- netstandard2.0 - $(FullFrameworkTFM) - AnyCPU - - - net6.0 -- $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) -+ $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) - $(FullFrameworkTFM) - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch deleted file mode 100644 index 9a55fed1b..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ /dev/null @@ -1,118 +0,0 @@ -From a75f4b17c3595079f69ea00041182368adea14c9 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 20 Oct 2021 21:49:51 +0000 -Subject: [PATCH] Remove dependency on MS.VS.Setup.Configuration.Interop - -Removes prebuilts. - -Background Issue: https://github.com/dotnet/source-build/issues/2542 ---- - eng/dependabot/Packages.props | 3 --- - src/Build/Microsoft.Build.csproj | 4 +++- - src/Directory.BeforeCommon.targets | 2 +- - src/Framework/Microsoft.Build.Framework.csproj | 2 +- - src/Samples/Directory.Build.props | 1 + - src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- - src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- - 7 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props -index a1f21de26..ff74d6e7f 100644 ---- a/eng/dependabot/Packages.props -+++ b/eng/dependabot/Packages.props -@@ -22,9 +22,6 @@ - - - -- -- -- - - - -diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj -index d08e337c5..3b173aee5 100644 ---- a/src/Build/Microsoft.Build.csproj -+++ b/src/Build/Microsoft.Build.csproj -@@ -38,8 +38,10 @@ - - - -- -+ - -+ -+ - - - -diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets -index 913c97b12..320bffa56 100644 ---- a/src/Directory.BeforeCommon.targets -+++ b/src/Directory.BeforeCommon.targets -@@ -99,7 +99,7 @@ - $(DefineConstants);FEATURE_DEBUGGER - $(DefineConstants);FEATURE_WIN32_REGISTRY - $(DefineConstants);FEATURE_WORKINGSET -- $(DefineConstants);FEATURE_VISUALSTUDIOSETUP -+ $(DefineConstants);FEATURE_VISUALSTUDIOSETUP - $(DefineConstants);FEATURE_MSCOREE - - -diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj -index df7556447..c7edff611 100644 ---- a/src/Framework/Microsoft.Build.Framework.csproj -+++ b/src/Framework/Microsoft.Build.Framework.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - - - -diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props -index 6b9d6cd9f..317ef14a6 100644 ---- a/src/Samples/Directory.Build.props -+++ b/src/Samples/Directory.Build.props -@@ -8,6 +8,7 @@ - false - - false -+ true - - - -diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj -index d8f81bf99..3a5514094 100644 ---- a/src/Tasks/Microsoft.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.Build.Tasks.csproj -@@ -999,8 +999,10 @@ - - - -- -+ - -+ -+ - - - -diff --git a/src/Utilities/Microsoft.Build.Utilities.csproj b/src/Utilities/Microsoft.Build.Utilities.csproj -index 09634e723..72d838d9d 100644 ---- a/src/Utilities/Microsoft.Build.Utilities.csproj -+++ b/src/Utilities/Microsoft.Build.Utilities.csproj -@@ -25,7 +25,7 @@ - - - -- -+ - - - --- -2.31.1 - From 69e4975f6cc203eed56f6fb4f05104d8c9b20036 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jan 2022 04:02:19 +0000 Subject: [PATCH 09/50] Update dependencies from https://github.com/dotnet/sdk build 20220127.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22077.16 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 623ce00af..3944aa853 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - c71ca5efe988ddff9ac80f385ce7854ec4b3398f + c14220493ad94bd5191cb9ff662c5fd0a180c46d - + https://github.com/dotnet/sdk - c71ca5efe988ddff9ac80f385ce7854ec4b3398f + c14220493ad94bd5191cb9ff662c5fd0a180c46d @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 6eaa9c7d1770c575294c52ab7f3944a1842430cd + 9b12d1dc1991ecc65f87a2b683ddc95df32ec3ac - + https://github.com/dotnet/fsharp - 6eaa9c7d1770c575294c52ab7f3944a1842430cd + 9b12d1dc1991ecc65f87a2b683ddc95df32ec3ac diff --git a/eng/Versions.props b/eng/Versions.props index d876617ed..3cfd24a74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22077.9 - 6.0.300-preview.22077.9 + 6.0.300-preview.22077.16 + 6.0.300-preview.22077.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From efeb47f03453dff36ab12374ada940493ed6b635 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jan 2022 22:44:16 +0000 Subject: [PATCH 10/50] Update dependencies from https://github.com/dotnet/sdk build 20220128.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22078.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 3944aa853..6762eff50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - c14220493ad94bd5191cb9ff662c5fd0a180c46d + 203b3b626c8a195ae6b4ee567143839f832c707c - + https://github.com/dotnet/sdk - c14220493ad94bd5191cb9ff662c5fd0a180c46d + 203b3b626c8a195ae6b4ee567143839f832c707c @@ -151,9 +151,9 @@ 9ef2fa86f5caa734e697f5bffea80237f8100e43 - + https://github.com/nuget/nuget.client - f1906d3d581e0ea0bdd282134208d654f8447880 + 37d61e55a7e486fba2d224effde3ac7b775f35b8 diff --git a/eng/Versions.props b/eng/Versions.props index 3cfd24a74..6260295ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22077.16 - 6.0.300-preview.22077.16 + 6.0.300-preview.22078.8 + 6.0.300-preview.22078.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 94780438c246c25082497c53abc38ef98d2c34f2 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 1 Feb 2022 16:24:40 +0000 Subject: [PATCH 11/50] Resolve source-build NuGet.client patch conflict --- ...emove-uneeded-source-build-patches-and-re-patch.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch index 36ce5217c..0b6be41b0 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -90,15 +90,6 @@ index c94acffd8..f4d083e52 100644 -@@ -189,7 +189,7 @@ - - $(PackagePathDir) - -- -+ - - - diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj index 21015c00a..e306cdee4 100644 --- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj From bb4604a613a1815c51dc147f95241a2f365caa42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Feb 2022 18:25:01 +0000 Subject: [PATCH 12/50] Update dependencies from https://github.com/dotnet/sdk build 20220201.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22101.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 6762eff50..f1826bc9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 203b3b626c8a195ae6b4ee567143839f832c707c + 1e4e6bac90ac999173bdcd14cefae96e37cad2ef - + https://github.com/dotnet/sdk - 203b3b626c8a195ae6b4ee567143839f832c707c + 1e4e6bac90ac999173bdcd14cefae96e37cad2ef diff --git a/eng/Versions.props b/eng/Versions.props index 6260295ab..78fcd3fbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22078.8 - 6.0.300-preview.22078.8 + 6.0.300-preview.22101.3 + 6.0.300-preview.22101.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8fb27683d320c3a88138159a9cffaca3479190d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Feb 2022 00:05:41 +0000 Subject: [PATCH 13/50] Update dependencies from https://github.com/dotnet/sdk build 20220201.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22101.15 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 f1826bc9b..b411444a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 1e4e6bac90ac999173bdcd14cefae96e37cad2ef + f1004462cf1943033172ec7dfb01165249922261 - + https://github.com/dotnet/sdk - 1e4e6bac90ac999173bdcd14cefae96e37cad2ef + f1004462cf1943033172ec7dfb01165249922261 diff --git a/eng/Versions.props b/eng/Versions.props index 78fcd3fbb..587b38e6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22101.3 - 6.0.300-preview.22101.3 + 6.0.300-preview.22101.15 + 6.0.300-preview.22101.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9538c727f0165252313d029fe90579c9da82f7d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Feb 2022 12:26:19 +0000 Subject: [PATCH 14/50] Update dependencies from https://github.com/dotnet/sdk build 20220202.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22102.2 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 b411444a4..a1506fbef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - f1004462cf1943033172ec7dfb01165249922261 + 02770f261377784fde8159aacd28b33e53502bc3 - + https://github.com/dotnet/sdk - f1004462cf1943033172ec7dfb01165249922261 + 02770f261377784fde8159aacd28b33e53502bc3 diff --git a/eng/Versions.props b/eng/Versions.props index 587b38e6e..59e7c704c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22101.15 - 6.0.300-preview.22101.15 + 6.0.300-preview.22102.2 + 6.0.300-preview.22102.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 138ab44a2549ea9853ac433ac4ec14c1ec0f4fe0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Feb 2022 19:55:38 +0000 Subject: [PATCH 15/50] Update dependencies from https://github.com/dotnet/sdk build 20220202.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22102.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1506fbef..40be0827d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 02770f261377784fde8159aacd28b33e53502bc3 + 40b39d9ac520941a9565a2d35008310331fc9529 - + https://github.com/dotnet/sdk - 02770f261377784fde8159aacd28b33e53502bc3 + 40b39d9ac520941a9565a2d35008310331fc9529 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 9b12d1dc1991ecc65f87a2b683ddc95df32ec3ac + 0cce0cbe615b0a944c7b95da646b0dd643f88758 - + https://github.com/dotnet/fsharp - 9b12d1dc1991ecc65f87a2b683ddc95df32ec3ac + 0cce0cbe615b0a944c7b95da646b0dd643f88758 @@ -151,9 +151,9 @@ 9ef2fa86f5caa734e697f5bffea80237f8100e43 - + https://github.com/nuget/nuget.client - 37d61e55a7e486fba2d224effde3ac7b775f35b8 + 64c2460bf84fd332baf1794a6604d9f6329e313a diff --git a/eng/Versions.props b/eng/Versions.props index 59e7c704c..4265a3864 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22102.2 - 6.0.300-preview.22102.2 + 6.0.300-preview.22102.8 + 6.0.300-preview.22102.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fcd71d7ec0fd2c5c148cbc72be76d621196482e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Feb 2022 23:31:29 +0000 Subject: [PATCH 16/50] Update dependencies from https://github.com/dotnet/sdk build 20220202.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22102.20 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (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 40be0827d..bfd65c702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 - + https://github.com/dotnet/sdk - 40b39d9ac520941a9565a2d35008310331fc9529 + affdf86affc825093baf9102c6390dfff702adaf - + https://github.com/dotnet/sdk - 40b39d9ac520941a9565a2d35008310331fc9529 + affdf86affc825093baf9102c6390dfff702adaf diff --git a/eng/Versions.props b/eng/Versions.props index 4265a3864..fcfe8566c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22102.8 - 6.0.300-preview.22102.8 + 6.0.300-preview.22102.20 + 6.0.300-preview.22102.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4877a9841bc963d51849029505ee9ecb4201ceaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Feb 2022 17:42:17 +0000 Subject: [PATCH 17/50] Update dependencies from https://github.com/dotnet/sdk build 20220203.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22103.9 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22103.4 (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 bfd65c702..8967840b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/templating - 4e13d21a7d1b2b4ae597ac36f65cbf91d6cd27a5 + 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/sdk - affdf86affc825093baf9102c6390dfff702adaf + 28d05714629651f33d42c332acd49d7674517bb6 - + https://github.com/dotnet/sdk - affdf86affc825093baf9102c6390dfff702adaf + 28d05714629651f33d42c332acd49d7674517bb6 diff --git a/eng/Versions.props b/eng/Versions.props index fcfe8566c..35a700027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.22062.10 + 6.0.300-preview.22103.4 @@ -56,8 +56,8 @@ - 6.0.300-preview.22102.20 - 6.0.300-preview.22102.20 + 6.0.300-preview.22103.9 + 6.0.300-preview.22103.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.22062.10 + 6.0.300-preview.22103.4 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 0597782ad1a1ae308673052439763b64f0bcd60b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Feb 2022 23:00:29 +0000 Subject: [PATCH 18/50] Update dependencies from https://github.com/dotnet/sdk build 20220203.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22103.25 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22103.4 (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 8967840b4..7a1ad0014 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/sdk - 28d05714629651f33d42c332acd49d7674517bb6 + 6cbbffbea62b4f7665b5e0d086ea33b43b857336 - + https://github.com/dotnet/sdk - 28d05714629651f33d42c332acd49d7674517bb6 + 6cbbffbea62b4f7665b5e0d086ea33b43b857336 diff --git a/eng/Versions.props b/eng/Versions.props index 35a700027..85859bf2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22103.9 - 6.0.300-preview.22103.9 + 6.0.300-preview.22103.25 + 6.0.300-preview.22103.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 10010251e6686eb320a8604468fb8f054b1bad75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Feb 2022 03:07:12 +0000 Subject: [PATCH 19/50] Update dependencies from https://github.com/dotnet/sdk build 20220203.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22103.30 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22103.4 (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 7a1ad0014..a047b3ae5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 734533e99962c7c411e4ad2807d54afa9d18a73c - + https://github.com/dotnet/sdk - 6cbbffbea62b4f7665b5e0d086ea33b43b857336 + 07547edff0f6d1b2228a8de8dac3b58581f0c5df - + https://github.com/dotnet/sdk - 6cbbffbea62b4f7665b5e0d086ea33b43b857336 + 07547edff0f6d1b2228a8de8dac3b58581f0c5df @@ -146,9 +146,9 @@ 637de22a0f15f93be1b5b9204b767d276077c633 - + https://github.com/dotnet/msbuild - 9ef2fa86f5caa734e697f5bffea80237f8100e43 + a2b5fc2d33dd19e85fdd73ce20edd235b9149e8e diff --git a/eng/Versions.props b/eng/Versions.props index 85859bf2f..d4566fcee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22103.25 - 6.0.300-preview.22103.25 + 6.0.300-preview.22103.30 + 6.0.300-preview.22103.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2d05a69434efc4962cb8bd270eb4376ae1d505ed Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 4 Feb 2022 16:59:22 +0000 Subject: [PATCH 20/50] Resolve source-build nuget patch conflict --- .../0001-Remove-uneeded-source-build-patches-and-re-patch.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch index 0b6be41b0..65f3fbca5 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -33,7 +33,7 @@ index 79a935391..65e482b83 100644 PackageReference v4.7.2 net472 -- netcoreapp2.1 +- netcoreapp3.1 - net6.0 + net6.0 netcoreapp5.0 From 85b52bbcd2ea7775a4e9cd8e5d7cb973dc63dfad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Feb 2022 17:28:34 +0000 Subject: [PATCH 21/50] Update dependencies from https://github.com/dotnet/sdk build 20220204.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22104.5 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22104.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a047b3ae5..1110aaa82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 734533e99962c7c411e4ad2807d54afa9d18a73c + ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/templating - 734533e99962c7c411e4ad2807d54afa9d18a73c + ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/templating - 734533e99962c7c411e4ad2807d54afa9d18a73c + ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/sdk - 07547edff0f6d1b2228a8de8dac3b58581f0c5df + d5edc28442a097bf74712e212d093a59be715494 - + https://github.com/dotnet/sdk - 07547edff0f6d1b2228a8de8dac3b58581f0c5df + d5edc28442a097bf74712e212d093a59be715494 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 637de22a0f15f93be1b5b9204b767d276077c633 + 8d81aa51ec316d6a545cbc1a0afebad320444d7b diff --git a/eng/Versions.props b/eng/Versions.props index d4566fcee..3cc5d43de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22103.4 + 6.0.300-preview.22104.2 @@ -56,8 +56,8 @@ - 6.0.300-preview.22103.30 - 6.0.300-preview.22103.30 + 6.0.300-preview.22104.5 + 6.0.300-preview.22104.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22103.4 + 6.0.300-preview.22104.2 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 893b2df42d20ab626ce4b6dbf28ec5096c752cbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Feb 2022 01:12:50 +0000 Subject: [PATCH 22/50] Update dependencies from https://github.com/dotnet/sdk build 20220204.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22104.17 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22104.2 (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 1110aaa82..6dba94e1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/sdk - d5edc28442a097bf74712e212d093a59be715494 + 40a569166eca5e23a7e7a6ad1bc572781163c501 - + https://github.com/dotnet/sdk - d5edc28442a097bf74712e212d093a59be715494 + 40a569166eca5e23a7e7a6ad1bc572781163c501 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 0cce0cbe615b0a944c7b95da646b0dd643f88758 + 8c5e4cb4b21daec61507b660d6e99db09cd9afe7 - + https://github.com/dotnet/fsharp - 0cce0cbe615b0a944c7b95da646b0dd643f88758 + 8c5e4cb4b21daec61507b660d6e99db09cd9afe7 diff --git a/eng/Versions.props b/eng/Versions.props index 3cc5d43de..a09a8d90b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22104.5 - 6.0.300-preview.22104.5 + 6.0.300-preview.22104.17 + 6.0.300-preview.22104.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8edd6f749f22b6fbdd46eac7c33e2f4a2aa0ed64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Feb 2022 04:53:44 +0000 Subject: [PATCH 23/50] Update dependencies from https://github.com/dotnet/sdk build 20220206.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22106.5 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22104.2 (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 6dba94e1a..070fdb3db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ea0e1b00c591d2599b8d7efa7e03c14583187236 - + https://github.com/dotnet/sdk - 40a569166eca5e23a7e7a6ad1bc572781163c501 + 6d5ba94e1c17da2f95d469fc51e38ddb0169dc28 - + https://github.com/dotnet/sdk - 40a569166eca5e23a7e7a6ad1bc572781163c501 + 6d5ba94e1c17da2f95d469fc51e38ddb0169dc28 @@ -146,9 +146,9 @@ 8d81aa51ec316d6a545cbc1a0afebad320444d7b - + https://github.com/dotnet/msbuild - a2b5fc2d33dd19e85fdd73ce20edd235b9149e8e + 09bdfae164eac3b5c9027d803ffa513efaf91095 diff --git a/eng/Versions.props b/eng/Versions.props index a09a8d90b..ad312df20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22104.17 - 6.0.300-preview.22104.17 + 6.0.300-preview.22106.5 + 6.0.300-preview.22106.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b97f3b12f971dc55422639615032b0ea8bc7c27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Feb 2022 17:27:11 +0000 Subject: [PATCH 24/50] Update dependencies from https://github.com/dotnet/sdk build 20220207.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22107.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22107.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 070fdb3db..2998ad81f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - ea0e1b00c591d2599b8d7efa7e03c14583187236 + ccd8fa620dd6f9ac404bf80e27b530220839e17f - + https://github.com/dotnet/templating - ea0e1b00c591d2599b8d7efa7e03c14583187236 + ccd8fa620dd6f9ac404bf80e27b530220839e17f - + https://github.com/dotnet/templating - ea0e1b00c591d2599b8d7efa7e03c14583187236 + ccd8fa620dd6f9ac404bf80e27b530220839e17f - + https://github.com/dotnet/sdk - 6d5ba94e1c17da2f95d469fc51e38ddb0169dc28 + 8ad04468432805fe4dc134c761abf02230b3acd0 - + https://github.com/dotnet/sdk - 6d5ba94e1c17da2f95d469fc51e38ddb0169dc28 + 8ad04468432805fe4dc134c761abf02230b3acd0 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 8c5e4cb4b21daec61507b660d6e99db09cd9afe7 + 8f0e95ee4014255c40480da61823e8b2bd4d0230 - + https://github.com/dotnet/fsharp - 8c5e4cb4b21daec61507b660d6e99db09cd9afe7 + 8f0e95ee4014255c40480da61823e8b2bd4d0230 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8d81aa51ec316d6a545cbc1a0afebad320444d7b + 5c3b89b346788bcb504e18415f94aaa4ad53b86b diff --git a/eng/Versions.props b/eng/Versions.props index ad312df20..9e34317b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22104.2 + 6.0.300-preview.22107.3 @@ -56,8 +56,8 @@ - 6.0.300-preview.22106.5 - 6.0.300-preview.22106.5 + 6.0.300-preview.22107.4 + 6.0.300-preview.22107.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22104.2 + 6.0.300-preview.22107.3 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From f270ad60f9fd0a6bfe3e4d3cae51af95646ba13d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Feb 2022 19:59:58 +0000 Subject: [PATCH 25/50] Update dependencies from https://github.com/dotnet/sdk build 20220207.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22107.8 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22107.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 2998ad81f..3fa329478 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ccd8fa620dd6f9ac404bf80e27b530220839e17f - + https://github.com/dotnet/sdk - 8ad04468432805fe4dc134c761abf02230b3acd0 + 434f7358a60f44cb3856f3601c91414b6b367e03 - + https://github.com/dotnet/sdk - 8ad04468432805fe4dc134c761abf02230b3acd0 + 434f7358a60f44cb3856f3601c91414b6b367e03 diff --git a/eng/Versions.props b/eng/Versions.props index 9e34317b8..6e3ddd9da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22107.4 - 6.0.300-preview.22107.4 + 6.0.300-preview.22107.8 + 6.0.300-preview.22107.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 94ce26aa1abc5b8b262d5226af2aa98c98b4ec88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Feb 2022 00:04:16 +0000 Subject: [PATCH 26/50] Update dependencies from https://github.com/dotnet/sdk build 20220207.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22107.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22107.9 (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 3fa329478..9c266cc0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - ccd8fa620dd6f9ac404bf80e27b530220839e17f + 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/templating - ccd8fa620dd6f9ac404bf80e27b530220839e17f + 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/templating - ccd8fa620dd6f9ac404bf80e27b530220839e17f + 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/sdk - 434f7358a60f44cb3856f3601c91414b6b367e03 + cbf5e0534fef32d8271cea6f117262afa9eda5ea - + https://github.com/dotnet/sdk - 434f7358a60f44cb3856f3601c91414b6b367e03 + cbf5e0534fef32d8271cea6f117262afa9eda5ea diff --git a/eng/Versions.props b/eng/Versions.props index 6e3ddd9da..992713f0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22107.3 + 6.0.300-preview.22107.9 @@ -56,8 +56,8 @@ - 6.0.300-preview.22107.8 - 6.0.300-preview.22107.8 + 6.0.300-preview.22107.13 + 6.0.300-preview.22107.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22107.3 + 6.0.300-preview.22107.9 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 399d10fd8b7e305016570e7f6680fa3a4bd2830b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Feb 2022 08:05:26 +0000 Subject: [PATCH 27/50] Update dependencies from https://github.com/dotnet/sdk build 20220207.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22107.19 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22107.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c266cc0b..3b44c84fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/sdk - cbf5e0534fef32d8271cea6f117262afa9eda5ea + 7c879623fedc43a31ac410e33cdf23244c7138f6 - + https://github.com/dotnet/sdk - cbf5e0534fef32d8271cea6f117262afa9eda5ea + 7c879623fedc43a31ac410e33cdf23244c7138f6 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 8f0e95ee4014255c40480da61823e8b2bd4d0230 + 10c803fa1c776a1f80de8b71adc863d7f8a8a261 - + https://github.com/dotnet/fsharp - 8f0e95ee4014255c40480da61823e8b2bd4d0230 + 10c803fa1c776a1f80de8b71adc863d7f8a8a261 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 5c3b89b346788bcb504e18415f94aaa4ad53b86b + 8a09da9eaed0c0a8cf3b63b86a448aebc49e96f6 diff --git a/eng/Versions.props b/eng/Versions.props index 992713f0f..7d08c4556 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22107.13 - 6.0.300-preview.22107.13 + 6.0.300-preview.22107.19 + 6.0.300-preview.22107.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b13d3e2d36b4d4f97f6e9d9633fee3532138c456 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Feb 2022 21:49:01 +0000 Subject: [PATCH 28/50] Update dependencies from https://github.com/dotnet/sdk build 20220208.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22108.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22107.9 (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 3b44c84fe..2e9db97fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 00803e9950cb8303945c8fa763b468ec6e2b355d - + https://github.com/dotnet/sdk - 7c879623fedc43a31ac410e33cdf23244c7138f6 + 43ebbbf26281904274cb2eaac76f82e2223a809f - + https://github.com/dotnet/sdk - 7c879623fedc43a31ac410e33cdf23244c7138f6 + 43ebbbf26281904274cb2eaac76f82e2223a809f diff --git a/eng/Versions.props b/eng/Versions.props index 7d08c4556..925004104 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22107.19 - 6.0.300-preview.22107.19 + 6.0.300-preview.22108.4 + 6.0.300-preview.22108.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b8724910b5ba8b5fb4cb6564e6019d23075fb40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Feb 2022 07:39:01 +0000 Subject: [PATCH 29/50] Update dependencies from https://github.com/dotnet/sdk build 20220208.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22108.11 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22108.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e9db97fa..7afe001bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 00803e9950cb8303945c8fa763b468ec6e2b355d + 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/templating - 00803e9950cb8303945c8fa763b468ec6e2b355d + 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/templating - 00803e9950cb8303945c8fa763b468ec6e2b355d + 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - 43ebbbf26281904274cb2eaac76f82e2223a809f + 2e3197f98b8ef2644d0ce2f7e0a0123887e5ba01 - + https://github.com/dotnet/sdk - 43ebbbf26281904274cb2eaac76f82e2223a809f + 2e3197f98b8ef2644d0ce2f7e0a0123887e5ba01 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 10c803fa1c776a1f80de8b71adc863d7f8a8a261 + 0eefd48f01cb243394ae4257ebb5a87acda54bb0 - + https://github.com/dotnet/fsharp - 10c803fa1c776a1f80de8b71adc863d7f8a8a261 + 0eefd48f01cb243394ae4257ebb5a87acda54bb0 diff --git a/eng/Versions.props b/eng/Versions.props index 925004104..c393a8c80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22107.9 + 6.0.300-preview.22108.9 @@ -56,8 +56,8 @@ - 6.0.300-preview.22108.4 - 6.0.300-preview.22108.4 + 6.0.300-preview.22108.11 + 6.0.300-preview.22108.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22107.9 + 6.0.300-preview.22108.9 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From e394f3725c91312afa5b09ee6b0be14cb164004e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Feb 2022 16:19:06 +0000 Subject: [PATCH 30/50] Update dependencies from https://github.com/dotnet/sdk build 20220209.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22109.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22108.9 (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 7afe001bb..c02b5513b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - 2e3197f98b8ef2644d0ce2f7e0a0123887e5ba01 + 2e0d47e9f0f8c5479a778f5225ec710a8031cf9e - + https://github.com/dotnet/sdk - 2e3197f98b8ef2644d0ce2f7e0a0123887e5ba01 + 2e0d47e9f0f8c5479a778f5225ec710a8031cf9e @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 8a09da9eaed0c0a8cf3b63b86a448aebc49e96f6 + a29b6ae89a8885856e4c55a0e92ba056e1530458 diff --git a/eng/Versions.props b/eng/Versions.props index c393a8c80..5e762cde0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22108.11 - 6.0.300-preview.22108.11 + 6.0.300-preview.22109.4 + 6.0.300-preview.22109.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bcd4831d7380a39a8a1b055c1151c993176dfb82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Feb 2022 23:29:52 +0000 Subject: [PATCH 31/50] Update dependencies from https://github.com/dotnet/sdk build 20220209.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22109.12 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22108.9 (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 c02b5513b..212a6f7bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - 2e0d47e9f0f8c5479a778f5225ec710a8031cf9e + 5e2aa1203036b7d4b160877650771db367d4be4d - + https://github.com/dotnet/sdk - 2e0d47e9f0f8c5479a778f5225ec710a8031cf9e + 5e2aa1203036b7d4b160877650771db367d4be4d diff --git a/eng/Versions.props b/eng/Versions.props index 5e762cde0..658b2b5b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22109.4 - 6.0.300-preview.22109.4 + 6.0.300-preview.22109.12 + 6.0.300-preview.22109.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From acdce665b4b114f259380a0e3c4bd2450a79e731 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Feb 2022 06:25:22 +0000 Subject: [PATCH 32/50] Update dependencies from https://github.com/dotnet/sdk build 20220209.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22109.17 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22108.9 (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 212a6f7bf..470b2694f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - 5e2aa1203036b7d4b160877650771db367d4be4d + eadd2b11cdbd8aa4aa80195f492f4c690187c236 - + https://github.com/dotnet/sdk - 5e2aa1203036b7d4b160877650771db367d4be4d + eadd2b11cdbd8aa4aa80195f492f4c690187c236 diff --git a/eng/Versions.props b/eng/Versions.props index 658b2b5b7..0fc7fc145 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22109.12 - 6.0.300-preview.22109.12 + 6.0.300-preview.22109.17 + 6.0.300-preview.22109.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b493a636c1630e62019bdcc9480c4497d0f59c6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Feb 2022 09:17:46 +0000 Subject: [PATCH 33/50] Update dependencies from https://github.com/dotnet/sdk build 20220210.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22110.1 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22108.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 470b2694f..af6316dc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5e827b260ad9a4b5beb80f375ecdabade64a92d0 - + https://github.com/dotnet/sdk - eadd2b11cdbd8aa4aa80195f492f4c690187c236 + 3a4752e590f1c4d50b2b99a198d434548daf1f8f - + https://github.com/dotnet/sdk - eadd2b11cdbd8aa4aa80195f492f4c690187c236 + 3a4752e590f1c4d50b2b99a198d434548daf1f8f @@ -130,9 +130,9 @@ 0eefd48f01cb243394ae4257ebb5a87acda54bb0 - + https://github.com/microsoft/vstest - d3c6439b04452047cb62fc645ce341a034bdb5be + 75765f2afc7425f47efde1a59a8eb86cf81658f9 diff --git a/eng/Versions.props b/eng/Versions.props index 0fc7fc145..04449b295 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22109.17 - 6.0.300-preview.22109.17 + 6.0.300-preview.22110.1 + 6.0.300-preview.22110.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-release-20220113-05 + 17.2.0-release-20220209-04 From 0f838f433ee5bfd2f7e31d2e20ddb9f7de47a848 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Feb 2022 10:02:56 +0000 Subject: [PATCH 34/50] Update dependencies from https://github.com/dotnet/sdk build 20220211.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22111.2 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22110.1 (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 af6316dc8..64bcc73ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 5e827b260ad9a4b5beb80f375ecdabade64a92d0 + 99727ddbf86a2165d3ba2b7162a8849a23d39de2 - + https://github.com/dotnet/templating - 5e827b260ad9a4b5beb80f375ecdabade64a92d0 + 99727ddbf86a2165d3ba2b7162a8849a23d39de2 - + https://github.com/dotnet/templating - 5e827b260ad9a4b5beb80f375ecdabade64a92d0 + 99727ddbf86a2165d3ba2b7162a8849a23d39de2 - + https://github.com/dotnet/sdk - 3a4752e590f1c4d50b2b99a198d434548daf1f8f + f129632a2fcc566bf1c14689d6a1e9586b47f7a6 - + https://github.com/dotnet/sdk - 3a4752e590f1c4d50b2b99a198d434548daf1f8f + f129632a2fcc566bf1c14689d6a1e9586b47f7a6 diff --git a/eng/Versions.props b/eng/Versions.props index 04449b295..1c4a308c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22108.9 + 6.0.300-preview.22110.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22110.1 - 6.0.300-preview.22110.1 + 6.0.300-preview.22111.2 + 6.0.300-preview.22111.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22108.9 + 6.0.300-preview.22110.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 517153982b540643d9f33b8dca19f85b842386af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Feb 2022 22:19:20 +0000 Subject: [PATCH 35/50] Update dependencies from https://github.com/dotnet/sdk build 20220211.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22111.16 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22111.1 (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 64bcc73ef..1342ecc8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 99727ddbf86a2165d3ba2b7162a8849a23d39de2 + 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/templating - 99727ddbf86a2165d3ba2b7162a8849a23d39de2 + 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/templating - 99727ddbf86a2165d3ba2b7162a8849a23d39de2 + 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - f129632a2fcc566bf1c14689d6a1e9586b47f7a6 + 0aac21f8d4066cc13c17312efba49a537d5435a1 - + https://github.com/dotnet/sdk - f129632a2fcc566bf1c14689d6a1e9586b47f7a6 + 0aac21f8d4066cc13c17312efba49a537d5435a1 diff --git a/eng/Versions.props b/eng/Versions.props index 1c4a308c5..8719685fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22110.1 + 6.0.300-preview.22111.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22111.2 - 6.0.300-preview.22111.2 + 6.0.300-preview.22111.16 + 6.0.300-preview.22111.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22110.1 + 6.0.300-preview.22111.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 15f196f102a91702ea2a19dddadd81a48cd7c071 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Feb 2022 11:06:18 +0000 Subject: [PATCH 36/50] Update dependencies from https://github.com/dotnet/sdk build 20220214.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22114.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22111.1 (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 1342ecc8c..bad0e2855 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - 0aac21f8d4066cc13c17312efba49a537d5435a1 + e60eb7a1aa6cd6c89d3cf90da3cdbe10eb773a34 - + https://github.com/dotnet/sdk - 0aac21f8d4066cc13c17312efba49a537d5435a1 + e60eb7a1aa6cd6c89d3cf90da3cdbe10eb773a34 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - a29b6ae89a8885856e4c55a0e92ba056e1530458 + 661a1324c832f088f90479344a12cccdadf20721 @@ -151,9 +151,9 @@ 09bdfae164eac3b5c9027d803ffa513efaf91095 - + https://github.com/nuget/nuget.client - 64c2460bf84fd332baf1794a6604d9f6329e313a + a36df4eafb045b5f189e7219a5261f1f34ba768a diff --git a/eng/Versions.props b/eng/Versions.props index 8719685fa..4647de74f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22111.16 - 6.0.300-preview.22111.16 + 6.0.300-preview.22114.3 + 6.0.300-preview.22114.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 574d5237258a8e56700becfb64014c69bebd044e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Feb 2022 20:15:21 +0000 Subject: [PATCH 37/50] Update dependencies from https://github.com/dotnet/sdk build 20220215.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22115.10 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22111.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bad0e2855..7dc321ec4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - e60eb7a1aa6cd6c89d3cf90da3cdbe10eb773a34 + 756065527754660842cd330f7eb3e260775a9e0f - + https://github.com/dotnet/sdk - e60eb7a1aa6cd6c89d3cf90da3cdbe10eb773a34 + 756065527754660842cd330f7eb3e260775a9e0f @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 0eefd48f01cb243394ae4257ebb5a87acda54bb0 + d6b8f5acdc13330db5434fc3b9ea02a120aec97b - + https://github.com/dotnet/fsharp - 0eefd48f01cb243394ae4257ebb5a87acda54bb0 + d6b8f5acdc13330db5434fc3b9ea02a120aec97b @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 661a1324c832f088f90479344a12cccdadf20721 + e96ba4ed8c46c52194bc5eb59f13f56fded10254 diff --git a/eng/Versions.props b/eng/Versions.props index 4647de74f..ca1506952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22114.3 - 6.0.300-preview.22114.3 + 6.0.300-preview.22115.10 + 6.0.300-preview.22115.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 25ef8a120ab55515362ada239ff82aeb7d36f902 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Feb 2022 11:17:58 +0000 Subject: [PATCH 38/50] Update dependencies from https://github.com/dotnet/sdk build 20220216.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22116.1 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22111.1 (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 7dc321ec4..5f13ae39e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - 756065527754660842cd330f7eb3e260775a9e0f + 1c2d5571a1cdcd71f8201bd3095ba0d1a548cf48 - + https://github.com/dotnet/sdk - 756065527754660842cd330f7eb3e260775a9e0f + 1c2d5571a1cdcd71f8201bd3095ba0d1a548cf48 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - d6b8f5acdc13330db5434fc3b9ea02a120aec97b + e20b18e3307d5d4127e46bab55cfe2f0650971a0 - + https://github.com/dotnet/fsharp - d6b8f5acdc13330db5434fc3b9ea02a120aec97b + e20b18e3307d5d4127e46bab55cfe2f0650971a0 diff --git a/eng/Versions.props b/eng/Versions.props index ca1506952..f6ad4b2a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22115.10 - 6.0.300-preview.22115.10 + 6.0.300-preview.22116.1 + 6.0.300-preview.22116.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c1072fb83abd992ac6daf9720f5f42760954eec6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 08:01:19 +0000 Subject: [PATCH 39/50] Update dependencies from https://github.com/dotnet/sdk build 20220216.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22116.39 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22111.1 (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 5f13ae39e..5b103bde3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 - + https://github.com/dotnet/sdk - 1c2d5571a1cdcd71f8201bd3095ba0d1a548cf48 + 8dc72f8834fd0c11cc5d2cbf002e61e588c15e11 - + https://github.com/dotnet/sdk - 1c2d5571a1cdcd71f8201bd3095ba0d1a548cf48 + 8dc72f8834fd0c11cc5d2cbf002e61e588c15e11 @@ -146,9 +146,9 @@ e96ba4ed8c46c52194bc5eb59f13f56fded10254 - + https://github.com/dotnet/msbuild - 09bdfae164eac3b5c9027d803ffa513efaf91095 + def4fbb8675b5b1e3afc6a2613921953a542a9a9 diff --git a/eng/Versions.props b/eng/Versions.props index f6ad4b2a0..03c24897d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22116.1 - 6.0.300-preview.22116.1 + 6.0.300-preview.22116.39 + 6.0.300-preview.22116.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 691bfda71ec41065451b1c8a4d621be93b6e5484 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 10:23:26 +0000 Subject: [PATCH 40/50] Update dependencies from https://github.com/dotnet/sdk build 20220217.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22117.2 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22116.5 (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 5b103bde3..90a73282f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 + 271daf347a6a2842497437aad531b1320e299ca3 - + https://github.com/dotnet/templating - 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 + 271daf347a6a2842497437aad531b1320e299ca3 - + https://github.com/dotnet/templating - 59f6f3e2aad0284b61d53143fd75386ac1c29ce1 + 271daf347a6a2842497437aad531b1320e299ca3 - + https://github.com/dotnet/sdk - 8dc72f8834fd0c11cc5d2cbf002e61e588c15e11 + 4c6407290c78e13cdf785d69140845e14dc99099 - + https://github.com/dotnet/sdk - 8dc72f8834fd0c11cc5d2cbf002e61e588c15e11 + 4c6407290c78e13cdf785d69140845e14dc99099 diff --git a/eng/Versions.props b/eng/Versions.props index 03c24897d..4a21e42db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22111.1 + 6.0.300-preview.22116.5 @@ -56,8 +56,8 @@ - 6.0.300-preview.22116.39 - 6.0.300-preview.22116.39 + 6.0.300-preview.22117.2 + 6.0.300-preview.22117.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22111.1 + 6.0.300-preview.22116.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From d0537179f9e9906686bf506193d5bd349b177f0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 16:32:18 +0000 Subject: [PATCH 41/50] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22115.1 -> To Version 6.0.0-servicing.22117.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 3dd9a0ce6..93db93edf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - d933cf368424482afb2bd8aebe6a412932f4fee4 + ed58779fdb436582d28af4a356180090d11e1159 From 71d2093b1214ff564f25fbeabe7cc33af727cfc1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 20:32:04 +0000 Subject: [PATCH 42/50] Update dependencies from https://github.com/dotnet/sdk build 20220217.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22117.12 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22116.5 (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 90a73282f..e7ccc03e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 271daf347a6a2842497437aad531b1320e299ca3 - + https://github.com/dotnet/sdk - 4c6407290c78e13cdf785d69140845e14dc99099 + ae49884f786f05ac22cff838d260b6ad82c5a6dc - + https://github.com/dotnet/sdk - 4c6407290c78e13cdf785d69140845e14dc99099 + ae49884f786f05ac22cff838d260b6ad82c5a6dc diff --git a/eng/Versions.props b/eng/Versions.props index 4a21e42db..08ad9fc18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.2 - 6.0.300-preview.22117.2 + 6.0.300-preview.22117.12 + 6.0.300-preview.22117.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8485bd3353e801db3d5167b0c25fa085eb9086ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 21:29:21 +0000 Subject: [PATCH 43/50] Update dependencies from https://github.com/dotnet/sdk build 20220217.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-preview.22055.23 -> To Version 6.0.300-preview.22117.14 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-preview.21623.5 -> To Version 6.0.300-preview.22117.1 (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 e7ccc03e5..9994b0f8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 271daf347a6a2842497437aad531b1320e299ca3 + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/templating - 271daf347a6a2842497437aad531b1320e299ca3 + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/templating - 271daf347a6a2842497437aad531b1320e299ca3 + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - ae49884f786f05ac22cff838d260b6ad82c5a6dc + 8083ce50af04881424fb68cdae3afa97fbfdcd19 - + https://github.com/dotnet/sdk - ae49884f786f05ac22cff838d260b6ad82c5a6dc + 8083ce50af04881424fb68cdae3afa97fbfdcd19 diff --git a/eng/Versions.props b/eng/Versions.props index 08ad9fc18..1e14c9ed3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22116.5 + 6.0.300-preview.22117.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.12 - 6.0.300-preview.22117.12 + 6.0.300-preview.22117.14 + 6.0.300-preview.22117.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22116.5 + 6.0.300-preview.22117.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 301e8298334a7713b6123de934475e4a1041a6f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 02:57:39 +0000 Subject: [PATCH 44/50] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22115.1 -> To Version 6.0.0-servicing.22117.5 --- 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 93db93edf..621ebe0f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - ed58779fdb436582d28af4a356180090d11e1159 + 58acc1f97a4c7b121356ea9b33b7db29b861b81d From d06545cb1b1da6ba1619af3afe339a3358612b64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 03:57:20 +0000 Subject: [PATCH 45/50] Update dependencies from https://github.com/dotnet/sdk build 20220217.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.14 -> To Version 6.0.300-preview.22117.23 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-1.22114.14 -> To Version 4.2.0-1.22116.16 (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 210a351e8..c122f621f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 8083ce50af04881424fb68cdae3afa97fbfdcd19 + 12b20ac8e33d01ad0f168fb04a0343ea75c262e7 - + https://github.com/dotnet/sdk - 8083ce50af04881424fb68cdae3afa97fbfdcd19 + 12b20ac8e33d01ad0f168fb04a0343ea75c262e7 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - e96ba4ed8c46c52194bc5eb59f13f56fded10254 + cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 diff --git a/eng/Versions.props b/eng/Versions.props index aae378137..1f6e41598 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.14 - 6.0.300-preview.22117.14 + 6.0.300-preview.22117.23 + 6.0.300-preview.22117.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9459875a0b47a389caa31f0795121a311177afa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 06:59:39 +0000 Subject: [PATCH 46/50] Update dependencies from https://github.com/dotnet/sdk build 20220217.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.23 -> To Version 6.0.300-preview.22117.29 Dependency coherency updates Microsoft.Build From Version 17.2.0-preview-22116-02 -> To Version 17.2.0-preview-22117-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d52653b21..a700583cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 12b20ac8e33d01ad0f168fb04a0343ea75c262e7 + 8d3915ee7509649ac7138e5712d44ed01007ecdf - + https://github.com/dotnet/sdk - 12b20ac8e33d01ad0f168fb04a0343ea75c262e7 + 8d3915ee7509649ac7138e5712d44ed01007ecdf @@ -146,9 +146,9 @@ cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 - + https://github.com/dotnet/msbuild - def4fbb8675b5b1e3afc6a2613921953a542a9a9 + 7aa73b7de55e59d0ffdd4c6326d211a36239a81c diff --git a/eng/Versions.props b/eng/Versions.props index 1f6e41598..e7e11ad3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.23 - 6.0.300-preview.22117.23 + 6.0.300-preview.22117.29 + 6.0.300-preview.22117.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 422a487b65bd2cd000cde870d304996557829724 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 11:16:58 +0000 Subject: [PATCH 47/50] Update dependencies from https://github.com/dotnet/sdk build 20220218.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.29 -> To Version 6.0.300-preview.22118.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22115.2 -> To Version 12.0.2-beta.22117.5 (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 a700583cc..be47314f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 8d3915ee7509649ac7138e5712d44ed01007ecdf + 30455a60095304f035077bbb8616d2dd017d10fa - + https://github.com/dotnet/sdk - 8d3915ee7509649ac7138e5712d44ed01007ecdf + 30455a60095304f035077bbb8616d2dd017d10fa @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - e20b18e3307d5d4127e46bab55cfe2f0650971a0 + 6fa08d82a953b639a73a9a2ba2b8f2478f22e18c - + https://github.com/dotnet/fsharp - e20b18e3307d5d4127e46bab55cfe2f0650971a0 + 6fa08d82a953b639a73a9a2ba2b8f2478f22e18c diff --git a/eng/Versions.props b/eng/Versions.props index e7e11ad3f..1e120bac7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22117.29 - 6.0.300-preview.22117.29 + 6.0.300-preview.22118.1 + 6.0.300-preview.22118.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f526beb25d83e95301d9628381df38581fe0c070 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 16:35:27 +0000 Subject: [PATCH 48/50] Update dependencies from https://github.com/dotnet/sdk build 20220218.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.29 -> To Version 6.0.300-preview.22118.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22115.2 -> To Version 12.0.2-beta.22117.5 (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 be47314f1..28a480dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 30455a60095304f035077bbb8616d2dd017d10fa + 4ba25b3558f2f3eeb27e45e4138a4090b546538e - + https://github.com/dotnet/sdk - 30455a60095304f035077bbb8616d2dd017d10fa + 4ba25b3558f2f3eeb27e45e4138a4090b546538e diff --git a/eng/Versions.props b/eng/Versions.props index 1e120bac7..0f0612fec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22118.1 - 6.0.300-preview.22118.1 + 6.0.300-preview.22118.3 + 6.0.300-preview.22118.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a39efcaa9b05c3965b241a0016bb035c7c9b2321 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 20:16:53 +0000 Subject: [PATCH 49/50] Update dependencies from https://github.com/dotnet/sdk build 20220218.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.29 -> To Version 6.0.300-preview.22118.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22115.2 -> To Version 12.0.2-beta.22118.2 (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 28a480dc3..c99e6ff8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 4ba25b3558f2f3eeb27e45e4138a4090b546538e + e0dec3025a26241d76910a434cb964d8d8ad9cfa - + https://github.com/dotnet/sdk - 4ba25b3558f2f3eeb27e45e4138a4090b546538e + e0dec3025a26241d76910a434cb964d8d8ad9cfa @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 6fa08d82a953b639a73a9a2ba2b8f2478f22e18c + b00fd2eba4e85875014a7bfbb5a69aba7fbd05d3 - + https://github.com/dotnet/fsharp - 6fa08d82a953b639a73a9a2ba2b8f2478f22e18c + b00fd2eba4e85875014a7bfbb5a69aba7fbd05d3 diff --git a/eng/Versions.props b/eng/Versions.props index 0f0612fec..5385fa28c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22118.3 - 6.0.300-preview.22118.3 + 6.0.300-preview.22118.6 + 6.0.300-preview.22118.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7d058428b0d22d4aab5274ef9726372a30c0cb30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 21:39:25 +0000 Subject: [PATCH 50/50] Update dependencies from https://github.com/dotnet/sdk build 20220218.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.300-preview.22117.29 -> To Version 6.0.300-preview.22118.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.2-beta.22115.2 -> To Version 12.0.2-beta.22118.2 (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 c99e6ff8d..9a182f592 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - e0dec3025a26241d76910a434cb964d8d8ad9cfa + 07b2ee3df1abbe92d30b9d22901b4c09ffb78867 - + https://github.com/dotnet/sdk - e0dec3025a26241d76910a434cb964d8d8ad9cfa + 07b2ee3df1abbe92d30b9d22901b4c09ffb78867 diff --git a/eng/Versions.props b/eng/Versions.props index 5385fa28c..1412e4c74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22118.6 - 6.0.300-preview.22118.6 + 6.0.300-preview.22118.8 + 6.0.300-preview.22118.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)