Move to 3.2.5 Preview1

Author: dougbu

README.md

@@ -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.3](https://github.com/aspnet/AspNetWebStack/tree/v3.2.3)|||5.2.3|5.2.3 (2.2.3)|3.2.3
-||[master](https://github.com/aspnet/AspNetWebStack/tree/master)|New work e.g. Web API 2.2.4-preview1|||
+[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|||

src/CommonAssemblyInfo.cs

@@ -19,31 +19,31 @@
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 
-// ===========================================================================
-//  DO NOT EDIT OR REMOVE ANYTHING BELOW THIS COMMENT.
-//  Version numbers are automatically generated based on regular expressions.
-// ===========================================================================
+// ===================================================================================
+//  TAKE CARE WHEN EDITING OR REMOVING ANYTHING BELOW THIS COMMENT.
+//  BUILD_GENERATED_VERSION will be set in any CI build. Versions below are not used.
+// ===================================================================================
 
-#if ASPNETMVC && ASPNETWEBPAGES
-#error Runtime projects cannot define both ASPNETMVC and ASPNETWEBPAGES
+#if (ASPNETMVC && (ASPNETWEBPAGES || ASPNETFACEBOOK)) || (ASPNETWEBPAGES && ASPNETFACEBOOK)
+#error Runtime projects cannot define more than one of ASPNETMVC, ASPNETWEBPAGES or ASPNETFACEBOOK
 #elif ASPNETMVC
 #if !BUILD_GENERATED_VERSION
-[assembly: AssemblyVersion("5.2.4.0")] // ASPNETMVC
-[assembly: AssemblyFileVersion("5.2.4.0")] // ASPNETMVC
+[assembly: AssemblyVersion("5.2.5.0")] // ASPNETMVC
+[assembly: AssemblyFileVersion("5.2.5.0")] // ASPNETMVC
 #endif
 [assembly: AssemblyProduct("Microsoft ASP.NET MVC")]
 #elif ASPNETWEBPAGES
 #if !BUILD_GENERATED_VERSION
-[assembly: AssemblyVersion("3.0.0.0")] // ASPNETWEBPAGES
-[assembly: AssemblyFileVersion("3.0.0.0")] // ASPNETWEBPAGES
+[assembly: AssemblyVersion("3.2.5.0")] // ASPNETWEBPAGES
+[assembly: AssemblyFileVersion("3.2.5.0")] // ASPNETWEBPAGES
 #endif
 [assembly: AssemblyProduct("Microsoft ASP.NET Web Pages")]
 #elif ASPNETFACEBOOK
 #if !BUILD_GENERATED_VERSION
-[assembly: AssemblyVersion("1.1.0.0")] // ASPNETFACEBOOK
-[assembly: AssemblyFileVersion("1.1.0.0")] // ASPNETFACEBOOK
+[assembly: AssemblyVersion("1.1.1.0")] // ASPNETFACEBOOK
+[assembly: AssemblyFileVersion("1.1.1.0")] // ASPNETFACEBOOK
 #endif
 [assembly: AssemblyProduct("Microsoft ASP.NET Facebook")]
 #else
-#error Runtime projects must define either ASPNETMVC or ASPNETWEBPAGES
+#error Runtime projects must define ASPNETMVC, ASPNETWEBPAGES or ASPNETFACEBOOK
 #endif

src/CommonAssemblyInfo.vb

@@ -20,6 +20,6 @@ Imports System.Runtime.InteropServices
 ' Version numbers are automatically generated based on regular expressions.
 ' ===========================================================================
 
-<Assembly: AssemblyVersion("5.2.4.0")>   'ASPNETMVC
-<Assembly: AssemblyFileVersion("5.2.4.0")>   'ASPNETMVC
+<Assembly: AssemblyVersion("5.2.5.0")>   'ASPNETMVC
+<Assembly: AssemblyFileVersion("5.2.5.0")>   'ASPNETMVC
 <Assembly: AssemblyProduct("Microsoft ASP.NET MVC")>

src/WebApiHelpPage/Areas/HelpPage/Views/Web.config

@@ -9,7 +9,7 @@
   </configSections>
 
   <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.5.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     <pages pageBaseType="System.Web.Mvc.WebViewPage">
       <namespaces>
         <add namespace="System.Web.Mvc" />

src/WebApiHelpPage/VB/Areas/HelpPage/Views/Web.config

@@ -9,7 +9,7 @@
   </configSections>
 
   <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.5.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     <pages pageBaseType="System.Web.Mvc.WebViewPage">
       <namespaces>
         <add namespace="System.Web.Mvc" />

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, 4, 0), mvcVersion);
+            Assert.Equal(new Version(5, 2, 5, 0), mvcVersion);
         }
     }
 }

test/System.Web.WebPages.Test/App.config

@@ -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.4.0" newVersion="5.2.4.0" />
+        <bindingRedirect oldVersion="1.0.0.0-5.2.5.0" newVersion="5.2.5.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>