Skip to content

Commit 11988ab

Browse files
CZEMacLeodCZEMacLeod
committed
Update all packages that are deprecated/outdated.
MVC/WebApi to 5.2.9 Newtonsoft.Json to 13.0.1 Microsoft.Web.LibraryManager.Build to 2.1.175 to work around package restore issue with cdnjs (#aspnet/LibraryManager/685) Point docs and example to version 4.0.82 (this build)
1 parent e541988 commit 11988ab

File tree

34 files changed

+86
-105
lines changed

34 files changed

+86
-105
lines changed

‎README.md‎

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

4242
```xml
43-
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.76">
43+
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.82">
4444
...
4545
```
4646

@@ -49,7 +49,7 @@ Or omit the version from the SDK attribute and specify it in the version in `glo
4949
```json
5050
{
5151
"msbuild-sdks": {
52-
"MSBuild.SDK.SystemWeb" : "4.0.76"
52+
"MSBuild.SDK.SystemWeb" : "4.0.82"
5353
}
5454
}
5555
```

‎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.76">
39+
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.82">
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.76"
48+
"MSBuild.SDK.SystemWeb" : "4.0.82"
4949
}
5050
}
5151
```

‎docs/RazorLibrary.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.76">
17+
<Project Sdk="MSBuild.SDK.SystemWeb.RazorLibrary/4.0.82">
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.76"
26+
"MSBuild.SDK.SystemWeb.RazorLibrary" : "4.0.82"
2727
}
2828
}
2929
```

‎docs/SDK.md‎

Lines changed: 2 additions & 2 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.76">
16+
<Project Sdk="MSBuild.SDK.SystemWeb/4.0.82">
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.76"
25+
"MSBuild.SDK.SystemWeb" : "4.0.82"
2626
}
2727
}
2828
```

‎global.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"sdk": {
3-
"version": "5.0.100-preview",
3+
"version": "6.0.100",
44
"rollForward": "latestMajor",
55
"allowPrerelease": true
66
},
77
"msbuild-sdks": {
88
"Microsoft.Build.NoTargets": "2.0.1",
9-
"MSBuild.SDK.SystemWeb": "4.0.69"
9+
"MSBuild.SDK.SystemWeb": "4.0.81",
10+
"MSBuild.SDK.SystemWeb.RazorLibrary": "4.0.81"
1011
}
1112
}

‎samples/ExampleFullWebApplication/ExampleFullWebApplication.vbproj‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<PropertyGroup>
33
<TargetFramework>net48</TargetFramework>
44
<Copyright>Copyright © 2021</Copyright>
5+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
6+
<GeneratedBindingRedirectsAction>Overwrite</GeneratedBindingRedirectsAction>
57
</PropertyGroup>
68

79
<ItemGroup>
@@ -78,17 +80,11 @@
7880
</ItemGroup>
7981
<ItemGroup>
8082
<PackageReference Include="Antlr" Version="3.5.0.2" />
81-
<PackageReference Include="Microsoft.AspNet.Mvc">
82-
<Version>5.2.7</Version>
83-
</PackageReference>
84-
<PackageReference Include="Microsoft.AspNet.Web.Optimization">
85-
<Version>1.1.3</Version>
86-
</PackageReference>
87-
<PackageReference Include="Microsoft.AspNet.WebApi">
88-
<Version>5.2.7</Version>
89-
</PackageReference>
90-
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
91-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
83+
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.9" />
84+
<PackageReference Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
85+
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.9" />
86+
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
87+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
9288
<PackageReference Include="WebGrease" Version="1.6.0" />
9389
</ItemGroup>
9490
</Project>

‎samples/ExampleFullWebApplication/Views/Web.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</configSections>
1010

1111
<system.web.webPages.razor>
12-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
12+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1313
<pages pageBaseType="System.Web.Mvc.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Web.Mvc" />
@@ -36,7 +36,7 @@
3636
<system.web>
3737
<compilation>
3838
<assemblies>
39-
<add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
39+
<add assembly="System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
4040
</assemblies>
4141
</compilation>
4242
</system.web>

‎samples/ExampleFullWebApplication/Web.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
</dependentAssembly>
4545
<dependentAssembly>
4646
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
47-
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
47+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
4848
</dependentAssembly>
4949
<dependentAssembly>
5050
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
5151
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
5252
</dependentAssembly>
5353
<dependentAssembly>
5454
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
55-
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
55+
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
5656
</dependentAssembly>
5757
<dependentAssembly>
5858
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />

‎samples/RazorLibrary/ExampleRazorLibrary/ExampleRazorLibrary.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
<Project Sdk="MSBuild.SDK.SystemWeb.RazorLibrary/4.0.60-gd680654f18">
1+
<Project Sdk="MSBuild.SDK.SystemWeb.RazorLibrary">
22
<PropertyGroup>
33
<TargetFramework>net48</TargetFramework>
44
<Copyright>Copyright © 2022</Copyright>
55
<RazorGeneratorNamespace>ASP</RazorGeneratorNamespace>
6+
<MicrosoftAspNetMvc_Version>5.2.9</MicrosoftAspNetMvc_Version>
67
</PropertyGroup>
78
<ItemGroup>
89
<RazorSrcFiles Include="Views\**\*.cshtml" />
910
</ItemGroup>
1011
<ItemGroup>
1112
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
12-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
13+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1314

1415
<PackageReference Include="Antlr" Version="3.5.0.2" />
1516
<PackageReference Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />

‎samples/RazorLibrary/ExampleRazorLibrary/Views/Web.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</sectionGroup>
88
</configSections>
99
<system.web.webPages.razor>
10-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
10+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1111
<pages pageBaseType="System.Web.Mvc.WebViewPage">
1212
<namespaces>
1313
<add namespace="System.Web.Mvc" />
@@ -29,15 +29,15 @@
2929
</dependentAssembly>
3030
<dependentAssembly xmlns="urn:schemas-microsoft-com:asm.v1">
3131
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
32-
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
32+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
3333
</dependentAssembly>
3434
<dependentAssembly xmlns="urn:schemas-microsoft-com:asm.v1">
3535
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
3636
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
3737
</dependentAssembly>
3838
<dependentAssembly xmlns="urn:schemas-microsoft-com:asm.v1">
3939
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
40-
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
40+
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
4141
</dependentAssembly>
4242
<dependentAssembly xmlns="urn:schemas-microsoft-com:asm.v1">
4343
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -54,7 +54,7 @@
5454
<system.web>
5555
<compilation>
5656
<assemblies>
57-
<add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
57+
<add assembly="System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
5858
</assemblies>
5959
</compilation>
6060
</system.web>

0 commit comments

Comments
 (0)