From 3155d174ba1d7e281ef0b9bbe78fb10a43aa7450 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Wed, 2 May 2018 16:49:39 -0700 Subject: [PATCH] Move to 5.2.6 / 3.2.6 Preview1 - match combination of eb1bfe51a1 and 986889d81c i.e. the upgrade to 5.2.5 / 3.2.5 Preview1 - also change README.md to use "Web API 5.x" instead of "Web API 2.x" --- README.md | 8 ++++---- src/CommonAssemblyInfo.cs | 4 ++-- src/CommonAssemblyInfo.vb | 4 ++-- src/WebApiHelpPage/Areas/HelpPage/Views/Web.config | 2 +- src/WebApiHelpPage/VB/Areas/HelpPage/Views/Web.config | 2 +- test/Microsoft.Web.Mvc.Test/Test/VersionTest.cs | 2 +- test/System.Web.WebPages.Test/App.config | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 893b38d42..62682d962 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ ASP.NET MVC, Web API, Web Pages, and Razor AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/aspnet/aspnetwebstack?branch=master&svg=true)](https://ci.appveyor.com/project/aspnetci/aspnetwebstack/branch/master) -## Note: This repo is for ASP.NET MVC 5.x, Web API 2.x, and Web Pages 3.x. For ASP.NET Core MVC, check the [MVC repo](https://github.com/aspnet/Mvc). +## Note: This repo is for ASP.NET MVC 5.x, Web API 5.x, and Web Pages 3.x. For ASP.NET Core MVC, check the [MVC repo](https://github.com/aspnet/Mvc). ASP.NET MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and Web APIs. ASP.NET MVC enables a clean separation of concerns and gives you full control over markup. This repo includes: * ASP.NET MVC 5.x -* ASP.NET Web API 2.x +* ASP.NET Web API 5.x * ASP.NET Web Pages 3.x * ASP.NET Razor 3.x @@ -26,5 +26,5 @@ Git tag|Git branch|Other products|MVC package versions|Web API package (product) [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)||In https://dotnet.myget.org/gallery/aspnetwebstack-dev feed; not on https://nuget.org yet|5.2.4|5.2.4 (2.2.4)|3.2.4 -||[master](https://github.com/aspnet/AspNetWebStack/tree/master)|New work e.g. Web API 2.2.5-preview1||| +[v3.2.5](https://github.com/aspnet/AspNetWebStack/tree/v3.2.5)|||5.2.5|5.2.5|3.2.5 +||[master](https://github.com/aspnet/AspNetWebStack/tree/master)|New work e.g. MVC 5.2.6-preview1||| diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs index 1591f17df..234252c0f 100644 --- a/src/CommonAssemblyInfo.cs +++ b/src/CommonAssemblyInfo.cs @@ -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.5.0")] // ASPNETMVC -[assembly: AssemblyFileVersion("5.2.5.0")] // ASPNETMVC +[assembly: AssemblyVersion("5.2.6.0")] // ASPNETMVC +[assembly: AssemblyFileVersion("5.2.6.0")] // ASPNETMVC #endif [assembly: AssemblyProduct("Microsoft ASP.NET MVC")] #elif ASPNETWEBPAGES diff --git a/src/CommonAssemblyInfo.vb b/src/CommonAssemblyInfo.vb index 288627dd1..2c4b4b7da 100644 --- a/src/CommonAssemblyInfo.vb +++ b/src/CommonAssemblyInfo.vb @@ -20,6 +20,6 @@ Imports System.Runtime.InteropServices ' Version numbers are automatically generated based on regular expressions. ' =========================================================================== - 'ASPNETMVC - 'ASPNETMVC + 'ASPNETMVC + 'ASPNETMVC \ No newline at end of file diff --git a/src/WebApiHelpPage/Areas/HelpPage/Views/Web.config b/src/WebApiHelpPage/Areas/HelpPage/Views/Web.config index 6484f8504..e1f9858f7 100644 --- a/src/WebApiHelpPage/Areas/HelpPage/Views/Web.config +++ b/src/WebApiHelpPage/Areas/HelpPage/Views/Web.config @@ -9,7 +9,7 @@ - + diff --git a/src/WebApiHelpPage/VB/Areas/HelpPage/Views/Web.config b/src/WebApiHelpPage/VB/Areas/HelpPage/Views/Web.config index ae1c31212..d6e6905c3 100644 --- a/src/WebApiHelpPage/VB/Areas/HelpPage/Views/Web.config +++ b/src/WebApiHelpPage/VB/Areas/HelpPage/Views/Web.config @@ -9,7 +9,7 @@ - + diff --git a/test/Microsoft.Web.Mvc.Test/Test/VersionTest.cs b/test/Microsoft.Web.Mvc.Test/Test/VersionTest.cs index f33271c52..f1294f044 100644 --- a/test/Microsoft.Web.Mvc.Test/Test/VersionTest.cs +++ b/test/Microsoft.Web.Mvc.Test/Test/VersionTest.cs @@ -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, 5, 0), mvcVersion); + Assert.Equal(new Version(5, 2, 6, 0), mvcVersion); } } } diff --git a/test/System.Web.WebPages.Test/App.config b/test/System.Web.WebPages.Test/App.config index 2411ea9f3..710d59b53 100644 --- a/test/System.Web.WebPages.Test/App.config +++ b/test/System.Web.WebPages.Test/App.config @@ -11,7 +11,7 @@ - +