Skip to content

CZEMacLeod/MSBuild.SDK.SystemWeb#46 - Adding additional CPM support. … #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

CZEMacLeod/MSBuild.SDK.SystemWeb#46 - Adding additional CPM support. … #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad8e8f9
CZEMacLeod/MSBuild.SDK.SystemWeb#46 - Adding additional CPM support. …
brandon-hurler Feb 8, 2023
f01d380
CZEMacLeod/MSBuild.SDK.SystemWeb#46 - Adding additional check to expl…
brandon-hurler Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ...d.SDK.SystemWeb.RazorLibrary/Sdk/MSBuild.SDK.SystemWeb.RazorLibrary.DefaultPackages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
12 changes: 6 additions & 6 deletions ...SDK.SystemWeb.RazorLibrary/Sdk/MSBuild.SDK.SystemWeb.RazorLibrary.DefaultPackages.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)'!=''"/>
<ItemGroup Condition="'$(ExcludeDefaultRazorPackages)'=='false' AND ('$(UsingMicrosoftCentralPackageVersionsSdk)' != 'true' AND '$(ManagePackageVersionsCentrally)' != 'true')">
<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)'!=''" />
Expand All @@ -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>