Skip to content

Commit bfba0cd

Browse files
CZEMacLeodCZEMacLeod
committed
Use common properties and versions for packages
ExcludeDefaultSDKPackages instead of ExcludeASPNetCompilers and ExcludeDefaultRazorPackages Bump default package Microsoft.Net.Compilers.Toolset default version to V4.5.0 - This should solve issue with VS2022 17.5.0 (although 17.5.1 already fixes this) Closes #47
1 parent 11988ab commit bfba0cd

12 files changed

Lines changed: 87 additions & 50 deletions

‎Directory.Build.Targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<None Include="Sdk\**"
3434
Pack="true"
3535
PackagePath="Sdk\" />
36-
<None Include="README.md" Condition="EXISTS('README.md')" />
36+
<None Include="README.md" Condition="EXISTS('README.md')" Pack="true" PackagePath="\" />
3737
<None Include="$(PackageLicensePath)"
3838
Pack="true"
3939
PackagePath="$(PackageLicenseFile)"

‎MSBuild.SDK.SystemWeb.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExampleRazorLibrary", "samp
5757
EndProject
5858
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "ExampleRazorLibraryVB", "samples\RazorLibrary\ExampleRazorLibraryVB\ExampleRazorLibraryVB.vbproj", "{AD80B3C1-916E-4E46-BF07-6AEE8606AB00}"
5959
EndProject
60+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuild.SDK.SystemWeb.Common", "src\MSBuild.SDK.SystemWeb.CommonFiles\MSBuild.SDK.SystemWeb.Common.csproj", "{EEEE3759-9ACC-426D-BCDB-E33838C9D024}"
61+
EndProject
6062
Global
6163
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6264
Debug|Any CPU = Debug|Any CPU
@@ -98,6 +100,10 @@ Global
98100
{AD80B3C1-916E-4E46-BF07-6AEE8606AB00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99101
{AD80B3C1-916E-4E46-BF07-6AEE8606AB00}.Debug|Any CPU.Build.0 = Debug|Any CPU
100102
{AD80B3C1-916E-4E46-BF07-6AEE8606AB00}.Release|Any CPU.ActiveCfg = Release|Any CPU
103+
{EEEE3759-9ACC-426D-BCDB-E33838C9D024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
104+
{EEEE3759-9ACC-426D-BCDB-E33838C9D024}.Debug|Any CPU.Build.0 = Debug|Any CPU
105+
{EEEE3759-9ACC-426D-BCDB-E33838C9D024}.Release|Any CPU.ActiveCfg = Release|Any CPU
106+
{EEEE3759-9ACC-426D-BCDB-E33838C9D024}.Release|Any CPU.Build.0 = Release|Any CPU
101107
EndGlobalSection
102108
GlobalSection(SolutionProperties) = preSolution
103109
HideSolutionNode = FALSE
@@ -115,6 +121,7 @@ Global
115121
{3BC6F60B-0AC5-4300-9DFD-4B65D97FFD12} = {26AD80FE-B7CD-457A-B03A-90A5B395759E}
116122
{A699C2E4-43C7-409D-BC2B-1197E61FD9BC} = {26AD80FE-B7CD-457A-B03A-90A5B395759E}
117123
{AD80B3C1-916E-4E46-BF07-6AEE8606AB00} = {26AD80FE-B7CD-457A-B03A-90A5B395759E}
124+
{EEEE3759-9ACC-426D-BCDB-E33838C9D024} = {B91408ED-7A59-4890-8CB2-5A011DD62B1C}
118125
EndGlobalSection
119126
GlobalSection(ExtensibilityGlobals) = postSolution
120127
SolutionGuid = {E5FBE1CF-A73C-4BFD-BBA5-95488B7930D9}

‎src/MSBuild.SDK.SystemWeb.CommonFiles/MSBuild.SDK.SystemWeb.Common.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.Build.NoTargets">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net472</TargetFramework>
5+
<IsPackable>false</IsPackable>
6+
<OutputItemType>None</OutputItemType>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<None Include="Sdk\**"
11+
Pack="true"
12+
PackagePath="Sdk\" />
13+
</ItemGroup>
14+
15+
</Project>

‎src/MSBuild.SDK.SystemWeb.CommonFiles/Sdk/MSBuild.SDK.SystemWeb.Common.DefaultPackages.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false'">
3+
<MicrosoftNetCompilersToolset_Version Condition="'$(MicrosoftNetCompilersToolset_Version)'==''">4.5.0</MicrosoftNetCompilersToolset_Version>
4+
<MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version Condition="'$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)'==''">3.6.0</MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version>
5+
</PropertyGroup>
6+
</Project>

‎src/MSBuild.SDK.SystemWeb.CommonFiles/Sdk/MSBuild.SDK.SystemWeb.Common.DefaultPackages.targets‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- If we are using a central package management system such as Microsoft.Build.CentralPackageVersions do not include package versions -->
3+
<PropertyGroup>
4+
<!-- Requires Microsoft.Build.CentralPackageVersions Version 2.1.1 or higher
5+
See https://github.com/microsoft/MSBuildSdks/tree/main/src/CentralPackageVersions -->
6+
<ApplySDKDefaultPackageVersions Condition="'$(UsingMicrosoftCentralPackageVersionsSdk)'=='true'">false</ApplySDKDefaultPackageVersions>
7+
<ApplySDKDefaultPackageVersions Condition="'$(ApplySDKDefaultPackageVersions)'==''">true</ApplySDKDefaultPackageVersions>
8+
</PropertyGroup>
9+
10+
<!-- Include compilers unless ExcludeDefaultSDKPackages property is set -->
11+
<ItemGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false'">
12+
<PackageReference Include="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" />
14+
</ItemGroup>
15+
16+
<!-- Set package versions if ApplySDKDefaultPackageVersions is true -->
17+
<ItemGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false' AND '$(ApplySDKDefaultPackageVersions)'=='true'">
18+
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolset_Version)" Condition="'$(MicrosoftNetCompilersToolset_Version)'!=''"/>
19+
<PackageReference Update="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)" Condition="'$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)'!=''" />
20+
</ItemGroup>
21+
22+
</Project>

‎src/MSBuild.SDK.SystemWeb.RazorLibrary/Class1.cs‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/MSBuild.SDK.SystemWeb.RazorLibrary/MSBuild.SDK.SystemWeb.RazorLibrary.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<None Include="version.json" />
13-
<None Include="README.md" Pack="true" PackagePath="\" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<None Include="..\MSBuild.SDK.SystemWeb.CommonFiles\Sdk\**"
16+
Pack="true"
17+
PackagePath="Sdk\" />
18+
<None Update="..\MSBuild.SDK.SystemWeb.CommonFiles\Sdk\**" Link="Sdk\%(RecursiveDir)%(Filename)%(Extension)" />
1419
</ItemGroup>
1520
</Project>

‎src/MSBuild.SDK.SystemWeb.RazorLibrary/Sdk/MSBuild.SDK.SystemWeb.RazorLibrary.DefaultPackages.props‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Use new common property ExcludeDefaultSDKPackages instead of ExcludeDefaultRazorPackages from V4.0.83 onwards -->
23
<PropertyGroup>
3-
<ExcludeDefaultRazorPackages Condition="'$(ExcludeDefaultRazorPackages)'==''">false</ExcludeDefaultRazorPackages>
4+
<ExcludeDefaultRazorPackages Condition="'$(ExcludeDefaultRazorPackages)'==''">false</ExcludeDefaultRazorPackages>
5+
<ExcludeDefaultSDKPackages Condition="'$(ExcludeDefaultSDKPackages)'==''">$(ExcludeDefaultRazorPackages)</ExcludeDefaultSDKPackages>
46
</PropertyGroup>
5-
<PropertyGroup Condition="'$(ExcludeDefaultRazorPackages)'=='false'">
7+
<PropertyGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false'">
68
<MicrosoftAspNetMvc_Version Condition="'$(MicrosoftAspNetMvc_Version)'==''">5.2.9</MicrosoftAspNetMvc_Version>
9+
710
<RazorGeneratorMSBuild_Version Condition="'$(RazorGeneratorMSBuild_Version)'==''">2.5.0</RazorGeneratorMSBuild_Version>
811
<RazorGeneratorMVC_Version Condition="'$(RazorGeneratorMVC_Version)'==''">2.4.9</RazorGeneratorMVC_Version>
9-
<MicrosoftNetCompilersToolset_Version Condition="'$(MicrosoftNetCompilersToolset_Version)'==''">4.3.0</MicrosoftNetCompilersToolset_Version>
10-
<MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version Condition="'$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)'==''">3.6.0</MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version>
1112
</PropertyGroup>
13+
<Import Project="MSBuild.SDK.SystemWeb.Common.DefaultPackages.props"/>
1214
</Project>

‎src/MSBuild.SDK.SystemWeb.RazorLibrary/Sdk/MSBuild.SDK.SystemWeb.RazorLibrary.DefaultPackages.targets‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<!-- Include versioned compilers unless ExcludeDefaultRazorPackages property is set or we are using Microsoft.Build.CentralPackageVersions -->
3-
<ItemGroup Condition="'$(ExcludeDefaultRazorPackages)'=='false' AND '$(UsingMicrosoftCentralPackageVersionsSdk)'!='true'">
4-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolset_Version)" PrivateAssets="All" Condition="'$(MicrosoftNetCompilersToolset_Version)'!=''"/>
5-
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)" Condition="'$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)'!=''" />
6-
<PackageReference Include="RazorGenerator.MsBuild" PrivateAssets="All" Version="$(RazorGeneratorMSBuild_Version)" Condition="'$(RazorGeneratorMSBuild_Version)'!=''" />
7-
<PackageReference Include="Microsoft.AspNet.Mvc" Version="$(MicrosoftAspNetMvc_Version)" Condition="'$(MicrosoftAspNetMvc_Version)'!=''" />
8-
<PackageReference Include="RazorGenerator.MVC" Version="$(RazorGeneratorMVC_Version)" Condition="'$(RazorGeneratorMVC_Version)'!=''" />
9-
</ItemGroup>
102

11-
<!-- Include unversioned compilers unless ExcludeDefaultRazorPackages property is set if we are using Microsoft.Build.CentralPackageVersions -->
12-
<!-- Requires Microsoft.Build.CentralPackageVersions Version 2.1.1 or higher -->
13-
<ItemGroup Condition="'$(ExcludeDefaultRazorPackages)'=='false' AND '$(UsingMicrosoftCentralPackageVersionsSdk)'=='true'">
14-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" PrivateAssets="All"/>
15-
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" />
16-
<PackageReference Include="RazorGenerator.MsBuild" PrivateAssets="All"/>
3+
<Import Project="MSBuild.SDK.SystemWeb.Common.DefaultPackages.props"/>
4+
5+
<!-- Include packages unless ExcludeDefaultSDKPackages property is set -->
6+
<ItemGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false' AND '$(ApplySDKDefaultPackageVersions)'!='true'">
7+
<PackageReference Include="RazorGenerator.MsBuild" PrivateAssets="All" />
178
<PackageReference Include="RazorGenerator.MVC" />
189
<PackageReference Include="Microsoft.AspNet.Mvc"/>
1910
</ItemGroup>
11+
12+
<!-- Set package versions if ApplySDKDefaultPackageVersions is true -->
13+
<ItemGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false' AND '$(ApplySDKDefaultPackageVersions)'=='true'">
14+
<PackageReference Update="RazorGenerator.MsBuild" Version="$(RazorGeneratorMSBuild_Version)" Condition="'$(RazorGeneratorMSBuild_Version)'!=''" />
15+
<PackageReference Update="RazorGenerator.MVC" Version="$(RazorGeneratorMVC_Version)" Condition="'$(RazorGeneratorMVC_Version)'!=''" />
16+
<PackageReference Update="Microsoft.AspNet.Mvc" Version="$(MicrosoftAspNetMvc_Version)" Condition="'$(MicrosoftAspNetMvc_Version)'!=''" />
17+
</ItemGroup>
18+
2019
</Project>

‎src/MSBuild.SDK.SystemWeb/MSBuild.SDK.SystemWeb.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<None Include="version.json" />
13-
<None Include="README.md" Pack="true" PackagePath="\" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<None Include="..\MSBuild.SDK.SystemWeb.CommonFiles\Sdk\**"
16+
Pack="true"
17+
PackagePath="Sdk\" />
18+
<None Update="..\MSBuild.SDK.SystemWeb.CommonFiles\Sdk\**" Link="Sdk\%(RecursiveDir)%(Filename)%(Extension)" />
1419
</ItemGroup>
1520
</Project>

0 commit comments

Comments
 (0)