From ab02d783641360e9f004a2143f9d9d497647ece8 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 15 Mar 2023 10:52:21 -0700 Subject: [PATCH 1/2] Prepare for 5.3.0-preview1 --- 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 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs index 23f575974..3f720f9b5 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.9.0")] // ASPNETMVC -[assembly: AssemblyFileVersion("5.2.9.0")] // ASPNETMVC +[assembly: AssemblyVersion("5.3.0.0")] // ASPNETMVC +[assembly: AssemblyFileVersion("5.3.0.0")] // ASPNETMVC #endif [assembly: AssemblyProduct("Microsoft ASP.NET MVC")] #elif ASPNETWEBPAGES diff --git a/src/CommonAssemblyInfo.vb b/src/CommonAssemblyInfo.vb index 591dc0d89..d5dac6315 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 c9f6f08cb..5ce411ea8 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 8ff9486fe..b44b016c0 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 32e4bc1d7..5235e0fee 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, 9, 0), mvcVersion); + Assert.Equal(new Version(5, 3, 0, 0), mvcVersion); } } } diff --git a/test/System.Web.WebPages.Test/App.config b/test/System.Web.WebPages.Test/App.config index e0565507e..df97ed804 100644 --- a/test/System.Web.WebPages.Test/App.config +++ b/test/System.Web.WebPages.Test/App.config @@ -11,7 +11,7 @@ - + From e3a6d27f975c64d8f48f4de94bbcae91f157eaf4 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 16 Mar 2023 09:43:36 -0700 Subject: [PATCH 2/2] Update AssemblyVersions for formatting --- src/CommonAssemblyInfo.cs | 9 +++++++-- .../System.Net.Http.Formatting.ns1_3.csproj | 2 +- .../System.Net.Http.Formatting.ns2_0.csproj | 2 +- .../System.Net.Http.Formatting.csproj | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs index 3f720f9b5..de4e5d379 100644 --- a/src/CommonAssemblyInfo.cs +++ b/src/CommonAssemblyInfo.cs @@ -24,8 +24,13 @@ // BUILD_GENERATED_VERSION will be set in any CI build. Versions below are not used. // =================================================================================== -#if (ASPNETMVC && (ASPNETWEBPAGES || ASPNETFACEBOOK)) || (ASPNETWEBPAGES && ASPNETFACEBOOK) -#error Runtime projects cannot define more than one of ASPNETMVC, ASPNETWEBPAGES or ASPNETFACEBOOK +#if (ASPNETMVC && (ASPNETWEBPAGES || ASPNETFACEBOOK || ASPNETHTTPFORMATTING)) || (ASPNETWEBPAGES && (ASPNETFACEBOOK || ASPNETHTTPFORMATTING)) || (ASPNETFACEBOOK && ASPNETHTTPFORMATTING) +#error Runtime projects cannot define more than one of ASPNETMVC, ASPNETWEBPAGES, ASPNETFACEBOOK, or ASPNETHTTPFORMATTING +#elif ASPNETHTTPFORMATTING +#if !BUILD_GENERATED_VERSION +[assembly: AssemblyVersion("6.0.0.0")] // ASPNETHTTPFORMATTING +[assembly: AssemblyFileVersion("6.0.0.0")] // ASPNETHTTPFORMATTING +#endif #elif ASPNETMVC #if !BUILD_GENERATED_VERSION [assembly: AssemblyVersion("5.3.0.0")] // ASPNETMVC diff --git a/src/System.Net.Http.Formatting.ns1_3/System.Net.Http.Formatting.ns1_3.csproj b/src/System.Net.Http.Formatting.ns1_3/System.Net.Http.Formatting.ns1_3.csproj index 7e388ca5b..cb723ee1d 100644 --- a/src/System.Net.Http.Formatting.ns1_3/System.Net.Http.Formatting.ns1_3.csproj +++ b/src/System.Net.Http.Formatting.ns1_3/System.Net.Http.Formatting.ns1_3.csproj @@ -7,7 +7,7 @@ $(OutputPath)ns1_3\ $(OutputPath)$(AssemblyName).xml false - $(DefineConstants);ASPNETMVC + $(DefineConstants);ASPNETHTTPFORMATTING 1591 false $(Configurations);CodeAnalysis diff --git a/src/System.Net.Http.Formatting.ns2_0/System.Net.Http.Formatting.ns2_0.csproj b/src/System.Net.Http.Formatting.ns2_0/System.Net.Http.Formatting.ns2_0.csproj index b44945028..b31b98d40 100644 --- a/src/System.Net.Http.Formatting.ns2_0/System.Net.Http.Formatting.ns2_0.csproj +++ b/src/System.Net.Http.Formatting.ns2_0/System.Net.Http.Formatting.ns2_0.csproj @@ -7,7 +7,7 @@ $(OutputPath)ns2_0\ $(OutputPath)$(AssemblyName).xml false - $(DefineConstants);ASPNETMVC + $(DefineConstants);ASPNETHTTPFORMATTING 1591 false $(Configurations);CodeAnalysis diff --git a/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj b/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj index d52549eec..bf2cf46b1 100644 --- a/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj +++ b/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj @@ -10,7 +10,7 @@ $(OutputPath)$(AssemblyName).xml $(CodeAnalysis) ..\Strict.ruleset - $(DefineConstants);ASPNETMVC + $(DefineConstants);ASPNETHTTPFORMATTING Client 1591