Skip to content

Commit

Permalink
Rebrand to v3.2.9 / v5.2.9 (#299)
Browse files Browse the repository at this point in the history
* Move to a current .NET SDK
- cherry-picked from release/3.2.8 commit ffbf707

* Rebrand to v3.2.9 / v5.2.9
- cherry-picked from release/3.2.8 commit bc83a3a (#298)
- then, switched to 3.2.9 instead of 3.2.8

- reformat README.md
  - merge 'Git tag' and 'Git branch' columns
  - remove old v3.2.4 / v5.2.4 information
  - add v3.2.7 / v5.2.7 information
  • Loading branch information
dougbu committed May 10, 2021
1 parent 42991b3 commit a68a575
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 19 deletions.
19 changes: 10 additions & 9 deletions README.md
Expand Up @@ -24,12 +24,13 @@ Check out the [contributing](CONTRIBUTING.md) page to see the best places to log

### Tags and releases

Git tag|Git branch|Other products|MVC package versions|Web API package (product) versions|Web Pages package versions
--------|--------------|------------|------------|------------|------------
[v2.0.4](https://github.com/aspnet/AspNetWebStack/tree/v2.0.4)|[v2.0-rtm](https://github.com/aspnet/AspNetWebStack/tree/v2.0-rtm)||4.0.40804|4.0.30506|2.0.30506
[v2.1](https://github.com/aspnet/AspNetWebStack/tree/v2.1)||ASP.NET and Web Tools 2012.2, VS 2012 Update 2 (not on http://nuget.org)|v4 2012.2 Update RTM|v1 2012.2 Update RTM|v2 2012.2 Update RTM
[v3.0.2](https://github.com/aspnet/AspNetWebStack/tree/v3.0.2)|[v3-rtm](https://github.com/aspnet/AspNetWebStack/tree/v3-rtm)||5.0.2|5.0.1 (2.0.1)|3.0.1
[v3.1.3](https://github.com/aspnet/AspNetWebStack/tree/v3.1.3)|[v3.1-rtm](https://github.com/aspnet/AspNetWebStack/tree/v3.1-rtm)||5.1.3|5.1.2 (2.1.2)|3.1.2
[v3.2.4](https://github.com/aspnet/AspNetWebStack/tree/v3.2.4)|||5.2.4|5.2.4 (2.2.4)|3.2.4
[v3.2.6](https://github.com/aspnet/AspNetWebStack/tree/v3.2.6)|||5.2.6|5.2.6|3.2.6
||[master](https://github.com/aspnet/AspNetWebStack/tree/master)|New work e.g. MVC 5.2.7-preview1|||
Git tag or branch|Other products|MVC package versions|Web API package (product) versions|Web Pages package versions
--------|--------------|------------|------------|------------
[v2.0.4](https://github.com/aspnet/AspNetWebStack/tree/v2.0.4)||4.0.40804|4.0.30506|2.0.30506
[v2.1](https://github.com/aspnet/AspNetWebStack/tree/v2.1)|ASP.NET and Web Tools 2012.2, VS 2012 Update 2 (not on http://nuget.org)|v4 2012.2 Update RTM|v1 2012.2 Update RTM|v2 2012.2 Update RTM
[v3.0.2](https://github.com/aspnet/AspNetWebStack/tree/v3.0.2)||5.0.2|5.0.1 (2.0.1)|3.0.1
[v3.1.3](https://github.com/aspnet/AspNetWebStack/tree/v3.1.3)||5.1.3|5.1.2 (2.1.2)|3.1.2
[v3.2.6](https://github.com/aspnet/AspNetWebStack/tree/v3.2.6)||5.2.6|5.2.6|3.2.6
[v3.2.7](https://github.com/aspnet/AspNetWebStack/tree/v3.2.7)||5.2.7|5.2.7|3.2.7
[release/3.2.8](https://github.com/aspnet/AspNetWebStack/tree/release/3.2.8)|Work in progress on 5.2.8/3.2.8||||
[main](https://github.com/aspnet/AspNetWebStack/tree/main)|New work e.g. MVC 5.2.9-preview1||||
4 changes: 2 additions & 2 deletions global.json
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.403"
"version": "2.1.523"
}
}
}
4 changes: 2 additions & 2 deletions src/CommonAssemblyInfo.cs
Expand Up @@ -28,8 +28,8 @@
#error Runtime projects cannot define more than one of ASPNETMVC, ASPNETWEBPAGES or ASPNETFACEBOOK
#elif ASPNETMVC
#if !BUILD_GENERATED_VERSION
[assembly: AssemblyVersion("5.2.7.0")] // ASPNETMVC
[assembly: AssemblyFileVersion("5.2.7.0")] // ASPNETMVC
[assembly: AssemblyVersion("5.2.9.0")] // ASPNETMVC
[assembly: AssemblyFileVersion("5.2.9.0")] // ASPNETMVC
#endif
[assembly: AssemblyProduct("Microsoft ASP.NET MVC")]
#elif ASPNETWEBPAGES
Expand Down
4 changes: 2 additions & 2 deletions src/CommonAssemblyInfo.vb
Expand Up @@ -20,6 +20,6 @@ Imports System.Runtime.InteropServices
' Version numbers are automatically generated based on regular expressions.
' ===========================================================================

<Assembly: AssemblyVersion("5.2.7.0")> 'ASPNETMVC
<Assembly: AssemblyFileVersion("5.2.7.0")> 'ASPNETMVC
<Assembly: AssemblyVersion("5.2.9.0")> 'ASPNETMVC
<Assembly: AssemblyFileVersion("5.2.9.0")> 'ASPNETMVC
<Assembly: AssemblyProduct("Microsoft ASP.NET MVC")>
2 changes: 1 addition & 1 deletion src/WebApiHelpPage/Areas/HelpPage/Views/Web.config
Expand Up @@ -9,7 +9,7 @@
</configSections>

<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<add namespace="System.Web.Mvc" />
Expand Down
2 changes: 1 addition & 1 deletion src/WebApiHelpPage/VB/Areas/HelpPage/Views/Web.config
Expand Up @@ -9,7 +9,7 @@
</configSections>

<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<add namespace="System.Web.Mvc" />
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.Web.Mvc.Test/Test/VersionTest.cs
Expand Up @@ -13,7 +13,7 @@ public class VersionTest
public void VerifyMVCVersionChangesAreIntentional()
{
Version mvcVersion = VersionTestHelper.GetVersionFromAssembly("System.Web.Mvc", typeof(Controller));
Assert.Equal(new Version(5, 2, 7, 0), mvcVersion);
Assert.Equal(new Version(5, 2, 9, 0), mvcVersion);
}
}
}
2 changes: 1 addition & 1 deletion test/System.Web.WebPages.Test/App.config
Expand Up @@ -11,7 +11,7 @@
<dependentAssembly>
<!-- Need this because the BinarySerializer uses the TypeForwardedFrom attribute and deserializes to the original assembly (MVC 2.0) for the HttpAntiForgeryException test -->
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
<bindingRedirect oldVersion="1.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down

0 comments on commit a68a575

Please sign in to comment.