huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare 2.1.4 patch 

* Update submodules for EF Core, Scaffolding, and Templating
* Change version number for metapackages to 2.1.4
This commit is contained in:
Nate McMaster 2018-08-07 21:24:01 +00:00
parent 7119fc7e1d
commit e4161d8971
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/submodules.props
View File

@ -34,16 +34,8 @@
</PropertyGroup>
<ItemGroup>
<Repository Include="Caching" />
<Repository Include="EntityFrameworkCore" />
<Repository Include="Identity" />
<Repository Include="KestrelHttpServer" />
<Repository Include="Mvc" />
<Repository Include="Razor" />
<Repository Include="Security" />
<Repository Include="SignalR" />
<Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
<Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
<!-- Test-only repos -->
@ -58,6 +50,7 @@
<ShippedRepository Include="AzureIntegration" />
<ShippedRepository Include="BasicMiddleware" />
<ShippedRepository Include="BrowserLink" />
<ShippedRepository Include="Caching" />
<ShippedRepository Include="Common" />
<ShippedRepository Include="Configuration" />
<ShippedRepository Include="CORS" />
@ -72,17 +65,24 @@
<ShippedRepository Include="HttpAbstractions" />
<ShippedRepository Include="HttpClientFactory" />
<ShippedRepository Include="HttpSysServer" />
<ShippedRepository Include="Identity" />
<ShippedRepository Include="IISIntegration" />
<ShippedRepository Include="JavaScriptServices" />
<ShippedRepository Include="JsonPatch" />
<ShippedRepository Include="KestrelHttpServer" />
<ShippedRepository Include="Localization" />
<ShippedRepository Include="Logging" />
<ShippedRepository Include="MetaPackages" PatchPolicy="CascadeVersions" />
<ShippedRepository Include="Microsoft.Data.Sqlite" />
<ShippedRepository Include="Mvc" />
<ShippedRepository Include="MvcPrecompilation" />
<ShippedRepository Include="Options" />
<ShippedRepository Include="Razor" />
<ShippedRepository Include="ResponseCaching" />
<ShippedRepository Include="Routing" />
<ShippedRepository Include="Security" />
<ShippedRepository Include="Session" />
<ShippedRepository Include="SignalR" />
<ShippedRepository Include="StaticFiles" />
<ShippedRepository Include="Testing" />
<ShippedRepository Include="WebSockets" />

2
modules/EntityFrameworkCore

@ -1 +1 @@
Subproject commit 34de1f4f05102cf7fe1768386a760d7b4e4b5ea2
Subproject commit 166e6014791e59c9f0937b05498c82f12cd559b2

2
modules/Scaffolding

@ -1 +1 @@
Subproject commit 41b4023c21f3a5c0ab4213b23d302dda5f880570
Subproject commit 7b99d6ff0c91f2948d7979af85b7887257660dac

2
modules/SignalR

@ -1 +1 @@
Subproject commit 172b68a8360fc7e4c55c746102e44d818e400674
Subproject commit 7d4df89025043858529fb8474df9633f83e00bdd

2
modules/Templating

@ -1 +1 @@
Subproject commit 55b697ab057cfe76b2f7c13c25a24a056c317ad2
Subproject commit 678449fca0df178b0116f321460d4991db86f46e

4
version.props
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>3</AspNetCorePatchVersion>
<AspNetCorePatchVersion>4</AspNetCorePatchVersion>
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
<PrereleaseVersionLabel>rtm</PrereleaseVersionLabel>
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
@ -10,7 +10,7 @@
<!-- The 'human friendly' version to display in installers. In pre-release builds, this might be "2.0.7 Preview 2" -->
<PackageBrandingVersion>$(VersionPrefix)</PackageBrandingVersion>
<ExperimentalVersionPrefix>0.1.3</ExperimentalVersionPrefix>
<ExperimentalVersionPrefix>0.1.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix>
<ExperimentalVersionSuffix>rtm</ExperimentalVersionSuffix>
<PackageVersionSuffix Condition=" '$(IsFinalBuild)' != 'true' AND '$(PrereleaseVersionLabel)' != '' ">$(PrereleaseVersionLabel)</PackageVersionSuffix>