From 5022be815fced9989c441052ff45e8e72590c905 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 23 Mar 2018 09:41:42 -0700
Subject: [PATCH 1/6] Updating submodule(s)

HttpAbstractions => 72210e4078a7e92197ac83af64c5fe864d833984
IISIntegration => 79b038afb44b5267f429efdc270659de77519361
Mvc => 1d6c09ab3182d325c9b2a356623ce8670e8310d4

[auto-updated: submodules]
---
 modules/HttpAbstractions | 2 +-
 modules/IISIntegration   | 2 +-
 modules/Mvc              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions
index f91db5b794..72210e4078 160000
--- a/modules/HttpAbstractions
+++ b/modules/HttpAbstractions
@@ -1 +1 @@
-Subproject commit f91db5b7943c011533b4ae3a9351f9cd4ebfb4d5
+Subproject commit 72210e4078a7e92197ac83af64c5fe864d833984
diff --git a/modules/IISIntegration b/modules/IISIntegration
index 326a168eb0..79b038afb4 160000
--- a/modules/IISIntegration
+++ b/modules/IISIntegration
@@ -1 +1 @@
-Subproject commit 326a168eb0197385d705314716fb90956d5e71dc
+Subproject commit 79b038afb44b5267f429efdc270659de77519361
diff --git a/modules/Mvc b/modules/Mvc
index 8590bb9367..1d6c09ab31 160000
--- a/modules/Mvc
+++ b/modules/Mvc
@@ -1 +1 @@
-Subproject commit 8590bb93673d79dbd85b728d97d17a427ce49cc9
+Subproject commit 1d6c09ab3182d325c9b2a356623ce8670e8310d4

From fdab25530bc61cc3510819dd41bf2b33e60144ff Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 23 Mar 2018 10:55:25 -0700
Subject: [PATCH 2/6] Updating submodule(s)

Identity => f1abe24c7681a9e4e8314d87a26f566e74d171eb

[auto-updated: submodules]
---
 modules/Identity | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Identity b/modules/Identity
index 1fd33f62f4..f1abe24c76 160000
--- a/modules/Identity
+++ b/modules/Identity
@@ -1 +1 @@
-Subproject commit 1fd33f62f4e095aa1fd8837c8195a1037fff9323
+Subproject commit f1abe24c7681a9e4e8314d87a26f566e74d171eb

From 8214eaa16ec9150b55cdbdadfde579d3a8e21ad8 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 23 Mar 2018 12:15:38 -0700
Subject: [PATCH 3/6] Updating submodule(s)

Templating => e3894a460932c279011ac8faf3412ff287f32a7c

[auto-updated: submodules]
---
 modules/Templating | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Templating b/modules/Templating
index 4acda9dd9b..e3894a4609 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit 4acda9dd9b68ea27fbe6d711c82474c51c0f75f4
+Subproject commit e3894a460932c279011ac8faf3412ff287f32a7c

From 191e10e5a79233a5cb9a4db798c27f8064c560d4 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 23 Mar 2018 13:05:01 -0700
Subject: [PATCH 4/6] Add the Azure Active Directory integration package

---
 build/artifacts.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/artifacts.props b/build/artifacts.props
index 9366e05d5c..2f56e160f7 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -36,6 +36,7 @@
     <PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModule" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Category="ship"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Category="ship"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Cookies" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Core" Category="ship" AppMetapackage="true" AllMetapackage="true"/>

From 414b3d958a65544de0ec420fe556da3173dbb1e9 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 23 Mar 2018 13:26:22 -0700
Subject: [PATCH 5/6] Update the AAAD integration submodule

---
 modules/AADIntegration | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/AADIntegration b/modules/AADIntegration
index 8f42ce8492..f49270d9d6 160000
--- a/modules/AADIntegration
+++ b/modules/AADIntegration
@@ -1 +1 @@
-Subproject commit 8f42ce8492fd924b6e2471b2b18c5f06e1ee7c47
+Subproject commit f49270d9d62bb8940b197a6141113e147756c3bb

From ec184bc361e9e52e1c21f0fd1a7d09aa6acb78a9 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Thu, 22 Mar 2018 22:57:03 -0700
Subject: [PATCH 6/6] Build runtime specific metapackages

---
 build/SharedFx.targets                        | 27 +++++++++++++++++++
 build/artifacts.props                         |  8 +++++-
 .../Microsoft.AspNetCore.All.csproj           |  1 +
 src/Microsoft.AspNetCore.All/runtime.json.in  |  9 +++++++
 .../Microsoft.AspNetCore.App.csproj           |  1 +
 src/Microsoft.AspNetCore.App/runtime.json.in  |  9 +++++++
 ...untime.win.Microsoft.AspNetCore.All.csproj | 14 ++++++++++
 ...untime.win.Microsoft.AspNetCore.App.csproj | 14 ++++++++++
 8 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/Microsoft.AspNetCore.All/runtime.json.in
 create mode 100644 src/Microsoft.AspNetCore.App/runtime.json.in
 create mode 100644 src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj
 create mode 100644 src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index fd696721b7..9dd5423bf4 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -13,7 +13,9 @@
   <Target Name="GetMetapackageArtifactInfo">
     <ItemGroup>
       <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" />
+      <_MetapackageProject Include="$(RepositoryRoot)src\runtime.win.Microsoft.AspNetCore.All\runtime.win.Microsoft.AspNetCore.All.csproj" />
       <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" />
+      <_MetapackageProject Include="$(RepositoryRoot)src\runtime.win.Microsoft.AspNetCore.App\runtime.win.Microsoft.AspNetCore.App.csproj" />
       <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" />
     </ItemGroup>
 
@@ -75,6 +77,13 @@
       PackageArtifacts="@(PackageArtifact)"
       ExternalDependencies="@(ExternalDependency)" />
 
+    <!-- Update runtime.json.in -->
+    <GenerateFileFromTemplate
+      TemplateFile="$(MetapackageWorkDirectory)runtime.json.in"
+      OutputPath="$(MetapackageWorkDirectory)runtime.json"
+      Properties="METAPACKAGE_ID=$(MetapackageName);PACKAGE_VERSION=$(PackageVersion)"
+      Condition="'$(ProcessRuntimeJson)' == 'true'"/>
+
     <!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. -->
     <MSBuild Projects="$(MetapackageWorkDirectory)$(MetapackageName).csproj" Targets="Restore" Properties="$(CommonProps);_Target=Restore" />
     <!-- Pack -->
@@ -87,6 +96,15 @@
         <AdditionalProperties>
           MetapackageName=Microsoft.AspNetCore.App;
           MetapackageReferenceType=AppMetapackage;
+          LockToExactVersions=true;
+          ProcessRuntimeJson=true
+        </AdditionalProperties>
+      </_MetapackageBuilderProject>
+
+      <_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)">
+        <AdditionalProperties>
+          MetapackageName=runtime.win.Microsoft.AspNetCore.App;
+          MetapackageReferenceType=WinAppMetapackage;
           LockToExactVersions=true
         </AdditionalProperties>
       </_MetapackageBuilderProject>
@@ -95,6 +113,15 @@
         <AdditionalProperties>
           MetapackageName=Microsoft.AspNetCore.All;
           MetapackageReferenceType=AllMetapackage;
+          LockToExactVersions=false;
+          ProcessRuntimeJson=true
+        </AdditionalProperties>
+      </_MetapackageBuilderProject>
+
+      <_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)">
+        <AdditionalProperties>
+          MetapackageName=runtime.win.Microsoft.AspNetCore.All;
+          MetapackageReferenceType=WinAllMetapackage;
           LockToExactVersions=false
         </AdditionalProperties>
       </_MetapackageBuilderProject>
diff --git a/build/artifacts.props b/build/artifacts.props
index 2f56e160f7..90989ec22c 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -6,6 +6,10 @@
       <AppMetapackage>false</AppMetapackage>
       <!-- When true, this dependency will be included in the Microsoft.AspNetCore.All metapackage. -->
       <AllMetapackage>false</AllMetapackage>
+      <!-- When true, this dependency will be included in the runtime.win.Microsoft.AspNetCore.App metapackage. -->
+      <WinAppMetapackage>false</WinAppMetapackage>
+      <!-- When true, this dependency will be included in the runtime.win.Microsoft.AspNetCore.All metapackage. -->
+      <WinAllMetapackage>false</WinAllMetapackage>
       <!-- When true, this dependency will be included in the Microsoft.AspNetCore.Analyzers metapackage. -->
       <Analyzer>false</Analyzer>
       <!-- When true, this dependency will be included in the LZMA. -->
@@ -142,7 +146,7 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Routing.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Server.IIS" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Server.IIS" Category="ship" WinAppMetapackage="true" WinAllMetapackage="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.IISIntegration" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
@@ -304,6 +308,8 @@
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" LZMA="true" />
     <PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
     <PackageArtifact Include="RazorPageGenerator" Category="noship" />
+    <PackageArtifact Include="runtime.win.Microsoft.AspNetCore.App" Category="ship" />
+    <PackageArtifact Include="runtime.win.Microsoft.AspNetCore.All" Category="ship" />
 
     <PackageArtifact Include="Internal.AspNetCore.Universe.Lineup" Category="noship" PackageType="Lineup" />
   </ItemGroup>
diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index 6df70d6f22..285e42eb7c 100644
--- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
+++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
@@ -15,6 +15,7 @@
     <Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" />
     <Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" />
     <Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" />
+    <Content Include="runtime.json" PackagePath="%(Identity)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.All/runtime.json.in b/src/Microsoft.AspNetCore.All/runtime.json.in
new file mode 100644
index 0000000000..58bf9bf176
--- /dev/null
+++ b/src/Microsoft.AspNetCore.All/runtime.json.in
@@ -0,0 +1,9 @@
+{
+  "runtimes": {
+    "win": {
+      "${METAPACKAGE_ID}": {
+        "runtime.win.${METAPACKAGE_ID}": "${PACKAGE_VERSION}"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
index d87e940d0c..dba8a26764 100644
--- a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
+++ b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
@@ -15,6 +15,7 @@
     <Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" />
     <Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" />
     <Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" />
+    <Content Include="runtime.json" PackagePath="%(Identity)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.App/runtime.json.in b/src/Microsoft.AspNetCore.App/runtime.json.in
new file mode 100644
index 0000000000..58bf9bf176
--- /dev/null
+++ b/src/Microsoft.AspNetCore.App/runtime.json.in
@@ -0,0 +1,9 @@
+{
+  "runtimes": {
+    "win": {
+      "${METAPACKAGE_ID}": {
+        "runtime.win.${METAPACKAGE_ID}": "${PACKAGE_VERSION}"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj b/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj
new file mode 100644
index 0000000000..6345c02e40
--- /dev/null
+++ b/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
+
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <PackageTags>aspnetcore</PackageTags>
+    <Description>runtime.win.Microsoft.AspNetCore.All</Description>
+    <EnableApiCheck>false</EnableApiCheck>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj b/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj
new file mode 100644
index 0000000000..53c20bb691
--- /dev/null
+++ b/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
+
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <PackageTags>aspnetcore</PackageTags>
+    <Description>runtime.win.Microsoft.AspNetCore.App</Description>
+    <EnableApiCheck>false</EnableApiCheck>
+  </PropertyGroup>
+
+</Project>