diff --git a/Directory.Build.props b/Directory.Build.props
index a213e4ada33d4251437a27d2a2e529351733e9a6..af50252ba6ab71b83e4dc821c5d5832a8a992363 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 de6e19d8e212f3cb9f130a01e097abf75670df43..971f2a16a9c98fb27747d85b223f58fd1fb63be5 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 2d08643422d7dbc6be14cd76b3f6e373b4920574..2210b5bd89927560a1a44b664bfecc2d9b20a2bd 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 3f99fddf97049fe01dd38c52e1054b74ebfa856f..07719b65523d6e3b887f6ac6ff743c6f15a245de 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 3d8a7af504c029c210118bd46a80f30584a26744..67858c4d07fd6aa1c3e051647f0cf4c268a11fc2 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 eaadd1e7febfb6da58edd77a13ae068afeb80687..5a2de7b8bcd8aff9c442e215c2cff70426c0aaf2 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 4973a3fb83356fef8fcdd3b361bb5eeb5c81dc85..c8e9f73feb6c8325f626c1540ca983c1902c65e1 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 a136fe7910a456b8b61a04123cadabfa28e943a9..7ea57a073a4226b8d8f5b72e27a044dd127bb853 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 1288ef0476596145df8746ef22c66014dc3654bf..7530abe0dfb5f2f57553b62d985311a4eab2d023 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 0e3872ef1b46e1be8053099de93bc0110f699109..6d04ebd0403d5f3873d8413a48f7b2512f5cafa3 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 a9378c4672c8abe5f352d21b4a8543b9c3305493..cbb9b556590082d57b133f03aba14db2eaac308f 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 624d4ce18582095ec10bf8dca58bc7b238b4146b..544aea0497ce5f9c0f9aa3504cf1f2568b849c23 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 98332931b9e539a7033b354e29a3d10a5c570c22..fe5bba6bafcc3f9a85c82ac02c55f1c9e1efe26b 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 493d79730e45f300261964092165a85fe3a15264..cc62ebb15089b7f44aa45c7b9bdafcea24e4496f 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 93b9880dae2a8ee1de69f89a89a481971ba690d8..0b501115de96eea022fce18c9d0a01f8d87f6466 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 7800fa1cf70e746a4e96b9f51326a1e7aab3e189..978d03b843b12266f16b83d9c542f8944da58e45 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 4a7df9d5a87c0c21cae79ba15e4f2408988318a2..1605940b286ce1bdd89305e5a6b5a6b1a608cd08 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 3c3a584bfd2ba06fbc11d66674ad106439ab1e26..485d3a40851d345e6c4b0216a650c1ecaab89c08 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 ac74adf4d7d048a268bc0e808874b24a7b7526f5..821f07eb687d3d855b4a546c55aa403e42024084 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 fbbef613fdf5c6ebd646891e9bfcd11e9dfc715f..7cd3dc14537bf3ce0371cfc3de35d7b53ef0d962 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 86258126718f4c30c2b4362f54b05c466bb00d28..6f03745885bf3480764228e7f1099be030d6daff 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 ce6abf27ba6e99c12e150d01b0179cb644265318..97fba4e00ae8dbd8bcd188317de995412e8ada12 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 29d89dbeea89fc2b8c6de3c2b45b04ee646e4c77..d2085b87a395b8bcd3cc71ce45ecda9af58190d9 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 7889a46f6d1c11a8565db597420b94bbc12c8186..bc43115c74f620d376abef77e32ca6d5732e484f 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 d0127a1981a9f1fad81f452398bc9c8b368c47d5..0f711382cdaa612d4f42fa550f7ccff09f1bc5d1 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 2e1afb8c8792681c75d504e946f95b89bcf805d5..6cc0b40a190b026bcef637a6306a520dc286fc16 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 b5053c4993376ad02ad79b0755ae610672700007..7f909a7afe6ed1511496771cf20e11a49eaaf66f 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 f3fba4e1ae1b51711002154fd59b5b9953cd8a8d..7cb8410704674981424b0897c9b853af325b03ad 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 66366a61ac3aa4a72cf4a74611e47d59eda2411c..9ed61e3a31d9c33ba760fc2b99c0d02e65e486b5 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 a2d60c3d03cb0f93792bf0594d91339c3cf29ffd..b0608b621d64044123390496606f7f99130c2f0b 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 89d775f108cabc4657c08d026c21d5f4a920df66..d4d03b45bd859140de7e1f53ef011378a156150a 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 57eb0530a1dfcaeb1044e391c1664d61a20a27b9..a367382da34d1aeaf40d0643922cd38d12a7f68b 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 3d56dbb81f862923ad1d515ada0b9e018fca8eec..e53367e38d64dc016d948401ef6b95ae57ef5a90 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 83e6388095c5fa9f40a179bef9812fbe2a7fcb1a..8493504ffb09ac9f5bcee4fec62ef8fe4a7bb6cf 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 583b455cbcd062fdebbaefe0c291f3ccfae89c75..af2d8cbe7e9f868822e9d09350e6a3c882c38043 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 7c4a0c7419a49fb905df35999902445539c166ff..63fec7add93e2e0684541ceb346fb1ded17a5a9e 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 6fcde005e75a0638d2fa96d29a2b5ec38745d8d5..c7ed2a83cf0bfad9d21c1f2438c2d4de4be421cf 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 d3efcd102fc7cd77058eba1d62c89d4309314c30..7d3c92d525b0c543f97826f128f822faa211bdca 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 00423705cc5a2bc8bcf24eece899f51af30081fa..b32fe8549a839d236a9ae2aa79b5438992a01a80 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 75790589ab514665dfcca8cb2166ccbbd0dea895..43aabd97a9ec519ff014a5fd6f64d00e0f61d70a 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 9b2b7f8f15d9fc76fc60a6eb5679533f13218eb8..e8400d052c3bee9e3f0c9fc21218e4266d98a771 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 12a48179a3638481a90024088116ec06b25f2069..ef6d70075d1e176095c89b649f0b21194641a595 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 2c558a1c4ab5445cc67ca9e3a8d5622ab72af696..a6bb3b58eee7656e1a725ed1600ba808218497e1 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 b257b97b0a67c2cfe37ee449e65db6750902ee3a..857c8e53a280276faa44a49e4e4f1ef0bae01fd8 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 b90fa1a437d483050e4d64b34dd56e73d1b40ad7..663429210a4ad07423e4ce738c848244da74e337 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 bdf570e00d140e76fec132c8f3f2ad6c2f459afd..481720db162ce4263f94c652a96508d84cfbc974 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 2531c795a87e5d884fba20859e82f7c45ba02114..fd9542da8ff15c916085ff67fdb540a704772abd 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 e9aec8c77164e3de2234b8a3d83d3c13018bc0f2..47fd76d040f33361eadd5bab8fde8d4592bf4ed6 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 8a1916ba5f8c6528e28d4ac3b6fc33a7671a3192..fc460f6afed94bfda0e11e6ec6bca476b07ace79 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 482fb519dd835be5875595e9cde9bc3bde508836..4c07ef75291c238da05d3a2052091959cd367201 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 a0df83dcfde1f64c9eff2457f85af708e8bbab52..94ff1d4f92e55ef1a1a41bf6e7bf94456b6ada42 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 23c329ceb2862ed17a11009ba31f3fe09f0fb8e9..3478a92fb8cc2c1c57e85504bbde3c5aaecdb244 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 35900f73604d95171a7c6903b37f9c8bc37f804b..ef2a747a17fd46d8918461de4573cedfb03d53d7 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 8e4e81faf1ed10e142549fb584b592f5c74fee75..e1645892c9d1e12382d9f30eba6b1be92ede383f 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 36f14c1bc817b30c431703bbe865e1cc09addccc..25a1229f2f5ea43b043776e0f626e94ec5ba3f47 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 486fc9d28e8a37c145778f81cf07cf0c8634f040..650a39dcca2c76b9f41c4f696a847c5122913a0c 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 ed95ec1799e795e33f9fd16e00f03725f1491888..ae327e6ab721058b2afb0ecc1d843d3cd69acf42 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 1572906303cfca1c7eaa085b60ca5bfc2b8b2ccc..55ea3b2ec9ae826abebdf855124b51045a18ffb8 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 031b422413afab1dd9ad2ed97ee462d3de7daab8..b0c6cde4c8e9c3f2fe0c9b176865f1c000da75b0 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 7869e63d96dda9bce7ee362f72f90cd1abb50d86..1678826d9719c5be1aff043050b1692f864ff4c8 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 2ccf7b01d874c5a18e14d9e45faf1a76042d8dc3..eb0ef015689367ba9a8c7b86fc3ef323f6d28ac3 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 40113b1a75cc4fdb5ec5596be7d2b5094326017f..2dbb515a4a637f1a462fbedad47d6e9b9a902b40 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 72106df001afbce2172cca774b4be7035b171377..1e864c566292bbabd928b72aea8713825db91e83 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 8ce855f8072f939838fce5a42207006905e74d77..baa0fd66b2ed4bb9691bfb092108288341a8167c 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 c2a4ab39aa768437839a2ec225927dcaaa6ed537..2b52fe7f4627464d4d24a52222aebd573b7c25fd 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 ab603676a57f0512416adf91fd840cdaa975c535..74f2ca08b856634c0db2b9f10dbc8ab9c3aaf462 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 a09d8104c08c0c3aa17402861617810dc37f2966..333ff3f1017df83afbc961c0170119bcf8dd2b96 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 4df771fbca8f26f7473a6fccda581b4f05a9fd18..5f9ce585c0ccb0e6b8a94efec45c53ce95b77ee2 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 838f980d8dc1abfc52501767d52c63fe17341df7..983ea8d4b2d3347d2a384de5bfe5a4d932ad166a 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 db43b5522e19c064e4606220e75586e69a0cd318..3cbe6887b3699770ae620ef865ccd84bd0231b50 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 c8a96da87f57828bbb35c38b496bcd73d2a49431..d918ed1ed0c1df37b9a70cdfad07ebb60e99245f 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 b8237ca7c32a89376ea76953c7e415e9f9fa8989..7c145fae0d20b47fbb584f4d724b9cb68da90400 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 185ede5334721e649181ba80d4cda317f5a0923b..6b8195785fa03431f1c06683b63ff6964ecda61e 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 7c4b43b76f6cafe815474b19ae12aae407083d6f..b76c522f1ca963619f62d766e528c4e31c11aa52 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 f074eec9c81e99ceb1bce0063ec7c0c6af1ba643..04f27fbe951f7b2e5749c32192fec38dab52e9ad 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 1c6f3a8dc549bd00eb405c32255a55939621ec65..b369977dc4249e0665162ab8d1f65e7c20bcef92 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 4497273ebcdee4fa03a996e8fbd5e340e79fbc46..a3a179f36e3e043453311fdc1fc9ea1b8b2c9c3e 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 389d673cd40e3af78015f19600c3dbc44ea5d035..526238dfb55df7f3273abd79e538085766781cee 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 5ca77d68800fd479077fd64bb27d759372f8bce1..4b0c31060cb24484ff6a8534c2e8458ec6955cba 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 43c79d4f600963072afab1f8ed211ed9554b8eb2..595417463127f72c55ef727df6d67e09cdf96c28 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 f5a3f65909e215b697115ac0eb420e15477399c2..28e6ca569aca9de9284c20f0f799e04e762272bf 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 9c3e04798e2745aeef17ae436fa2193649d3b51d..1b409ca7ec38e15bc2657c7d581c3e5a173622ee 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 609e42dc46a5c010f0d14f51cfb7c8d3304fecc4..b274d5c50604462c27a123ffe08e5e9e6ee2ac9b 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 9115ba2ce12b0741d1a831dc60eb71e7d0f95c3f..95c510c45f03f2a145cb8a40fcc1fe8c44867ebb 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 6b82f0a5b9ae453ec98b9d5a3ccd74b8398c51b9..4d705179d57f2fee392ac88ebc2d29405a5df8c9 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>