From 9fffed5d080a29ca9bfdcdda3b29fd6796b571fd Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 17 May 2023 07:57:15 -0500
Subject: [PATCH] Remove MicrosoftNetCompilersToolsetPackageVersion patches
 (#16417)

---
 ...etCompilersToolsetVersion-instead-of.patch | 52 -------------------
 ...CompilersToolsetVersion-instead-of-M.patch | 40 --------------
 2 files changed, 92 deletions(-)
 delete mode 100644 src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch
 delete mode 100644 src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch

diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch
deleted file mode 100644
index a96b23f38..000000000
--- a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Michael Simons <msimons@microsoft.com>
-Date: Fri, 21 Apr 2023 03:07:28 +0000
-Subject: [PATCH] Use MicrosoftNetCompilersToolsetVersion instead of 
- MicrosoftNetCompilersToolsetPackageVersion
-
-Temporary fix for https://github.com/dotnet/source-build/issues/3392
----
- Directory.Packages.props | 16 ++++++++--------
- eng/Versions.props       |  4 ++--
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Directory.Packages.props b/Directory.Packages.props
-index c9041493..83f3d877 100644
---- a/Directory.Packages.props
-+++ b/Directory.Packages.props
-@@ -13,14 +13,14 @@
-     <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
-     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
-     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalzerTestingVersion)" />
--    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
--    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
--    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
--    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
--    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
--    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
--    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
--    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
-+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-+    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-     <PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
-     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
-     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
-diff --git a/eng/Versions.props b/eng/Versions.props
-index 2d325ec6..e1bc7022 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -35,7 +35,7 @@
-     <!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
-     <NuGetVersion>6.6.0-preview.3.61</NuGetVersion>
-     <!-- roslyn -->
--    <MicrosoftNetCompilersToolsetPackageVersion>4.7.0-1.23226.15</MicrosoftNetCompilersToolsetPackageVersion>
-+    <MicrosoftNetCompilersToolsetVersion>4.7.0-1.23226.15</MicrosoftNetCompilersToolsetVersion>
-     <!-- roslyn-sdk -->
-     <MicrosoftCodeAnalysisAnalzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalzerTestingVersion>
-     <!-- runtime -->
diff --git a/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch b/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch
deleted file mode 100644
index d4869c8a8..000000000
--- a/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nikola Milosavljevic <nikolam@microsoft.com>
-Date: Mon, 17 Apr 2023 20:19:53 +0000
-Subject: [PATCH] Use MicrosoftNetCompilersToolsetVersion instead of
- MicrosoftNetCompilersToolsetPackageVersion
-
-Temporary fix for https://github.com/dotnet/source-build/issues/3392
----
- src/Layout/redist/redist.csproj                  | 4 ++--
- src/Layout/redist/targets/GenerateLayout.targets | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj
-index ada9291ad2..032389051f 100644
---- a/src/Layout/redist/redist.csproj
-+++ b/src/Layout/redist/redist.csproj
-@@ -33,8 +33,8 @@
-     <PackageReference Condition=" '$(DotNetBuildFromSource)' != 'true' " Include="NuGet.Localization" Version="$(NuGetLocalizationPackageVersion)" />
-     <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
-     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" ExcludeAssets="All" GeneratePathProperty="true"/>
--    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true"/>
--    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true"/>
-+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftNetCompilersToolsetVersion)" ExcludeAssets="All" GeneratePathProperty="true"/>
-+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="$(MicrosoftNetCompilersToolsetVersion)" ExcludeAssets="All" GeneratePathProperty="true"/>
-     <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="$(MicrosoftNETILLinkTasksPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true" />
-     <PackageReference Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true" />
-     <PackageReference Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" GeneratePathProperty="true" />
-diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
-index 3d3d3a47d3..03e06be78d 100644
---- a/src/Layout/redist/targets/GenerateLayout.targets
-+++ b/src/Layout/redist/targets/GenerateLayout.targets
-@@ -27,7 +27,7 @@
-       <RoslynDirectory>$(OutputPath)/Roslyn</RoslynDirectory>
-     </PropertyGroup>
-     <ItemGroup>
--      <RoslynBits Include="$(NuGetPackageRoot)/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersToolsetPackageVersion)/tasks/netcore/**/*" />
-+      <RoslynBits Include="$(NuGetPackageRoot)/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersToolsetVersion)/tasks/netcore/**/*" />
-     </ItemGroup>
-     <Error Condition="'@(RoslynBits)' == ''" Text="Something moved around in Roslyn package, adjust code here accordingly. TFM change?" />
-     <Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />