From ad4cf2a1dc09c3e549183324ef2737b40905cf61 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Tue, 1 May 2018 08:43:44 -0700
Subject: [PATCH 01/20] Update
 MicrosoftAzureServicesAppAuthenticationPackageVersion to stable (#1127)

---
 build/dependencies.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 823e3956f3..b021f24d6a 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -61,7 +61,7 @@
     <MicrosoftAzureDocumentDBCorePackageVersion>1.7.1</MicrosoftAzureDocumentDBCorePackageVersion>
     <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>
     <MicrosoftAzureManagementFluentPackageVersion>1.1.3</MicrosoftAzureManagementFluentPackageVersion>
-    <MicrosoftAzureServicesAppAuthenticationPackageVersion>1.1.0-preview</MicrosoftAzureServicesAppAuthenticationPackageVersion>
+    <MicrosoftAzureServicesAppAuthenticationPackageVersion>1.0.0</MicrosoftAzureServicesAppAuthenticationPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>15.6.82</MicrosoftBuildRuntimePackageVersion>

From 9083aadc9b401efe1ffdbc4a1e8b1882d1ab41c1 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 16:19:17 +0000
Subject: [PATCH 02/20] Updating submodule(s)

Configuration => 754348c6cadf6739cef7be4f73c5cf66ee6a91d1
EntityFrameworkCore => d0a45318d89ff2689f732bdb84eb4aa77d0d8ff4

[auto-updated: submodules]
---
 modules/Configuration       | 2 +-
 modules/EntityFrameworkCore | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Configuration b/modules/Configuration
index 5a08707296..754348c6ca 160000
--- a/modules/Configuration
+++ b/modules/Configuration
@@ -1 +1 @@
-Subproject commit 5a087072966abb784bf62d5c81722a6172f9806f
+Subproject commit 754348c6cadf6739cef7be4f73c5cf66ee6a91d1
diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index 92c6a46355..d0a45318d8 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit 92c6a4635580bd6a0c094ef2e699489405fd4e78
+Subproject commit d0a45318d89ff2689f732bdb84eb4aa77d0d8ff4

From bc494ab8e3860e8c05541ec36177c0e614e87aed Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 16:19:26 +0000
Subject: [PATCH 03/20] Updating BuildTools from 2.1.0-rc1-15775 to
 2.1.0-rtm-15776

[auto-updated: buildtools]
---
 korebuild-lock.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index b3ae442d9c..1f132a740f 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-rc1-15775
-commithash:f967cebaec4c8f46d7cb3434bc9bc1a4a59b4095
+version:2.1.0-rtm-15776
+commithash:2a0c826e10e15decc8878a6b9b9f31543712ba6f

From d9c9f944929dc63aaab2c324494c45203cb46bed Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Tue, 1 May 2018 10:34:33 -0700
Subject: [PATCH 04/20] React to SDK renaming to linux-musl-x64

Backport dd1934771fab67f8e2c3e965a821f8b94f472008
---
 build/docker/alpine.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile
index bbe9f714dc..4dcc47505c 100644
--- a/build/docker/alpine.Dockerfile
+++ b/build/docker/alpine.Dockerfile
@@ -33,6 +33,6 @@ ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1
 COPY global.json /tmp/global.json
 RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \
     && echo "Installing SDK ${DOTNET_SDK_VERSION}" \
-    && wget -q --tries 10 -O /tmp/dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-alpine.3.6-x64.tar.gz \
+    && wget -q --tries 10 -O /tmp/dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-x64.tar.gz \
     && mkdir -p "$HOME/.dotnet" \
     && tar xzf /tmp/dotnet.tar.gz -C "$HOME/.dotnet"

From 596047b8c44115eff2dc34a1dcaaeeba987473eb Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 10:52:29 -0700
Subject: [PATCH 05/20] Updating submodule(s)

Scaffolding => 45b49523f288123bc8abb9b34fbe6baf5dbb7312

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

diff --git a/modules/Scaffolding b/modules/Scaffolding
index c39559688f..45b49523f2 160000
--- a/modules/Scaffolding
+++ b/modules/Scaffolding
@@ -1 +1 @@
-Subproject commit c39559688fd78b6234c9ec5bcaa31cb3a845ca9c
+Subproject commit 45b49523f288123bc8abb9b34fbe6baf5dbb7312

From fc296eddd33e2b66d2296c7d7a73bbc33f656dd6 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 12:47:08 -0700
Subject: [PATCH 06/20] Updating submodule(s)

Identity => a89dc30d43c35e6865d19d183037f8ecac1c1226
Scaffolding => e44124cd5295a58698154b1eaf030274962f9743

[auto-updated: submodules]
---
 modules/Identity    | 2 +-
 modules/Scaffolding | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Identity b/modules/Identity
index 5cf691e35b..a89dc30d43 160000
--- a/modules/Identity
+++ b/modules/Identity
@@ -1 +1 @@
-Subproject commit 5cf691e35bc56a847700b867b2034840bb6292c9
+Subproject commit a89dc30d43c35e6865d19d183037f8ecac1c1226
diff --git a/modules/Scaffolding b/modules/Scaffolding
index 45b49523f2..e44124cd52 160000
--- a/modules/Scaffolding
+++ b/modules/Scaffolding
@@ -1 +1 @@
-Subproject commit 45b49523f288123bc8abb9b34fbe6baf5dbb7312
+Subproject commit e44124cd5295a58698154b1eaf030274962f9743

From 6a4319bebae656efe859a0f857734e90678ea5c2 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 13:56:13 -0700
Subject: [PATCH 07/20] Updating submodule(s)

Hosting => 1717b97444ca5beccb5742ac9fb3fd76fbc19d76
Mvc => 19c41c0494952eb85fa534b188ea4544afe52420
Templating => 601f41026ad636a3f5c21cfd55a02a5ecf119fb1

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

diff --git a/modules/Hosting b/modules/Hosting
index 9e36855d2f..1717b97444 160000
--- a/modules/Hosting
+++ b/modules/Hosting
@@ -1 +1 @@
-Subproject commit 9e36855d2f7534ddfacf629db12944e48570519e
+Subproject commit 1717b97444ca5beccb5742ac9fb3fd76fbc19d76
diff --git a/modules/Mvc b/modules/Mvc
index ec80c5f8b8..19c41c0494 160000
--- a/modules/Mvc
+++ b/modules/Mvc
@@ -1 +1 @@
-Subproject commit ec80c5f8b8fd6e200b8b9e7fc6633f2e0b5ad21f
+Subproject commit 19c41c0494952eb85fa534b188ea4544afe52420
diff --git a/modules/Templating b/modules/Templating
index 06d7842f0e..601f41026a 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit 06d7842f0ec7f499d59f786c30726ee398e9ade6
+Subproject commit 601f41026ad636a3f5c21cfd55a02a5ecf119fb1

From 2340cd5e597b317a1a997fbf0284903de6213b8b Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Tue, 1 May 2018 14:31:21 -0700
Subject: [PATCH 08/20] Mark all dotnet-* packages as 'ship' (#1131)

---
 build/artifacts.props | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/artifacts.props b/build/artifacts.props
index acbc346920..a854614c51 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -21,11 +21,11 @@
 
   <ItemGroup>
     <PackageArtifact Include="dotnet-aspnet-codegenerator" Category="ship" />
-    <PackageArtifact Include="dotnet-dev-certs" Category="shipoob" />
-    <PackageArtifact Include="dotnet-ef" Category="shipoob" />
-    <PackageArtifact Include="dotnet-sql-cache" Category="shipoob" />
-    <PackageArtifact Include="dotnet-user-secrets" Category="shipoob" />
-    <PackageArtifact Include="dotnet-watch" Category="shipoob" />
+    <PackageArtifact Include="dotnet-dev-certs" Category="ship" />
+    <PackageArtifact Include="dotnet-ef" Category="ship" />
+    <PackageArtifact Include="dotnet-sql-cache" Category="ship" />
+    <PackageArtifact Include="dotnet-user-secrets" Category="ship" />
+    <PackageArtifact Include="dotnet-watch" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" LZMA="true" />

From a5dcbcfdac517cc441776dc3d2be3d04d97113a7 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 15:10:45 -0700
Subject: [PATCH 09/20] Updating submodule(s)

Hosting => 2c1376c95ff46b0870d323ee5c5b064af263062e
Mvc => 35f7d3f09c870165dd8b50c6f81a5e0330a6ad75
ServerTests => 708b2ded7640d4b2f54f306d5045299e1bb036f8

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

diff --git a/modules/Hosting b/modules/Hosting
index 1717b97444..2c1376c95f 160000
--- a/modules/Hosting
+++ b/modules/Hosting
@@ -1 +1 @@
-Subproject commit 1717b97444ca5beccb5742ac9fb3fd76fbc19d76
+Subproject commit 2c1376c95ff46b0870d323ee5c5b064af263062e
diff --git a/modules/Mvc b/modules/Mvc
index 19c41c0494..35f7d3f09c 160000
--- a/modules/Mvc
+++ b/modules/Mvc
@@ -1 +1 @@
-Subproject commit 19c41c0494952eb85fa534b188ea4544afe52420
+Subproject commit 35f7d3f09c870165dd8b50c6f81a5e0330a6ad75
diff --git a/modules/ServerTests b/modules/ServerTests
index 60b448449d..708b2ded76 160000
--- a/modules/ServerTests
+++ b/modules/ServerTests
@@ -1 +1 @@
-Subproject commit 60b448449db6d5b37d46240f8e3cdebe5871983c
+Subproject commit 708b2ded7640d4b2f54f306d5045299e1bb036f8

From 55a4704f8120ad8abf8837e2c72b8a47461f5356 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 16:48:16 -0700
Subject: [PATCH 10/20] Updating submodule(s)

SignalR => ae329edd2af6ff1edb11d8ba7f8c54a4904be41d
Templating => e9fbf4e5927648d2cda28f4839776128ec8e2511

[auto-updated: submodules]
---
 modules/SignalR    | 2 +-
 modules/Templating | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/SignalR b/modules/SignalR
index 683adec4a0..ae329edd2a 160000
--- a/modules/SignalR
+++ b/modules/SignalR
@@ -1 +1 @@
-Subproject commit 683adec4a075495d3f8504ebcd7773d613261159
+Subproject commit ae329edd2af6ff1edb11d8ba7f8c54a4904be41d
diff --git a/modules/Templating b/modules/Templating
index 601f41026a..e9fbf4e592 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit 601f41026ad636a3f5c21cfd55a02a5ecf119fb1
+Subproject commit e9fbf4e5927648d2cda28f4839776128ec8e2511

From 7f10bb405830871a7dce24e05455b3d23b900bb0 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 16:48:18 -0700
Subject: [PATCH 11/20] Updating BuildTools from 2.1.0-rtm-15776 to
 2.1.0-rtm-15779

[auto-updated: buildtools]
---
 korebuild-lock.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 1f132a740f..e0f94620cb 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-rtm-15776
-commithash:2a0c826e10e15decc8878a6b9b9f31543712ba6f
+version:2.1.0-rtm-15779
+commithash:383f44bf9fadab8f23fce5870044d27e03fbed10

From c4e8bc1127080a9cd6fd55efdcfa8edfa6df815b Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 17:21:34 -0700
Subject: [PATCH 12/20] Updating submodule(s)

Razor => a94323499bd0bdb048495035b4bab349ed816123

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

diff --git a/modules/Razor b/modules/Razor
index 4c8c86b629..a94323499b 160000
--- a/modules/Razor
+++ b/modules/Razor
@@ -1 +1 @@
-Subproject commit 4c8c86b629bdab3e044ba8215720e44d69eb0204
+Subproject commit a94323499bd0bdb048495035b4bab349ed816123

From 9d31d63d317cc04fa9222ca055e24b455b22e43c Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 17:21:35 -0700
Subject: [PATCH 13/20] Updating BuildTools from 2.1.0-rtm-15779 to
 2.1.0-rtm-15780

[auto-updated: buildtools]
---
 korebuild-lock.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index e0f94620cb..8789db0db7 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-rtm-15779
-commithash:383f44bf9fadab8f23fce5870044d27e03fbed10
+version:2.1.0-rtm-15780
+commithash:4b54ae92ccebdf2a5aabca9748cc874eeafe5ac9

From a2ffe678061faa60bd4feeb297f552a0ff6747ac Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 17:57:11 -0700
Subject: [PATCH 14/20] Updating submodule(s)

SignalR => 3e906fb64a9b8cc328895749f48bf302f114a85a

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

diff --git a/modules/SignalR b/modules/SignalR
index ae329edd2a..3e906fb64a 160000
--- a/modules/SignalR
+++ b/modules/SignalR
@@ -1 +1 @@
-Subproject commit ae329edd2af6ff1edb11d8ba7f8c54a4904be41d
+Subproject commit 3e906fb64a9b8cc328895749f48bf302f114a85a

From 678f4f599347ad04268f2e75c75295e8c6119ba5 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 1 May 2018 21:53:32 -0700
Subject: [PATCH 15/20] Updating submodule(s)

SignalR => 41c8dcf44972363289add219ae7b2fa7575c38e9

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

diff --git a/modules/SignalR b/modules/SignalR
index 3e906fb64a..41c8dcf449 160000
--- a/modules/SignalR
+++ b/modules/SignalR
@@ -1 +1 @@
-Subproject commit 3e906fb64a9b8cc328895749f48bf302f114a85a
+Subproject commit 41c8dcf44972363289add219ae7b2fa7575c38e9

From d6f15759fd63bf73fcf6b14ae9288b31a3c4776d Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 2 May 2018 08:49:03 -0700
Subject: [PATCH 16/20] Add property to allow the SDK to disable shared
 framework trimming (#1130)

The MicrosoftNETPlatformLibrary property instructs the .NET Core SDK to treat a particular package as the shared framework platform. This affects how the SDK will trim references and publish output, determines how the runtimeconfig files are generated, and may affect how optimizations are preformed by other tools. In some installations of .NET Core, the ASP.NET Core shared framework is not available. This change adds properties to let the SDK determine on which platforms ASP.NET Core is enabled.
---
 .../Microsoft.AspNetCore.All.props            | 20 ++++++++++++++++---
 .../Microsoft.AspNetCore.All.targets          | 11 ++++++++++
 .../Microsoft.AspNetCore.App.props            | 14 ++++++++++---
 .../Microsoft.AspNetCore.App.targets          | 11 ++++++++++
 4 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.props b/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.props
index 3afa05c31b..0295c8a39f 100644
--- a/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.props
+++ b/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.props
@@ -1,5 +1,19 @@
 <Project>
-  <PropertyGroup>
-    <MicrosoftNETPlatformLibrary>Microsoft.AspNetCore.All</MicrosoftNETPlatformLibrary>
+  <!--
+    The _AspNetCoreAllSharedFxIsEnabled property is meant for internal use only. When set to 'false',
+    the default value of MicrosoftNETPlatformLibrary will be Microsoft.NETCore.App. It was added to support
+    a better SDK exprience on platforms where the ASP.NET Core shared framework is not avaiable.
+    In these cases, ASP.NET Core can still be as if it were just a set of NuGet packages.
+  -->
+  <PropertyGroup Condition=" '$(_AspNetCoreAllSharedFxIsEnabled)' == '' ">
+    <!--
+      Disable the base runtime, Microsoft.AspNetCore.App, when this package is imported
+    -->
+    <_AspNetCoreAppSharedFxIsEnabled>false</_AspNetCoreAppSharedFxIsEnabled>
+
+    <!--
+      NB: this is _AspNetCore*All*SharedFxIsEnabled, not _AspNetCore*App*SharedFxIsEnabled
+    -->
+    <_AspNetCoreAllSharedFxIsEnabled>true</_AspNetCoreAllSharedFxIsEnabled>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets b/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets
index abc3cf0fbb..69c476529b 100644
--- a/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets
+++ b/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets
@@ -1,4 +1,15 @@
 <Project>
+  <!--
+    This property instructs the .NET Core SDK to treat this package as the shared framework platform.
+    This affects how the SDK will trim references and publish output, determines how the runtimeconfig
+    files are generated, and may affect how optimizations are preformed by other tools.
+
+    NB: this is _AspNetCore*All*SharedFxIsEnabled, not _AspNetCore*App*SharedFxIsEnabled
+  -->
+  <PropertyGroup Condition=" '$(_AspNetCoreAllSharedFxIsEnabled)' == 'true' ">
+    <MicrosoftNETPlatformLibrary>Microsoft.AspNetCore.All</MicrosoftNETPlatformLibrary>
+  </PropertyGroup>
+
   <Target Name="EnsureTFMCompatibility" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
     <Error
       Text="This version of Microsoft.AspNetCore.All is only compatible with the netcoreapp2.1 target framework. Please target netcoreapp2.1 or choose a version of Microsoft.AspNetCore.All compatible with $(TargetFramework)."
diff --git a/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props b/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props
index 3f8e30b23b..b45f971fa7 100644
--- a/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props
+++ b/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props
@@ -1,6 +1,14 @@
 <Project>
+  <!--
+    The _AspNetCoreAppSharedFxIsEnabled property is meant for internal use only. When set to 'false',
+    the default value of MicrosoftNETPlatformLibrary will be used. It was added to support
+    a better SDK exprience on platforms where the ASP.NET Core shared framework is not avaiable.
+    In these cases, ASP.NET Core can still be as if it were just a set of NuGet packages.
+
+    NB: this is _AspNetCore*App*SharedFxIsEnabled, not _AspNetCore*All*SharedFxIsEnabled
+  -->
   <PropertyGroup>
-    <MicrosoftNETPlatformLibrary>Microsoft.AspNetCore.App</MicrosoftNETPlatformLibrary>
+    <_AspNetCoreAppSharedFxIsEnabled Condition=" '$(_AspNetCoreAppSharedFxIsEnabled)' == '' ">true</_AspNetCoreAppSharedFxIsEnabled>
   </PropertyGroup>
 
   <!--
@@ -9,5 +17,5 @@
   <ItemGroup>
     <ProjectCapability Include="AspNetInProcessHosting" />
   </ItemGroup>
-  
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.targets b/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.targets
index 22fd71eb25..35bce0f129 100644
--- a/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.targets
+++ b/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.targets
@@ -1,4 +1,15 @@
 <Project>
+  <!--
+    This property instructs the .NET Core SDK to treat this package as the shared framework platform.
+    This affects how the SDK will trim references and publish output, determines how the runtimeconfig
+    files are generated, and may affect how optimizations are preformed by other tools.
+
+    NB: this is _AspNetCore*App*SharedFxIsEnabled, not _AspNetCore*All*SharedFxIsEnabled
+  -->
+  <PropertyGroup Condition=" '$(_AspNetCoreAppSharedFxIsEnabled)' == 'true' ">
+    <MicrosoftNETPlatformLibrary>Microsoft.AspNetCore.App</MicrosoftNETPlatformLibrary>
+  </PropertyGroup>
+
   <Target Name="EnsureTFMCompatibility" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
     <Error
       Text="This version of Microsoft.AspNetCore.App is only compatible with the netcoreapp2.1 target framework. Please target netcoreapp2.1 or choose a version of Microsoft.AspNetCore.App compatible with $(TargetFramework)."

From d67715c8df62995ea35d0676d197c88a9310d09f Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Wed, 2 May 2018 09:09:06 -0700
Subject: [PATCH 17/20] Updating submodule(s)

Microsoft.Data.Sqlite => fa53db46b0fb2198ce1d7b3e97e2b10447364431

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

diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite
index 96aac369f7..fa53db46b0 160000
--- a/modules/Microsoft.Data.Sqlite
+++ b/modules/Microsoft.Data.Sqlite
@@ -1 +1 @@
-Subproject commit 96aac369f7b63fce5ee9576f5355d45ede042977
+Subproject commit fa53db46b0fb2198ce1d7b3e97e2b10447364431

From 4349862fae90661971e72ef3204e1926eb6d5f82 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Wed, 2 May 2018 09:44:40 -0700
Subject: [PATCH 18/20] Updating submodule(s)

KestrelHttpServer => 74d19cd4e49897da5251cdaec3bdc946167be160

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

diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer
index 0b44bf52f5..74d19cd4e4 160000
--- a/modules/KestrelHttpServer
+++ b/modules/KestrelHttpServer
@@ -1 +1 @@
-Subproject commit 0b44bf52f543d98d19c74fee4ed7a774151a66cc
+Subproject commit 74d19cd4e49897da5251cdaec3bdc946167be160

From 1c59b85c9a1ec2a4a6db14967dcc683781a92d84 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 2 May 2018 10:37:24 -0700
Subject: [PATCH 19/20] Run PreinstallBundledPackages

---
 build/repo.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/repo.targets b/build/repo.targets
index a239e3f944..4d8f5246f8 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -15,7 +15,7 @@
     <GeneratedPackageVersionPropsPath>$(IntermediateDir)dependencies.g.props</GeneratedPackageVersionPropsPath>
     <GeneratedRestoreSourcesPropsPath>$(IntermediateDir)sources.g.props</GeneratedRestoreSourcesPropsPath>
 
-    <PrepareDependsOn>SetTeamCityBuildNumberToVersion;$(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths</PrepareDependsOn>
+    <PrepareDependsOn>PreinstallBundledPackages;SetTeamCityBuildNumberToVersion;$(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths</PrepareDependsOn>
     <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
     <RestoreDependsOn>$(RestoreDependsOn);InstallDotNet</RestoreDependsOn>
     <CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn>

From 5ad8cec80bb80a71f38fc11938c5c0c4fafcdf1a Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Wed, 2 May 2018 17:51:00 +0000
Subject: [PATCH 20/20] Updating submodule(s)

Configuration => 3e2d00cdf5602f8afcde53558654dee80c7083fc
DotNetTools => e0e9eb0b3609807912b1b885c67a5d0047800686
KestrelHttpServer => b85ab0a7d2d272591b45ac4cba01407f975ef8b2

[auto-updated: submodules]
---
 modules/Configuration     | 2 +-
 modules/DotNetTools       | 2 +-
 modules/KestrelHttpServer | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Configuration b/modules/Configuration
index 754348c6ca..3e2d00cdf5 160000
--- a/modules/Configuration
+++ b/modules/Configuration
@@ -1 +1 @@
-Subproject commit 754348c6cadf6739cef7be4f73c5cf66ee6a91d1
+Subproject commit 3e2d00cdf5602f8afcde53558654dee80c7083fc
diff --git a/modules/DotNetTools b/modules/DotNetTools
index 174ca79d25..e0e9eb0b36 160000
--- a/modules/DotNetTools
+++ b/modules/DotNetTools
@@ -1 +1 @@
-Subproject commit 174ca79d25b1a6b4b4dd71b5f1914449b1250848
+Subproject commit e0e9eb0b3609807912b1b885c67a5d0047800686
diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer
index 74d19cd4e4..b85ab0a7d2 160000
--- a/modules/KestrelHttpServer
+++ b/modules/KestrelHttpServer
@@ -1 +1 @@
-Subproject commit 74d19cd4e49897da5251cdaec3bdc946167be160
+Subproject commit b85ab0a7d2d272591b45ac4cba01407f975ef8b2