Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare for 5.3.0-preview1 #401

Merged
merged 3 commits into from
Mar 16, 2023
Merged

Prepare for 5.3.0-preview1 #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab02d78
Prepare for 5.3.0-preview1
wtgodbe Mar 15, 2023
e3a6d27
Update AssemblyVersions for formatting
wtgodbe Mar 16, 2023
8bf85a5
Merge branch 'main' into wtgodbe/5.3.0
wtgodbe Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/CommonAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,17 @@
// 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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😁

#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.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
Expand Down
4 changes: 2 additions & 2 deletions src/CommonAssemblyInfo.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ Imports System.Runtime.InteropServices
' Version numbers are automatically generated based on regular expressions.
' ===========================================================================

<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
<Assembly: AssemblyProduct("Microsoft ASP.NET MVC")>
2 changes: 1 addition & 1 deletion src/System.Net.Http.Formatting.ns1_3/System.Net.Http.Formatting.ns1_3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputPath>$(OutputPath)ns1_3\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<RunCodeAnalysis>false</RunCodeAnalysis>
<DefineConstants>$(DefineConstants);ASPNETMVC</DefineConstants>
<DefineConstants>$(DefineConstants);ASPNETHTTPFORMATTING</DefineConstants>
<NoWarn>1591</NoWarn>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Configurations>$(Configurations);CodeAnalysis</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Net.Http.Formatting.ns2_0/System.Net.Http.Formatting.ns2_0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputPath>$(OutputPath)ns2_0\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<RunCodeAnalysis>false</RunCodeAnalysis>
<DefineConstants>$(DefineConstants);ASPNETMVC</DefineConstants>
<DefineConstants>$(DefineConstants);ASPNETHTTPFORMATTING</DefineConstants>
<NoWarn>1591</NoWarn>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Configurations>$(Configurations);CodeAnalysis</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<RunCodeAnalysis>$(CodeAnalysis)</RunCodeAnalysis>
<CodeAnalysisRuleSet>..\Strict.ruleset</CodeAnalysisRuleSet>
<DefineConstants>$(DefineConstants);ASPNETMVC</DefineConstants>
<DefineConstants>$(DefineConstants);ASPNETHTTPFORMATTING</DefineConstants>
<TargetFrameworkProfile Condition="'$(TargetFrameworkVersion)' != 'v4.5'">Client</TargetFrameworkProfile>
<NoWarn>1591</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/WebApiHelpPage/Areas/HelpPage/Views/Web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</configSections>

<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.3.0.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</configSections>

<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.3.0.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
View file
Open in desktop
Original file line number Diff line number Diff line change
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, 9, 0), mvcVersion);
Assert.Equal(new Version(5, 3, 0, 0), mvcVersion);
}
}
}
2 changes: 1 addition & 1 deletion test/System.Web.WebPages.Test/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
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.9.0" newVersion="5.2.9.0" />
<bindingRedirect oldVersion="1.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down