diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb9fdce5f4ea..9994b0f8c1f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/templating - 55fa299ca45a3c19e8970e6afba34951e368525a + ae80bff914f34ef76920e93d87a7805483abae27 - + https://github.com/dotnet/sdk - 6ca80ba4d8c6f3087176440622bbdb90e78d3708 + 8083ce50af04881424fb68cdae3afa97fbfdcd19 - + https://github.com/dotnet/sdk - 6ca80ba4d8c6f3087176440622bbdb90e78d3708 + 8083ce50af04881424fb68cdae3afa97fbfdcd19 @@ -121,39 +121,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f + e20b18e3307d5d4127e46bab55cfe2f0650971a0 - + https://github.com/dotnet/fsharp - f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f + e20b18e3307d5d4127e46bab55cfe2f0650971a0 - + https://github.com/microsoft/vstest - a809880e02d8a9986e3ba1daeeeb5078fbb96be5 + 75765f2afc7425f47efde1a59a8eb86cf81658f9 - + https://github.com/dotnet/linker - d0662ed8db919642177ddfd06a1c33895a69015f + 70dc7f6daaf50e8eb67afb91876b8efc8330103f linker - + https://github.com/dotnet/roslyn - f206c5d203c5562f814d3afa3c9e695250391c76 + e96ba4ed8c46c52194bc5eb59f13f56fded10254 - + https://github.com/dotnet/msbuild - 797fd829a374a880f63fd4eea4ea6990404c48f4 + def4fbb8675b5b1e3afc6a2613921953a542a9a9 - + https://github.com/nuget/nuget.client - 9187a50daec29061772a2057490697c6c0e4c354 + a36df4eafb045b5f189e7219a5261f1f34ba768a diff --git a/eng/Versions.props b/eng/Versions.props index 961d6500f401..1e14c9ed3201 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-preview.21623.5 + 6.0.300-preview.22117.1 @@ -56,8 +56,8 @@ - 6.0.200-preview.22055.23 - 6.0.200-preview.22055.23 + 6.0.300-preview.22117.14 + 6.0.300-preview.22117.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200-preview.21623.5 + 6.0.300-preview.22117.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211210-01 + 17.2.0-release-20220209-04 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 7d5d03116754..000000000000 --- 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 68917950ec59..000000000000 --- 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 8458c20e51a3..000000000000 --- 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 da26d2cb7908..000000000000 --- 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 9a55fed1b7d7..000000000000 --- 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 - 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 36ce5217c3eb..65f3fbca59e0 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 @@ -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