aspnet
/
AspNetWebStack
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Prepare for 5.3.0-preview1 (#401) 

* Prepare for 5.3.0-preview1

* Update AssemblyVersions for formatting
This commit is contained in:
William Godbe 2023-03-16 12:56:48 -07:00 коммит произвёл GitHub
Родитель 509661e54f
Коммит 1231b77d79
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
9 изменённых файлов: 18 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
src/CommonAssemblyInfo.cs
Просмотреть файл

@ -24,12 +24,17 @@ using System.Runtime.InteropServices;
// 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.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

4
src/CommonAssemblyInfo.vb
Просмотреть файл

@ -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
src/System.Net.Http.Formatting.ns1_3/System.Net.Http.Formatting.ns1_3.csproj
Просмотреть файл

@ -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>

2
src/System.Net.Http.Formatting.ns2_0/System.Net.Http.Formatting.ns2_0.csproj
Просмотреть файл

@ -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>

2
src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
Просмотреть файл

@ -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>

2
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.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" />

2
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.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" />

2
test/Microsoft.Web.Mvc.Test/Test/VersionTest.cs
Просмотреть файл

@ -13,7 +13,7 @@ namespace Microsoft.Web.Test
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
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.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>