CZEMacLeod#46 - Adding additional CPM support. CZEMacLeod#49 - Updati…

…ng RazorLibrary to support predefined PackageVersions.
brandon-hurler · Feb 8, 2023 · ad8e8f9 · ad8e8f9
1 parent 11988ab
commit ad8e8f9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/...d.SDK.SystemWeb.RazorLibrary/Sdk/MSBuild.SDK.SystemWeb.RazorLibrary.DefaultPackages.props b/...d.SDK.SystemWeb.RazorLibrary/Sdk/MSBuild.SDK.SystemWeb.RazorLibrary.DefaultPackages.props
@@ -1,6 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ExcludeDefaultRazorPackages Condition="'$(ExcludeDefaultRazorPackages)'==''">false</ExcludeDefaultRazorPackages>    
+    <ExcludeDefaultRazorPackages Condition="'$(ExcludeDefaultRazorPackages)'==''">false</ExcludeDefaultRazorPackages>
+    <ExcludeDefaultRazorPackageVersions Condition="'$(ExcludeDefaultRazorPackageVersions)'==''">false</ExcludeDefaultRazorPackageVersions>
   </PropertyGroup>
   <PropertyGroup Condition="'$(ExcludeDefaultRazorPackages)'=='false'">
     <MicrosoftAspNetMvc_Version Condition="'$(MicrosoftAspNetMvc_Version)'==''">5.2.9</MicrosoftAspNetMvc_Version>
@@ -9,4 +10,16 @@
     <MicrosoftNetCompilersToolset_Version Condition="'$(MicrosoftNetCompilersToolset_Version)'==''">4.3.0</MicrosoftNetCompilersToolset_Version>
     <MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version Condition="'$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)'==''">3.6.0</MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version>
   </PropertyGroup>
+  <!--
+    Adding support for CPM without defined PackageVersions.
+    If specific versions need to be overridden from here, use Update instead of Include in the solution's Directory.Build.props or Directory.Packages.props file.
+    Alternatively, flags from ExcludeDefaultRazorPackages or ExcludeDefaultRazorPackageVersions will enable/disable including PackageVersion properties.
+  -->
+  <ItemGroup Condition=" ('$(ExcludeDefaultRazorPackages)' == 'false' AND '$(ExcludeDefaultRazorPackageVersions)' == 'false') AND ('$(UsingMicrosoftCentralPackageVersionsSdk)' == 'true' OR '$(ManagePackageVersionsCentrally)' == 'true')">
+    <PackageVersion Include="Microsoft.AspNet.Mvc" Version="$(MicrosoftAspNetMvc_Version)" />
+    <PackageVersion Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)" />
+    <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolset_Version)" />
+    <PackageVersion Include="RazorGenerator.MsBuild" Version="$(RazorGeneratorMSBuild_Version)" />
+    <PackageVersion Include="RazorGenerator.Mvc" Version="$(RazorGeneratorMVC_Version)" />
+  </ItemGroup>
 </Project>
diff --git a/...SDK.SystemWeb.RazorLibrary/Sdk/MSBuild.SDK.SystemWeb.RazorLibrary.DefaultPackages.targets b/...SDK.SystemWeb.RazorLibrary/Sdk/MSBuild.SDK.SystemWeb.RazorLibrary.DefaultPackages.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Include versioned compilers unless ExcludeDefaultRazorPackages property is set or we are using Microsoft.Build.CentralPackageVersions -->
   <ItemGroup Condition="'$(ExcludeDefaultRazorPackages)'=='false' AND '$(UsingMicrosoftCentralPackageVersionsSdk)'!='true'">
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolset_Version)" PrivateAssets="All" Condition="'$(MicrosoftNetCompilersToolset_Version)'!=''"/>
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolset_Version)" PrivateAssets="All" Condition="'$(MicrosoftNetCompilersToolset_Version)'!=''" />
     <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)" Condition="'$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)'!=''" />
     <PackageReference Include="RazorGenerator.MsBuild" PrivateAssets="All" Version="$(RazorGeneratorMSBuild_Version)" Condition="'$(RazorGeneratorMSBuild_Version)'!=''" />
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="$(MicrosoftAspNetMvc_Version)" Condition="'$(MicrosoftAspNetMvc_Version)'!=''" />
@@ -10,11 +10,11 @@
 
   <!-- Include unversioned compilers unless ExcludeDefaultRazorPackages property is set if we are using Microsoft.Build.CentralPackageVersions -->
   <!-- Requires Microsoft.Build.CentralPackageVersions Version 2.1.1 or higher -->
-  <ItemGroup Condition="'$(ExcludeDefaultRazorPackages)'=='false' AND '$(UsingMicrosoftCentralPackageVersionsSdk)'=='true'">
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" PrivateAssets="All"/>
+  <ItemGroup Condition=" '$(ExcludeDefaultRazorPackages)' == 'false' AND ('$(UsingMicrosoftCentralPackageVersionsSdk)' == 'true' OR '$(ManagePackageVersionsCentrally)' == 'true')">
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" />
-    <PackageReference Include="RazorGenerator.MsBuild" PrivateAssets="All"/>
+    <PackageReference Include="RazorGenerator.MsBuild" PrivateAssets="All" />
     <PackageReference Include="RazorGenerator.MVC" />
-    <PackageReference Include="Microsoft.AspNet.Mvc"/>
+    <PackageReference Include="Microsoft.AspNet.Mvc" />
   </ItemGroup>
 </Project>