Skip to content

Commit 52e3c81

Browse files
CZEMacLeodCZEMacLeod
committed
Update version numbers to V4.0.87 and minor fixes
Change ExcludeDefaultSDKPackages to ExcludeSDKDefaultPackages to match ApplySDKDefaultPackageVersions
1 parent 9207275 commit 52e3c81

20 files changed

Lines changed: 39 additions & 40 deletions

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r
4141
Either append the version to the package name:
4242

4343
```xml
44-
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.82">
44+
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.87">
4545
...
4646
```
4747

@@ -50,7 +50,7 @@ Or omit the version from the SDK attribute and specify it in the version in `glo
5050
```json
5151
{
5252
"msbuild-sdks": {
53-
"MSBuild.SDK.SystemWeb" : "4.0.82"
53+
"MSBuild.SDK.SystemWeb" : "4.0.87"
5454
}
5555
}
5656
```

‎docs/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r
3636
Either append the version to the package name:
3737

3838
```xml
39-
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.82">
39+
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.87">
4040
...
4141
```
4242

@@ -45,7 +45,7 @@ Or omit the version from the SDK attribute and specify it in the version in `glo
4545
```json
4646
{
4747
"msbuild-sdks": {
48-
"MSBuild.SDK.SystemWeb" : "4.0.82"
48+
"MSBuild.SDK.SystemWeb" : "4.0.87"
4949
}
5050
}
5151
```

‎docs/RazorLibrary.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r
1414
Either append the version to the package name:
1515

1616
```xml
17-
<Project Sdk="MSBuild.SDK.SystemWeb.RazorLibrary/4.0.82">
17+
<Project Sdk="MSBuild.SDK.SystemWeb.RazorLibrary/4.0.87">
1818
...
1919
```
2020

@@ -23,7 +23,7 @@ Or omit the version from the SDK attribute and specify it in the version in `glo
2323
```json
2424
{
2525
"msbuild-sdks": {
26-
"MSBuild.SDK.SystemWeb.RazorLibrary" : "4.0.82"
26+
"MSBuild.SDK.SystemWeb.RazorLibrary" : "4.0.87"
2727
}
2828
}
2929
```
@@ -43,7 +43,7 @@ For more information see
4343

4444
| Property | Default value | Description |
4545
| -------- | ------------- | ----------- |
46-
| `ExcludeDefaultSDKPackages` | false | Do not include the default packages `Microsoft.Net.Compilers.Toolset` and `Microsoft.CodeDom.Providers.DotNetCompilerPlatform` |
46+
| `ExcludeSDKDefaultPackages` | false | Do not include the default packages `Microsoft.Net.Compilers.Toolset` and `Microsoft.CodeDom.Providers.DotNetCompilerPlatform` |
4747
| `ApplySDKDefaultPackageVersions` | true* | Apply default version numbers to packages unless using a Central Package Management system |
4848

4949
*Version numbers are not applied if you are using `Microsoft.Build.CentralPackageVersions` version 2.1.1 or higher. Remember to include the packages in your central package versions file.
@@ -60,7 +60,7 @@ For more information see
6060
### Deprecated Properties
6161
| Property | Default value | Description |
6262
| -------- | ------------- | ----------- |
63-
| `ExcludeDefaultRazorPackages` | false | Use `ExcludeDefaultSDKPackages` instead |
63+
| `ExcludeDefaultRazorPackages` | false | Use `ExcludeSDKDefaultPackages` instead |
6464

6565
## Automatic Default Packages
6666

‎docs/SDK.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r
1313
Either append the version (as shown in the nuget shield above) to the package name:
1414

1515
```xml
16-
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.83">
16+
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.87">
1717
...
1818
```
1919

@@ -22,7 +22,7 @@ Or omit the version from the SDK attribute and specify it in the version in `glo
2222
```json
2323
{
2424
"msbuild-sdks": {
25-
"MSBuild.SDK.SystemWeb" : "4.0.83"
25+
"MSBuild.SDK.SystemWeb" : "4.0.87"
2626
}
2727
}
2828
```
@@ -35,7 +35,7 @@ You can also use the [templates](Templates.md) to easily create new projects.
3535

3636
| Property | Default value | Description |
3737
| -------- | ------------- | ----------- |
38-
| `ExcludeDefaultSDKPackages` | false | Do not include the default packages `Microsoft.Net.Compilers.Toolset` and `Microsoft.CodeDom.Providers.DotNetCompilerPlatform` |
38+
| `ExcludeSDKDefaultPackages` | false | Do not include the default packages `Microsoft.Net.Compilers.Toolset` and `Microsoft.CodeDom.Providers.DotNetCompilerPlatform` |
3939
| `ApplySDKDefaultPackageVersions` | true* | Apply default version numbers to packages unless using a Central Package Management system |
4040
| `GeneratedBindingRedirectsAction` | None | Set the desired default behavior of what to do with SuggestedBindingRedirects if not yet set.<br>See [automatically generated binding redirects](Binding_Redirects/Autogenerating-Binding-Redirects.md)<br><ul><li>`None` - Do nothing except show the warning</li><li>`Preview` - Creates new Web.BindingRedirects.config file showing proposed changes</li><li>`Overwrite` - Updates the $(AppConfig) aka web.config in the project root</li></ul> |
4141

@@ -54,7 +54,7 @@ You can also use the [templates](Templates.md) to easily create new projects.
5454
### Deprecated Properties
5555
| Property | Default value | Description |
5656
| -------- | ------------- | ----------- |
57-
| `ExcludeASPNetCompilers` | false | Use `ExcludeDefaultSDKPackages` instead |
57+
| `ExcludeASPNetCompilers` | false | Use `ExcludeSDKDefaultPackages` instead |
5858
| `OverwriteAppConfigWithBindingRedirects` | false | If set, will set `GeneratedBindingRedirectsAction` to `Overwrite` then any will be copied into your web.config file. |
5959

6060
## Automatic Default Packages

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"msbuild-sdks": {
88
"Microsoft.Build.NoTargets": "2.0.1",
9-
"MSBuild.SDK.SystemWeb": "4.0.81",
10-
"MSBuild.SDK.SystemWeb.RazorLibrary": "4.0.81"
9+
"MSBuild.SDK.SystemWeb": "4.0.82",
10+
"MSBuild.SDK.SystemWeb.RazorLibrary": "4.0.82"
1111
}
1212
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<PropertyGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false'">
2+
<PropertyGroup Condition="'$(ExcludeSDKDefaultPackages)'=='false'">
33
<MicrosoftNetCompilersToolset_Version Condition="'$(MicrosoftNetCompilersToolset_Version)'==''">4.5.0</MicrosoftNetCompilersToolset_Version>
44
<MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version Condition="'$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)'==''">3.6.0</MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version>
55
</PropertyGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<ApplySDKDefaultPackageVersions Condition="'$(ApplySDKDefaultPackageVersions)'==''">true</ApplySDKDefaultPackageVersions>
1212
</PropertyGroup>
1313

14-
<!-- Include compilers unless ExcludeDefaultSDKPackages property is set -->
15-
<ItemGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false'">
14+
<!-- Include compilers unless ExcludeSDKDefaultPackages property is set -->
15+
<ItemGroup Condition="'$(ExcludeSDKDefaultPackages)'=='false'">
1616
<PackageReference Include="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" GeneratePathProperty="true"/>
1717
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" />
1818
</ItemGroup>
1919

2020
<!-- Set package versions if ApplySDKDefaultPackageVersions is true -->
21-
<ItemGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false' AND '$(ApplySDKDefaultPackageVersions)'=='true'">
21+
<ItemGroup Condition="'$(ExcludeSDKDefaultPackages)'=='false' AND '$(ApplySDKDefaultPackageVersions)'=='true'">
2222
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolset_Version)" Condition="'$(MicrosoftNetCompilersToolset_Version)'!=''"/>
2323
<PackageReference Update="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)" Condition="'$(MicrosoftCodeDomProvidersDotNetCompilerPlatform_Version)'!=''" />
2424
</ItemGroup>

‎src/MSBuild.SDK.SystemWeb.RazorLibrary/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ When using an MSBuild Project SDK obtained via NuGet (such as the SDKs in this r
1414
Either append the version to the package name:
1515

1616
```xml
17-
<Project Sdk="MSBuild.SDK.SystemWeb.RazorLibrary/4.0.83">
17+
<Project Sdk="MSBuild.SDK.SystemWeb.RazorLibrary/4.0.87">
1818
...
1919
```
2020

@@ -23,7 +23,7 @@ Or omit the version from the SDK attribute and specify it in the version in `glo
2323
```json
2424
{
2525
"msbuild-sdks": {
26-
"MSBuild.SDK.SystemWeb.RazorLibrary" : "4.0.83"
26+
"MSBuild.SDK.SystemWeb.RazorLibrary" : "4.0.87"
2727
}
2828
}
2929
```

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<!-- Use new common property ExcludeDefaultSDKPackages instead of ExcludeDefaultRazorPackages from V4.0.83 onwards -->
2+
<!-- Use new common property ExcludeSDKDefaultPackages instead of ExcludeDefaultRazorPackages from V4.0.83 onwards -->
33
<PropertyGroup>
44
<ExcludeDefaultRazorPackages Condition="'$(ExcludeDefaultRazorPackages)'==''">false</ExcludeDefaultRazorPackages>
5-
<ExcludeDefaultSDKPackages Condition="'$(ExcludeDefaultSDKPackages)'==''">$(ExcludeDefaultRazorPackages)</ExcludeDefaultSDKPackages>
5+
<ExcludeSDKDefaultPackages Condition="'$(ExcludeSDKDefaultPackages)'==''">$(ExcludeDefaultRazorPackages)</ExcludeSDKDefaultPackages>
66
</PropertyGroup>
7-
<PropertyGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false'">
7+
<PropertyGroup Condition="'$(ExcludeSDKDefaultPackages)'=='false'">
88
<MicrosoftAspNetMvc_Version Condition="'$(MicrosoftAspNetMvc_Version)'==''">5.2.9</MicrosoftAspNetMvc_Version>
99

1010
<RazorGeneratorMSBuild_Version Condition="'$(RazorGeneratorMSBuild_Version)'==''">2.5.0</RazorGeneratorMSBuild_Version>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3-
<Import Project="MSBuild.SDK.SystemWeb.Common.DefaultPackages.props"/>
3+
<Import Project="MSBuild.SDK.SystemWeb.Common.DefaultPackages.targets" />
44

5-
<!-- Include packages unless ExcludeDefaultSDKPackages property is set -->
6-
<ItemGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false' AND '$(ApplySDKDefaultPackageVersions)'!='true'">
5+
<!-- Include packages unless ExcludeSDKDefaultPackages property is set -->
6+
<ItemGroup Condition="'$(ExcludeSDKDefaultPackages)'=='false'">
77
<PackageReference Include="RazorGenerator.MsBuild" PrivateAssets="All" />
88
<PackageReference Include="RazorGenerator.MVC" />
99
<PackageReference Include="Microsoft.AspNet.Mvc"/>
1010
</ItemGroup>
1111

1212
<!-- Set package versions if ApplySDKDefaultPackageVersions is true -->
13-
<ItemGroup Condition="'$(ExcludeDefaultSDKPackages)'=='false' AND '$(ApplySDKDefaultPackageVersions)'=='true'">
13+
<ItemGroup Condition="'$(ExcludeSDKDefaultPackages)'=='false' AND '$(ApplySDKDefaultPackageVersions)'=='true'">
1414
<PackageReference Update="RazorGenerator.MsBuild" Version="$(RazorGeneratorMSBuild_Version)" Condition="'$(RazorGeneratorMSBuild_Version)'!=''" />
1515
<PackageReference Update="RazorGenerator.MVC" Version="$(RazorGeneratorMVC_Version)" Condition="'$(RazorGeneratorMVC_Version)'!=''" />
1616
<PackageReference Update="Microsoft.AspNet.Mvc" Version="$(MicrosoftAspNetMvc_Version)" Condition="'$(MicrosoftAspNetMvc_Version)'!=''" />

0 commit comments

Comments
 (0)