Merge branch 'release/2.1' into dev

2018-05-02 12:22:38 -07:00 · 2018-05-02 12:22:38 -07:00 · 4136039271
parent 020e91faa1 5ad8cec80b
commit 4136039271
8 changed files with 59 additions and 15 deletions
--- 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" />
--- 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>
--- 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>
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@ -1,2 +1,2 @@
-version:2.2.0-preview1-17042
-commithash:edf0705d014293c260de763543784330514db9a3
+version:2.2.0-preview1-17044
+commithash:d9eb8a53eca84f61a7b0845c99fc43a3ec51e353
--- 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>
+</Project>
--- 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)."
--- 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>
+
+</Project>
--- 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)."