From 922512a9fb5ca16c73b75c16c946d6ec92dd81f9 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 18 Jan 2019 13:38:24 -0800
Subject: [PATCH] Convert the artifacts folder layout to match Arcade (#6850)
Changes:
* IsProductPackage => IsShippingPackage
* artifacts/$config/packages => artifacts/packages/$config
* packages/product => packages/Shipping
* packages/internal => packages/NonShipping
* Renamed MSBuild properties used for output folders
* Update build tools to use 2 spaces in global.json
---
Directory.Build.props | 8 ++++----
Directory.Build.targets | 6 +++---
build.ps1 | 4 ++--
build.sh | 3 +++
build/AzureIntegration.targets | 4 ++--
build/SharedFx.targets | 10 +++++-----
build/artifacts.props | 2 +-
build/publish/Publish.csproj | 12 ++++++------
build/repo.props | 6 +++---
build/repo.targets | 8 ++++----
docs/Artifacts.md | 11 ++++++-----
docs/BuildFromSource.md | 4 ++--
docs/ProjectProperties.md | 2 +-
eng/Versions.props | 2 +-
global.json | 12 ++++++------
korebuild-lock.txt | 4 ++--
...osoft.AspNetCore.Authentication.AzureAD.UI.csproj | 2 +-
...ft.AspNetCore.Authentication.AzureADB2C.UI.csproj | 2 +-
...AspNetCore.AzureAppServices.HostingStartup.csproj | 2 +-
...oft.AspNetCore.AzureAppServicesIntegration.csproj | 2 +-
.../Microsoft.AspNetCore.Components.Analyzers.csproj | 2 +-
.../Blazor/src/Microsoft.AspNetCore.Blazor.csproj | 2 +-
.../Microsoft.VisualStudio.BlazorExtension.csproj | 2 +-
.../src/Microsoft.AspNetCore.Blazor.Build.csproj | 2 +-
.../Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj | 2 +-
.../src/Microsoft.AspNetCore.Blazor.Server.csproj | 2 +-
.../src/Microsoft.AspNetCore.Blazor.Templates.csproj | 2 +-
.../Microsoft.AspNetCore.Components.Browser.csproj | 2 +-
.../src/Microsoft.AspNetCore.Components.Build.csproj | 2 +-
.../src/Microsoft.AspNetCore.Components.csproj | 2 +-
.../Microsoft.AspNetCore.Components.Server.csproj | 2 +-
...ft.AspNetCore.DataProtection.AzureKeyVault.csproj | 2 +-
...oft.AspNetCore.DataProtection.AzureStorage.csproj | 2 +-
...NetCore.DataProtection.EntityFrameworkCore.csproj | 2 +-
...pNetCore.DataProtection.StackExchangeRedis.csproj | 2 +-
.../src/Microsoft.AspNetCore.JsonPatch.csproj | 2 +-
src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj | 2 +-
src/Framework/src/Microsoft.AspNetCore.App.shfxproj | 2 +-
.../src/Microsoft.AspNetCore.TestHost.csproj | 2 +-
...crosoft.AspNetCore.Hosting.WindowsServices.csproj | 1 +
.../src/Microsoft.AspNetCore.Http.Features.csproj | 2 +-
src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj | 2 +-
...ft.AspNetCore.Identity.EntityFrameworkCore.csproj | 2 +-
...ft.AspNetCore.Identity.Specification.Tests.csproj | 2 +-
.../UI/src/Microsoft.AspNetCore.Identity.UI.csproj | 2 +-
...AspNetCore.Diagnostics.EntityFrameworkCore.csproj | 2 +-
...agnostics.HealthChecks.EntityFrameworkCore.csproj | 2 +-
.../Microsoft.AspNetCore.MiddlewareAnalysis.csproj | 2 +-
.../src/Microsoft.AspNetCore.NodeServices.csproj | 2 +-
...icrosoft.AspNetCore.SpaServices.Extensions.csproj | 1 +
.../src/Microsoft.AspNetCore.SpaServices.csproj | 2 +-
.../Microsoft.AspNetCore.Mvc.Analyzers.csproj | 2 +-
.../Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj | 2 +-
.../Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj | 2 +-
.../Microsoft.AspNetCore.Mvc.Testing.csproj | 2 +-
...Microsoft.Extensions.ApiDescription.Design.csproj | 2 +-
...crosoft.AspNetCore.Authentication.Facebook.csproj | 2 +-
...Microsoft.AspNetCore.Authentication.Google.csproj | 2 +-
...rosoft.AspNetCore.Authentication.JwtBearer.csproj | 2 +-
...AspNetCore.Authentication.MicrosoftAccount.csproj | 2 +-
...ft.AspNetCore.Authentication.OpenIdConnect.csproj | 2 +-
...icrosoft.AspNetCore.Authentication.Twitter.csproj | 2 +-
...oft.AspNetCore.Authentication.WsFederation.csproj | 2 +-
...rosoft.AspNetCore.Connections.Abstractions.csproj | 2 +-
....AspNetCore.Server.Kestrel.Transport.Libuv.csproj | 2 +-
src/SignalR/Directory.Build.targets | 11 -----------
.../Microsoft.AspNetCore.SignalR.Client.Core.csproj | 2 +-
.../src/Microsoft.AspNetCore.SignalR.Client.csproj | 2 +-
...crosoft.AspNetCore.Http.Connections.Client.csproj | 2 +-
src/SignalR/clients/java/signalr/signalr.javaproj | 4 ++--
.../signalr-protocol-msgpack.npmproj | 2 +-
src/SignalR/clients/ts/signalr/signalr.npmproj | 2 +-
...crosoft.AspNetCore.Http.Connections.Common.csproj | 1 +
...t.AspNetCore.SignalR.Protocols.MessagePack.csproj | 2 +-
...spNetCore.SignalR.Protocols.NewtonsoftJson.csproj | 2 +-
.../src/Microsoft.AspNetCore.SignalR.Common.csproj | 2 +-
...oft.AspNetCore.SignalR.Specification.Tests.csproj | 2 +-
...soft.AspNetCore.SignalR.StackExchangeRedis.csproj | 2 +-
...icrosoft.AspNetCore.Runtime.SiteExtension.pkgproj | 2 +-
src/Templating/Directory.Build.props | 7 +++----
src/Templating/Directory.Build.targets | 6 +++---
.../Microsoft.DotNet.Web.Client.ItemTemplates.csproj | 2 +-
.../Microsoft.DotNet.Web.ItemTemplates.csproj | 2 +-
.../Microsoft.DotNet.Web.ProjectTemplates.csproj | 2 +-
.../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj | 2 +-
85 files changed, 124 insertions(+), 129 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index a213e4ada33..af50252ba6a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -81,10 +81,10 @@
<ArtifactsDir>$(MSBuildThisFileDirectory)artifacts\</ArtifactsDir>
<ArtifactsObjDir>$(ArtifactsDir)obj\</ArtifactsObjDir>
<ArtifactsConfigurationDir>$(ArtifactsDir)$(Configuration)\</ArtifactsConfigurationDir>
- <BasePackageOutputPath>$(ArtifactsConfigurationDir)packages\</BasePackageOutputPath>
- <ProductPackageOutputPath>$(BasePackageOutputPath)product\</ProductPackageOutputPath>
- <InternalPackageOutputPath>$(BasePackageOutputPath)internal\</InternalPackageOutputPath>
- <InstallersOutputPath>$(ArtifactsConfigurationDir)installers\</InstallersOutputPath>
+ <ArtifactsPackagesDir>$(ArtifactsDir)packages\$(Configuration)\</ArtifactsPackagesDir>
+ <ArtifactsShippingPackagesDir>$(ArtifactsPackagesDir)Shipping\</ArtifactsShippingPackagesDir>
+ <ArtifactsNonShippingPackagesDir>$(ArtifactsPackagesDir)NonShipping\</ArtifactsNonShippingPackagesDir>
+ <InstallersOutputPath>$(ArtifactsDir)installers\$(Configuration)\</InstallersOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(OutputInRepoRoot)' == 'true' ">
diff --git a/Directory.Build.targets b/Directory.Build.targets
index de6e19d8e21..971f2a16a9c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -6,10 +6,10 @@
By default, all projects which produce packages are not intended to ship to NuGet.org as a product package.
Packages which are intended to ship to NuGet.org must opt-in by setting this to true in the project file.
-->
- <IsProductPackage Condition=" '$(IsProductPackage)' == '' ">false</IsProductPackage>
+ <IsShippingPackage Condition=" '$(IsShippingPackage)' == '' ">false</IsShippingPackage>
- <PackageOutputPath Condition=" '$(IsProductPackage)' == 'true' ">$(ProductPackageOutputPath)</PackageOutputPath>
- <PackageOutputPath Condition=" '$(IsProductPackage)' != 'true' ">$(InternalPackageOutputPath)</PackageOutputPath>
+ <PackageOutputPath Condition=" '$(IsShippingPackage)' == 'true' ">$(ArtifactsShippingPackagesDir)</PackageOutputPath>
+ <PackageOutputPath Condition=" '$(IsShippingPackage)' != 'true' ">$(ArtifactsNonShippingPackagesDir)</PackageOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
diff --git a/build.ps1 b/build.ps1
index 2d08643422d..2210b5bd899 100644
--- a/build.ps1
+++ b/build.ps1
@@ -213,8 +213,8 @@ if (Test-Path $ConfigFile) {
try {
$config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json
if ($config) {
- if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel }
- if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource}
+ if (Get-Member -Name 'channel' -InputObject $config) { [string] $Channel = $config.channel }
+ if (Get-Member -Name 'toolsSource' -InputObject $config) { [string] $ToolsSource = $config.toolsSource}
}
} catch {
Write-Warning "$ConfigFile could not be read. Its settings will be ignored."
diff --git a/build.sh b/build.sh
index 3f99fddf970..07719b65523 100755
--- a/build.sh
+++ b/build.sh
@@ -277,6 +277,9 @@ msbuild_args[${#msbuild_args[*]}]="-p:_RunBuild=$run_build"
msbuild_args[${#msbuild_args[*]}]="-p:_RunPack=$run_pack"
msbuild_args[${#msbuild_args[*]}]="-p:_RunTests=$run_tests"
+# Disable downloading ref assemblies as a tarball. Use netfx refs from the Microsoft.NETFramework.ReferenceAssemblies NuGet package instead.
+KOREBUILD_SKIP_INSTALL_NETFX=1
+
set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci"
# This incantation avoids unbound variable issues if msbuild_args is empty
diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets
index 3d8a7af504c..67858c4d07f 100644
--- a/build/AzureIntegration.targets
+++ b/build/AzureIntegration.targets
@@ -25,7 +25,7 @@
<AzureIntegrationArtifacts Include="$(AzureIntegrationProjectRoot)artifacts\build\*" />
</ItemGroup>
- <Copy SourceFiles="@(AzureIntegrationArtifacts)" DestinationFolder="$(ProductPackageOutputPath)" />
+ <Copy SourceFiles="@(AzureIntegrationArtifacts)" DestinationFolder="$(ArtifactsShippingPackagesDir)" />
</Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index eaadd1e7feb..5a2de7b8bcd 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -28,11 +28,11 @@
<ItemGroup>
<FilesToSign Include="$(InstallersOutputPath)aspnetcore-runtime-$(PackageVersion)-$(SharedFxRid).zip" Certificate="None" />
<FilesToSign Include="$(InstallersOutputPath)aspnetcore-runtime-internal-$(PackageVersion)-$(SharedFxRid).zip" Certificate="None" />
- <FilesToSign Include="$(ProductPackageOutputPath)Microsoft.AspNetCore.App.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
- <FilesToSign Include="$(ProductPackageOutputPath)runtime.$(SharedFxRid).Microsoft.AspNetCore.App.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
- <FilesToSign Include="$(ProductPackageOutputPath)runtime.$(SharedFxRid).Microsoft.AspNetCore.App.$(PackageVersion).symbols.nupkg" Certificate="$(PackageSigningCertName)" />
- <FilesToSign Include="$(ProductPackageOutputPath)AspNetCoreRuntime.3.0.$(SharedFxArchitecture).$(PackageVersion).nupkg" Condition=" '$(BuildSiteExtensions)' == 'true' " Certificate="$(PackageSigningCertName)" />
- <FilesToSign Include="$(InternalPackageOutputPath)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(SharedFxArchitecture).$(PackageVersion).nupkg" Condition=" '$(BuildSiteExtensions)' == 'true' " Certificate="$(PackageSigningCertName)" />
+ <FilesToSign Include="$(ArtifactsShippingPackagesDir)Microsoft.AspNetCore.App.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
+ <FilesToSign Include="$(ArtifactsShippingPackagesDir)runtime.$(SharedFxRid).Microsoft.AspNetCore.App.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
+ <FilesToSign Include="$(ArtifactsShippingPackagesDir)runtime.$(SharedFxRid).Microsoft.AspNetCore.App.$(PackageVersion).symbols.nupkg" Certificate="$(PackageSigningCertName)" />
+ <FilesToSign Include="$(ArtifactsShippingPackagesDir)AspNetCoreRuntime.3.0.$(SharedFxArchitecture).$(PackageVersion).nupkg" Condition=" '$(BuildSiteExtensions)' == 'true' " Certificate="$(PackageSigningCertName)" />
+ <FilesToSign Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(SharedFxArchitecture).$(PackageVersion).nupkg" Condition=" '$(BuildSiteExtensions)' == 'true' " Certificate="$(PackageSigningCertName)" />
</ItemGroup>
<!-- These files should already be signed by the .NET Core team. They have to be listed again here because we recreate a redistributable which includes the Microsoft.NETCore.App runtime. -->
diff --git a/build/artifacts.props b/build/artifacts.props
index 4973a3fb833..c8e9f73feb6 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -57,7 +57,7 @@ This can be done once #4246 is complete, and done in conjunction with converting
<PackageArtifact Include="Microsoft.AspNetCore.MiddlewareAnalysis" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Analyzers" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Api.Analyzers" Category="ship" />
- <PackageArtifact Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Category="ship" />
+ <PackageArtifact Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Testing" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Owin" Category="ship" />
diff --git a/build/publish/Publish.csproj b/build/publish/Publish.csproj
index a136fe7910a..7ea57a073a4 100644
--- a/build/publish/Publish.csproj
+++ b/build/publish/Publish.csproj
@@ -50,12 +50,12 @@
<_FilesToPublish Include="$(InstallersOutputPath)*" Exclude="@(_FilesToPublish)" />
<!-- Java packages -->
- <_FilesToPublish Include="$(ProductPackageOutputPath)*.jar;$(ProductPackageOutputPath)*.pom">
+ <_FilesToPublish Include="$(ArtifactsShippingPackagesDir)*.jar;$(ArtifactsShippingPackagesDir)*.pom">
<BlobBasePath>aspnetcore/jar/$(PackageVersion)/</BlobBasePath>
</_FilesToPublish>
<!-- NPM packages -->
- <NpmPackageToPublish Include="$(ProductPackageOutputPath)*.tgz">
+ <NpmPackageToPublish Include="$(ArtifactsShippingPackagesDir)*.tgz">
<BlobBasePath>aspnetcore/npm/$(PackageVersion)/</BlobBasePath>
</NpmPackageToPublish>
<_FilesToPublish Include="@(NpmPackageToPublish)" />
@@ -70,8 +70,8 @@
</FilesToPublish>
<_FilesToPublish Remove="@(_FilesToPublish)" />
- <PackageToPublish Include="$(ProductPackageOutputPath)*.symbols.nupkg" IsSymbolsPackage="true" />
- <PackageToPublish Include="$(ProductPackageOutputPath)*.nupkg" Exclude="@(PackageToPublish)" />
+ <PackageToPublish Include="$(ArtifactsShippingPackagesDir)*.symbols.nupkg" IsSymbolsPackage="true" />
+ <PackageToPublish Include="$(ArtifactsShippingPackagesDir)*.nupkg" Exclude="@(PackageToPublish)" />
</ItemGroup>
<!--
@@ -79,10 +79,10 @@
Publishing these can be disabled.
-->
<ItemGroup Condition=" '$(PublishInternalPackages)' != 'false' ">
- <PackageToPublish Include="$(InternalPackageOutputPath)*.symbols.nupkg" IsSymbolsPackage="true">
+ <PackageToPublish Include="$(ArtifactsNonShippingPackagesDir)*.symbols.nupkg" IsSymbolsPackage="true">
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
</PackageToPublish>
- <PackageToPublish Include="$(InternalPackageOutputPath)*.nupkg" Exclude="@(PackageToPublish)">
+ <PackageToPublish Include="$(ArtifactsNonShippingPackagesDir)*.nupkg" Exclude="@(PackageToPublish)">
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
</PackageToPublish>
</ItemGroup>
diff --git a/build/repo.props b/build/repo.props
index 1288ef04765..7530abe0dfb 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -15,9 +15,9 @@
<SubmoduleRoot>$(RepositoryRoot)src\</SubmoduleRoot>
- <ProductPackageOutputPath>$(ArtifactsDir)$(Configuration)\packages\product\</ProductPackageOutputPath>
- <InternalPackageOutputPath>$(ArtifactsDir)$(Configuration)\packages\internal\</InternalPackageOutputPath>
- <InstallersOutputPath>$(ArtifactsDir)$(Configuration)\installers\</InstallersOutputPath>
+ <ArtifactsShippingPackagesDir>$(ArtifactsDir)\packages\$(Configuration)\Shipping\</ArtifactsShippingPackagesDir>
+ <ArtifactsNonShippingPackagesDir>$(ArtifactsDir)\packages\$(Configuration)\NonShipping\</ArtifactsNonShippingPackagesDir>
+ <InstallersOutputPath>$(ArtifactsDir)installers\$(Configuration)\</InstallersOutputPath>
<SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
diff --git a/build/repo.targets b/build/repo.targets
index 0e3872ef1b4..6d04ebd0403 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -52,7 +52,7 @@
</PropertyGroup>
<Target Name="PrepareOutputPaths">
- <MakeDir Directories="$(ArtifactsDir);$(ProductPackageOutputPath);$(InternalPackageOutputPath)" />
+ <MakeDir Directories="$(ArtifactsDir);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)" />
</Target>
<Target Name="GenerateProjectList" DependsOnTargets="ResolveProjects">
@@ -192,8 +192,8 @@
<_LineupPackages Include="@(ExternalDependency)" />
<_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " />
- <_RestoreSources Include="$(ProductPackageOutputPath)" />
- <_RestoreSources Include="$(InternalPackageOutputPath)" />
+ <_RestoreSources Include="$(ArtifactsShippingPackagesDir)" />
+ <_RestoreSources Include="$(ArtifactsNonShippingPackagesDir)" />
<_RestoreSources Include="$(RestoreSources)" />
</ItemGroup>
@@ -255,7 +255,7 @@
<!-- This is temporary until we can use FrameworkReference to build our own packages. -->
<Target Name="RemoveSharedFrameworkOnlyRefsFromNuspec">
<ItemGroup>
- <_BuildOutput Include="$(ProductPackageOutputPath)%(PackageArtifact.Identity).*.nupkg"
+ <_BuildOutput Include="$(ArtifactsShippingPackagesDir)%(PackageArtifact.Identity).*.nupkg"
Condition=" '%(PackageArtifact.Category)' == 'ship' " />
<SharedFxPackageRefToHide Include="@(SharedFrameworkOnlyPackage)" Exclude="@(ExternalDependency)" />
diff --git a/docs/Artifacts.md b/docs/Artifacts.md
index a9378c4672c..cbb9b556590 100644
--- a/docs/Artifacts.md
+++ b/docs/Artifacts.md
@@ -5,16 +5,17 @@ Building this repo produces build artifacts in the directory structure described
```
artifacts/
- $(Configuration)/
- installers/
+ installers/
+ $(Configuration)/
*.msi = Windows installers
*.deb, *.rpm = Linux installers
*.zip, *.tar.gz = archives versions of installers
- packages/
- product/ = Packages which are intended for use by customers. These, along with installers, represent the 'product'.
+ packages/
+ $(Configuration)/
+ Shipping/ = Packages which are intended for use by customers. These, along with installers, represent the 'product'.
*.nupkg = NuGet packages which ship to nuget.org
*.jar = Java packages which ship to Maven Central and others
*.tgz = NPM packages which ship to npmjs.org
- internal/
+ NonShipping/
*.nupkg = NuGet packages for internal use only. Used to hand off bits to Microsoft partner teams. Not intended for use by customers.
```
diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md
index 624d4ce1858..544aea0497c 100644
--- a/docs/BuildFromSource.md
+++ b/docs/BuildFromSource.md
@@ -171,7 +171,7 @@ SharedFxRID | The runtime identifier of the shared framework.
After building ASP.NET Core from source, you will need to install and use your local version of ASP.NET Core.
See ["Artifacts"](./Artifacts.md) for more explanation of the different folders produced by a build.
-- Run the installers produced in `artifacts/{Debug, Release}/installers/` for your platform.
+- Run the installers produced in `artifacts/installers/{Debug, Release}/` for your platform.
- Add a NuGet.Config to your project directory with the following content:
```xml
@@ -179,7 +179,7 @@ See ["Artifacts"](./Artifacts.md) for more explanation of the different folders
<configuration>
<packageSources>
<clear />
- <add key="MyBuildOfAspNetCore" value="C:\src\aspnet\AspNetCore\artifacts\Debug\packages\product\" />
+ <add key="MyBuildOfAspNetCore" value="C:\src\aspnet\AspNetCore\artifacts\packages\Debug\Shipping\" />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
diff --git a/docs/ProjectProperties.md b/docs/ProjectProperties.md
index 98332931b9e..fe5bba6bafc 100644
--- a/docs/ProjectProperties.md
+++ b/docs/ProjectProperties.md
@@ -5,4 +5,4 @@ In addition to the standard set of MSBuild properties supported by Microsoft.NET
Property name | Meaning
-------------------|--------------------------------------------------------------------------------------------
-IsProductPackage | When set to `true`, the package produced by from project is intended for use by customers. Defaults to `false`, which means the package is intended for internal use only by Microsoft teams.
+IsShippingPackage | When set to `true`, the package produced by from project is intended for use by customers. Defaults to `false`, which means the package is intended for internal use only by Microsoft teams.
diff --git a/eng/Versions.props b/eng/Versions.props
index 493d79730e4..cc62ebb1508 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -110,7 +110,7 @@
</PropertyGroup>
<PropertyGroup Label="Build tool dependencies">
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
- <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190110.4</InternalAspNetCoreSdkPackageVersion>
+ <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190118.1</InternalAspNetCoreSdkPackageVersion>
<MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
</PropertyGroup>
diff --git a/global.json b/global.json
index 93b9880dae2..0b501115de9 100644
--- a/global.json
+++ b/global.json
@@ -1,8 +1,8 @@
{
- "sdk": {
- "version": "3.0.100-preview-009750"
- },
- "msbuild-sdks": {
- "Internal.AspNetCore.Sdk": "3.0.0-build-20190110.4"
- }
+ "sdk": {
+ "version": "3.0.100-preview-009750"
+ },
+ "msbuild-sdks": {
+ "Internal.AspNetCore.Sdk": "3.0.0-build-20190118.1"
+ }
}
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 7800fa1cf70..978d03b843b 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:3.0.0-build-20190110.4
-commithash:356f6ce74815523dfda61e3da6e652ad52f536be
+version:3.0.0-build-20190118.1
+commithash:bddfbe9c6512fd9235665b04f39679ff80371a1b
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
index 4a7df9d5a87..1605940b286 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
@@ -6,7 +6,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework>
<PackageTags>aspnetcore;authentication;AzureAD</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
<_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
index 3c3a584bfd2..485d3a40851 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
@@ -6,7 +6,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework>
<PackageTags>aspnetcore;authentication;AzureADB2C</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
<_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
index ac74adf4d7d..821f07eb687 100644
--- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
+++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
@@ -7,7 +7,7 @@
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;azure;appservices</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
index fbbef613fdf..7cd3dc14537 100644
--- a/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
+++ b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
@@ -7,7 +7,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;azure;appservices</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj
index 86258126718..6f03745885b 100644
--- a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj
+++ b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj
@@ -6,7 +6,7 @@
<NoPackageAnalysis>true</NoPackageAnalysis>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<Description>Roslyn analyzers for ASP.NET Core Components.</Description>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<!-- Manually set to false because other projects should not reference this assembly as a project reference, except for the analyzer's unit tests. -->
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
</PropertyGroup>
diff --git a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj
index ce6abf27ba6..97fba4e00ae 100644
--- a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj
+++ b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Build client-side single-page applications (SPAs) with Razor Components running under WebAssembly.</Description>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj
index 29d89dbeea8..d2085b87a39 100644
--- a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj
+++ b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj
@@ -73,7 +73,7 @@
</PropertyGroup>
<Target Name="PreCreateVsixContainer" BeforeTargets="CreateVsixContainer">
<ItemGroup>
- <VSIXSourceItem Include="$(ProductPackageOutputPath)Microsoft.AspNetCore.Blazor.Templates.*.nupkg">
+ <VSIXSourceItem Include="$(ArtifactsShippingPackagesDir)Microsoft.AspNetCore.Blazor.Templates.*.nupkg">
<VSIXSubPath>ProjectTemplates\</VSIXSubPath>
</VSIXSourceItem>
<VSIXSourceItem Include="Templates.pkgdef" />
diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj
index 7889a46f6d1..bc43115c74f 100644
--- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj
+++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj
@@ -5,7 +5,7 @@
<Description>Build mechanism for ASP.NET Core Blazor applications.</Description>
<OutputType>Exe</OutputType>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<!-- Pack settings -->
diff --git a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj b/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj
index d0127a1981a..0f711382cda 100644
--- a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj
+++ b/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj
@@ -5,7 +5,7 @@
<OutputType>Exe</OutputType>
<AssemblyName>dotnet-blazor</AssemblyName>
<PackageId>Microsoft.AspNetCore.Blazor.Cli</PackageId>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<StartupObject>Microsoft.AspNetCore.Blazor.Cli.Program</StartupObject>
<!-- Disabled because E2ETest.csproj needs to WebDriver which is not strong named signed, and InternalsVisibleTo must specify a strong-name token -->
<SignAssembly>false</SignAssembly>
diff --git a/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj b/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj
index 2e1afb8c879..6cc0b40a190 100644
--- a/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj
+++ b/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<Description>Runtime server features for ASP.NET Core Blazor applications.</Description>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
index b5053c49933..7f909a7afe6 100644
--- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
+++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<NuspecFile>Microsoft.AspNetCore.Blazor.Templates.nuspec</NuspecFile>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<EnableDefaultItems>False</EnableDefaultItems>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<IncludeBuildOutput>False</IncludeBuildOutput>
diff --git a/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj b/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj
index f3fba4e1ae1..7cb84107046 100644
--- a/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj
+++ b/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Support for rendering ASP.NET Core components for browsers.</Description>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj
index 66366a61ac3..9ed61e3a31d 100644
--- a/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj
+++ b/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj
@@ -4,7 +4,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework>
<Description>Build mechanism for ASP.NET Core components.</Description>
<OutputType>Library</OutputType>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<!-- Pack settings -->
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
index a2d60c3d03c..b0608b621d6 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -4,7 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Components feature for ASP.NET Core.</Description>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
index 89d775f108c..d4d03b45bd8 100644
--- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
+++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<Description>Runtime server features for ASP.NET Core Components.</Description>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
diff --git a/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj b/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj
index 57eb0530a1d..a367382da34 100644
--- a/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj
+++ b/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj
@@ -6,7 +6,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;dataprotection;azure;keyvault</PackageTags>
<EnableApiCheck>false</EnableApiCheck>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
index 3d56dbb81f8..e53367e38d6 100644
--- a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
+++ b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
@@ -6,7 +6,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;dataprotection;azure;blob</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj b/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj
index 83e6388095c..8493504ffb0 100644
--- a/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj
+++ b/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj
@@ -6,7 +6,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;dataprotection;entityframeworkcore</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj
index 583b455cbcd..af2d8cbe7e9 100644
--- a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj
+++ b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj
@@ -6,7 +6,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;dataprotection;redis</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
index 7c4a0c7419a..63fec7add93 100644
--- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
+++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;json;jsonpatch</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
index 6fcde005e75..c7ed2a83cf0 100644
--- a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
+++ b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
@@ -16,7 +16,7 @@
This package requires the ASP.NET Core runtime. This runtime is installed by the .NET Core SDK, or can be acquired separately using installers available at https://aka.ms/dotnet-download.
</PackageDescription>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
index d3efcd102fc..7d3c92d525b 100644
--- a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
+++ b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
@@ -46,7 +46,7 @@
$(MSBuildProjectName) provides a default set of APIs for building an ASP.NET Core application.
</PackageDescription>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<IncludeSymbols>true</IncludeSymbols>
<NuspecFile>$(MSBuildThisFileDirectory)runtime.fx.nuspec</NuspecFile>
diff --git a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
index 00423705cc5..b32fe8549a8 100644
--- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
+++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;hosting;testing</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj
index 75790589ab5..43aabd97a9e 100644
--- a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj
+++ b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj
@@ -6,6 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;hosting</PackageTags>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj
index 9b2b7f8f15d..e8400d052c3 100644
--- a/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj
+++ b/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj
index 12a48179a36..ef6d70075d1 100644
--- a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj
+++ b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;owin</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
index 2c558a1c4ab..a6bb3b58eee 100644
--- a/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
+++ b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
@@ -5,7 +5,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;entityframeworkcore;identity;membership</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
index b257b97b0a6..857c8e53a28 100644
--- a/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
+++ b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
@@ -6,7 +6,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;identity;membership</PackageTags>
<IsTestProject>false</IsTestProject>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
index b90fa1a437d..663429210a4 100644
--- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
+++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
@@ -6,7 +6,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;identity;membership;razorpages</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
<RazorCompileOnBuild>false</RazorCompileOnBuild>
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj
index bdf570e00d1..481720db162 100644
--- a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj
+++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;diagnostics;entityframeworkcore</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj b/src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj
index 2531c795a87..fd9542da8ff 100644
--- a/src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj
+++ b/src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj
@@ -8,7 +8,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>diagnostics;healthchecks;entityframeworkcore</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<BaseNamespace>Microsoft.Extensions.Diagnostics.HealthChecks</BaseNamespace>
</PropertyGroup>
diff --git a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj
index e9aec8c7716..47fd76d040f 100644
--- a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj
+++ b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;diagnostics</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
index 8a1916ba5f8..fc460f6afed 100644
--- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
+++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Invoke Node.js modules at runtime in ASP.NET Core applications.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj
index 482fb519dd8..4c07ef75291 100644
--- a/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj
+++ b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
index a0df83dcfde..94ff1d4f92e 100644
--- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
+++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
index 23c329ceb28..3478a92fb8c 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>CSharp Analyzers for ASP.NET Core MVC.</Description>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<TargetFramework>netstandard1.3</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
index 35900f73604..ef2a747a17f 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>CSharp Analyzers for ASP.NET Core MVC.</Description>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<TargetFramework>netstandard1.3</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
index 8e4e81faf1e..e1645892c9d 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;json</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
index 36f14c1bc81..25a1229f2f5 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;aspnetcoremvctesting</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
index 486fc9d28e8..650a39dcca2 100644
--- a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
+++ b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
@@ -15,7 +15,7 @@
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<PackageId>$(MSBuildProjectName)</PackageId>
<PackageTags>Build Tasks;MSBuild;Swagger;Open API;code generation; Web API client</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<PackageVersion>$(ExperimentalPackageVersion)</PackageVersion>
<RootNamespace>$(AssemblyName)</RootNamespace>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
diff --git a/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj b/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj
index ed95ec1799e..ae327e6ab72 100644
--- a/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj
+++ b/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
index 1572906303c..55ea3b2ec9a 100644
--- a/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
+++ b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj b/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
index 031b422413a..b0c6cde4c8e 100644
--- a/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
+++ b/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj b/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
index 7869e63d96d..1678826d971 100644
--- a/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
+++ b/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj b/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
index 2ccf7b01d87..eb0ef015689 100644
--- a/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
+++ b/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj b/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj
index 40113b1a75c..2dbb515a4a6 100644
--- a/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj
+++ b/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj
@@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj b/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj
index 72106df001a..1e864c56629 100644
--- a/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj
+++ b/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj
@@ -5,7 +5,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
index 8ce855f8072..baa0fd66b2e 100644
--- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
+++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
@@ -6,7 +6,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
<NoWarn>CS1591;$(NoWarn)</NoWarn>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj b/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj
index c2a4ab39aa7..2b52fe7f462 100644
--- a/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj
+++ b/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj
@@ -7,7 +7,7 @@
<PackageTags>aspnetcore;kestrel</PackageTags>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>CS1591;$(NoWarn)</NoWarn>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/Directory.Build.targets b/src/SignalR/Directory.Build.targets
index ab603676a57..74f2ca08b85 100644
--- a/src/SignalR/Directory.Build.targets
+++ b/src/SignalR/Directory.Build.targets
@@ -8,15 +8,4 @@
<RuntimeIdentifier Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">win7-x86</RuntimeIdentifier>
</PropertyGroup>
- <PropertyGroup>
- <!--
- By default, all projects which produce packages are not intended to ship to NuGet.org as a product package.
- Packages which are intended to ship to NuGet.org must opt-in by setting this to true in the project file.
- -->
- <IsProductPackage Condition=" '$(IsProductPackage)' == '' ">false</IsProductPackage>
-
- <PackageOutputPath Condition=" '$(IsProductPackage)' == 'true' ">$(ProductPackageOutputPath)</PackageOutputPath>
- <PackageOutputPath Condition=" '$(IsProductPackage)' != 'true' ">$(InternalPackageOutputPath)</PackageOutputPath>
- </PropertyGroup>
-
</Project>
diff --git a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
index a09d8104c08..333ff3f1017 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
+++ b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
@@ -4,7 +4,7 @@
<Description>Client for ASP.NET Core SignalR</Description>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.SignalR.Client</RootNamespace>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj b/src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj
index 4df771fbca8..5f9ce585c0c 100644
--- a/src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj
+++ b/src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Client for ASP.NET Core SignalR</Description>
<TargetFramework>netstandard2.0</TargetFramework>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
index 838f980d8dc..983ea8d4b2d 100644
--- a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
+++ b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Client for ASP.NET Core Connection Handlers</Description>
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/clients/java/signalr/signalr.javaproj b/src/SignalR/clients/java/signalr/signalr.javaproj
index db43b5522e1..3cbe6887b36 100644
--- a/src/SignalR/clients/java/signalr/signalr.javaproj
+++ b/src/SignalR/clients/java/signalr/signalr.javaproj
@@ -8,8 +8,8 @@
<!-- In servicing builds, this will be set to value if the Java client is not configured to be released in the currently building patch. -->
<IsPackable>true</IsPackable>
-
- <IsProductPackage>true</IsProductPackage>
+
+ <IsShippingPackage>true</IsShippingPackage>
<!-- Pass the Java Package Version down to Gradle -->
<GradleOptions>-PpackageVersion="$(PackageVersion)"</GradleOptions>
diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj b/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj
index c8a96da87f5..d918ed1ed0c 100644
--- a/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj
+++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj
@@ -5,7 +5,7 @@
<PackageId>@aspnet/signalr-protocol-msgpack</PackageId>
<IsPackable>true</IsPackable>
<IsTestProject>false</IsTestProject>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/clients/ts/signalr/signalr.npmproj b/src/SignalR/clients/ts/signalr/signalr.npmproj
index b8237ca7c32..7c145fae0d2 100644
--- a/src/SignalR/clients/ts/signalr/signalr.npmproj
+++ b/src/SignalR/clients/ts/signalr/signalr.npmproj
@@ -5,7 +5,7 @@
<PackageId>@aspnet/signalr</PackageId>
<IsPackable>true</IsPackable>
<IsTestProject>false</IsTestProject>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
diff --git a/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj
index 185ede53347..6b8195785fa 100644
--- a/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj
+++ b/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj
@@ -5,6 +5,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Http.Connections</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
index 7c4b43b76f6..b76c522f1ca 100644
--- a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
+++ b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
@@ -5,7 +5,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj
index f074eec9c81..04f27fbe951 100644
--- a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj
+++ b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj
@@ -5,7 +5,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj
index 1c6f3a8dc54..b369977dc42 100644
--- a/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj
+++ b/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj
@@ -5,7 +5,7 @@
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
<RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj b/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj
index 4497273ebcd..a3a179f36e3 100644
--- a/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj
+++ b/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Tests for users to verify their own implementations of SignalR types</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
<IsTestProject>false</IsTestProject>
</PropertyGroup>
diff --git a/src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj b/src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj
index 389d673cd40..526238dfb55 100644
--- a/src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj
+++ b/src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Provides scale-out support for ASP.NET Core SignalR using a Redis server and the StackExchange.Redis client.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
index 5ca77d68800..4b0c31060cb 100644
--- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
+++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
@@ -12,7 +12,7 @@
<PackageId>AspNetCoreRuntime.$(TrimmedVersion).$(SharedFxArchitecture)</PackageId>
<NoPackageAnalysis>true</NoPackageAnalysis>
<DotNetUnpackFolder>$(RepositoryRoot)obj\ar\$(SharedFxRid)\</DotNetUnpackFolder>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Templating/Directory.Build.props b/src/Templating/Directory.Build.props
index 43c79d4f600..59541746312 100644
--- a/src/Templating/Directory.Build.props
+++ b/src/Templating/Directory.Build.props
@@ -19,10 +19,9 @@
<!-- Artifacts layout -->
<PropertyGroup>
<ArtifactsDir>$(MSBuildThisFileDirectory)..\..\artifacts\</ArtifactsDir>
- <ArtifactsConfigurationDir>$(ArtifactsDir)$(Configuration)\</ArtifactsConfigurationDir>
- <BasePackageOutputPath>$(ArtifactsConfigurationDir)packages\</BasePackageOutputPath>
- <ProductPackageOutputPath>$(BasePackageOutputPath)product\</ProductPackageOutputPath>
- <InternalPackageOutputPath>$(BasePackageOutputPath)internal\</InternalPackageOutputPath>
+ <ArtifactsPackagesDir>$(ArtifactsDir)packages\$(Configuration)\</ArtifactsPackagesDir>
+ <ArtifactsShippingPackagesDir>$(ArtifactsPackagesDir)Shipping\</ArtifactsShippingPackagesDir>
+ <ArtifactsNonShippingPackagesDir>$(ArtifactsPackagesDir)NonShipping\</ArtifactsNonShippingPackagesDir>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Templating/Directory.Build.targets b/src/Templating/Directory.Build.targets
index f5a3f65909e..28e6ca569ac 100644
--- a/src/Templating/Directory.Build.targets
+++ b/src/Templating/Directory.Build.targets
@@ -8,10 +8,10 @@
By default, all projects which produce packages are not intended to ship to NuGet.org as a product package.
Packages which are intended to ship to NuGet.org must opt-in by setting this to true in the project file.
-->
- <IsProductPackage Condition=" '$(IsProductPackage)' == '' ">false</IsProductPackage>
+ <IsShippingPackage Condition=" '$(IsShippingPackage)' == '' ">false</IsShippingPackage>
- <PackageOutputPath Condition=" '$(IsProductPackage)' == 'true' ">$(ProductPackageOutputPath)</PackageOutputPath>
- <PackageOutputPath Condition=" '$(IsProductPackage)' != 'true' ">$(InternalPackageOutputPath)</PackageOutputPath>
+ <PackageOutputPath Condition=" '$(IsShippingPackage)' == 'true' ">$(ArtifactsShippingPackagesDir)</PackageOutputPath>
+ <PackageOutputPath Condition=" '$(IsShippingPackage)' != 'true' ">$(ArtifactsNonShippingPackagesDir)</PackageOutputPath>
</PropertyGroup>
</Project>
diff --git a/src/Templating/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj
index 9c3e04798e2..1b409ca7ec3 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj
+++ b/src/Templating/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj
@@ -6,7 +6,7 @@
To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.
</Description>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
</Project>
diff --git a/src/Templating/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj
index 609e42dc46a..b274d5c5060 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj
+++ b/src/Templating/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj
@@ -5,7 +5,7 @@
<Description>Web File Templates for Microsoft Template Engine
To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.</Description>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
</Project>
diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
index 9115ba2ce12..95c510c45f0 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
+++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
@@ -8,7 +8,7 @@
<Description>ASP.NET Core Web Template Pack for Microsoft Template Engine
To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.</Description>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index 6b82f0a5b9a..4d705179d57 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -8,7 +8,7 @@
To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.</Description>
<PackageTags>$(PackageTags);spa</PackageTags>
- <IsProductPackage>true</IsProductPackage>
+ <IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
--
GitLab