Prepare 2.1.4 patch

* Update submodules for EF Core, Scaffolding, and Templating * Change version number for metapackages to 2.1.4
aspnet · Aug 7, 2018 · e4161d8 · e4161d8
1 parent 7119fc7
commit e4161d8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/build/submodules.props b/build/submodules.props
@@ -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" />

diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
diff --git a/modules/Scaffolding b/modules/Scaffolding
diff --git a/modules/SignalR b/modules/SignalR
diff --git a/modules/Templating b/modules/Templating
diff --git a/version.props b/version.props
@@ -2,15 +2,15 @@
   <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>
 
     <!-- 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>
+63 −63		clients/ts/FunctionalTests/package-lock.json
+2 −3		clients/ts/FunctionalTests/package.json
+0 −32		clients/ts/FunctionalTests/rollup.config.js
+38 −0		clients/ts/FunctionalTests/webpack.config.js
+4,163 −1,611		clients/ts/package-lock.json
+5 −5		clients/ts/package.json
+19 −19		clients/ts/signalr-protocol-msgpack/package-lock.json
+1 −1		clients/ts/signalr-protocol-msgpack/package.json
+14 −0		clients/ts/signalr-protocol-msgpack/webpack.config.js
+1 −1		clients/ts/signalr/package-lock.json
+1 −1		clients/ts/signalr/package.json
+1 −1		clients/ts/signalr/src/HubConnection.ts
+5 −0		clients/ts/signalr/webpack.config.js
+187 −187		clients/ts/webdriver-tap-runner/package-lock.json
+74 −0		clients/ts/webpack.config.base.js