From 589758800e0161db307bddd4032c218974a1e461 Mon Sep 17 00:00:00 2001
From: "Cynthia Z E MacLeod (C3D)" <Cynthia.MacLeod@cloud3d.ltd>
Date: Tue, 11 Jan 2022 16:41:24 +0000
Subject: [PATCH] Add code to check for Microsoft.Build.CentralPackageVersions
 and use unversioned packages. Closes #26

---
 ...SBuild.SDK.SystemWeb.DefaultPackages.targets | 17 +++++++++++++++++
 src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets       |  6 ++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultPackages.targets

diff --git a/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultPackages.targets b/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultPackages.targets
new file mode 100644
index 0000000..20d7d3e
--- /dev/null
+++ b/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultPackages.targets
@@ -0,0 +1,17 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Include versioned compilers unless ExcludeASPNetCompilers property is set or we are using Microsoft.Build.CentralPackageVersions -->
+  <ItemGroup Condition="'$(ExcludeASPNetCompilers)'=='false' AND '$(UsingMicrosoftCentralPackageVersionsSdk)'!='true'">
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
+  </ItemGroup>
+
+  <!-- Include unversioned compilers unless ExcludeASPNetCompilers property is set if we are using Microsoft.Build.CentralPackageVersions -->
+  <!-- See https://github.com/CZEMacLeod/MSBuild.SDK.SystemWeb/issues/26 and https://github.com/microsoft/MSBuildSdks/issues/320 -->
+  <!-- Requires Microsoft.Build.CentralPackageVersions Version 2.1.1 or higher -->
+  <ItemGroup Condition="'$(ExcludeASPNetCompilers)'=='false' AND '$(UsingMicrosoftCentralPackageVersionsSdk)'=='true'">
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" />
+  </ItemGroup>
+   
+</Project>
\ No newline at end of file
diff --git a/src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets b/src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets
index 6a99c3d..23b929d 100644
--- a/src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets
+++ b/src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets
@@ -3,10 +3,8 @@
     <Reference Include="System.Web" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(ExcludeASPNetCompilers)'=='false'">
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
-  </ItemGroup>
+  <!-- Default packages -->
+  <Import Project="MSBuild.SDK.SystemWeb.DefaultPackages.targets" />
 
   <PropertyGroup Condition="'$(MvcBuildViews)'==''">
     <MvcBuildViews Condition="'$(Configuration)'=='Release'">true</MvcBuildViews>