diff --git a/Directory.Build.props b/Directory.Build.props index a213e4ada3..af50252ba6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -81,10 +81,10 @@ $(MSBuildThisFileDirectory)artifacts\ $(ArtifactsDir)obj\ $(ArtifactsDir)$(Configuration)\ - $(ArtifactsConfigurationDir)packages\ - $(BasePackageOutputPath)product\ - $(BasePackageOutputPath)internal\ - $(ArtifactsConfigurationDir)installers\ + $(ArtifactsDir)packages\$(Configuration)\ + $(ArtifactsPackagesDir)Shipping\ + $(ArtifactsPackagesDir)NonShipping\ + $(ArtifactsDir)installers\$(Configuration)\ diff --git a/Directory.Build.targets b/Directory.Build.targets index de6e19d8e2..971f2a16a9 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. --> - false + false - $(ProductPackageOutputPath) - $(InternalPackageOutputPath) + $(ArtifactsShippingPackagesDir) + $(ArtifactsNonShippingPackagesDir) diff --git a/build.ps1 b/build.ps1 index 2d08643422..2210b5bd89 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 3f99fddf97..07719b6552 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 3d8a7af504..67858c4d07 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -25,7 +25,7 @@ - + - \ No newline at end of file + diff --git a/build/SharedFx.targets b/build/SharedFx.targets index eaadd1e7fe..5a2de7b8bc 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -28,11 +28,11 @@ - - - - - + + + + + diff --git a/build/artifacts.props b/build/artifacts.props index 4973a3fb83..c8e9f73feb 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 - + diff --git a/build/publish/Publish.csproj b/build/publish/Publish.csproj index a136fe7910..7ea57a073a 100644 --- a/build/publish/Publish.csproj +++ b/build/publish/Publish.csproj @@ -50,12 +50,12 @@ <_FilesToPublish Include="$(InstallersOutputPath)*" Exclude="@(_FilesToPublish)" /> - <_FilesToPublish Include="$(ProductPackageOutputPath)*.jar;$(ProductPackageOutputPath)*.pom"> + <_FilesToPublish Include="$(ArtifactsShippingPackagesDir)*.jar;$(ArtifactsShippingPackagesDir)*.pom"> aspnetcore/jar/$(PackageVersion)/ - + aspnetcore/npm/$(PackageVersion)/ <_FilesToPublish Include="@(NpmPackageToPublish)" /> @@ -70,8 +70,8 @@ <_FilesToPublish Remove="@(_FilesToPublish)" /> - - + + - + NonShipping=true - + NonShipping=true diff --git a/build/repo.props b/build/repo.props index 1288ef0476..7530abe0df 100644 --- a/build/repo.props +++ b/build/repo.props @@ -15,9 +15,9 @@ $(RepositoryRoot)src\ - $(ArtifactsDir)$(Configuration)\packages\product\ - $(ArtifactsDir)$(Configuration)\packages\internal\ - $(ArtifactsDir)$(Configuration)\installers\ + $(ArtifactsDir)\packages\$(Configuration)\Shipping\ + $(ArtifactsDir)\packages\$(Configuration)\NonShipping\ + $(ArtifactsDir)installers\$(Configuration)\ $(RepositoryRoot)eng\signcheck.exclusions.txt diff --git a/build/repo.targets b/build/repo.targets index 0e3872ef1b..6d04ebd040 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -52,7 +52,7 @@ - + @@ -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)" /> @@ -255,7 +255,7 @@ - <_BuildOutput Include="$(ProductPackageOutputPath)%(PackageArtifact.Identity).*.nupkg" + <_BuildOutput Include="$(ArtifactsShippingPackagesDir)%(PackageArtifact.Identity).*.nupkg" Condition=" '%(PackageArtifact.Category)' == 'ship' " /> diff --git a/docs/Artifacts.md b/docs/Artifacts.md index a9378c4672..cbb9b55659 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 624d4ce185..544aea0497 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 - + diff --git a/docs/ProjectProperties.md b/docs/ProjectProperties.md index 98332931b9..fe5bba6baf 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 493d79730e..cc62ebb150 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ $(KoreBuildVersion) - 3.0.0-build-20190110.4 + 3.0.0-build-20190118.1 1.0.0-alpha-004 15.9.0 diff --git a/global.json b/global.json index 93b9880dae..0b501115de 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 7800fa1cf7..978d03b843 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 4a7df9d5a8..1605940b28 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 @@ netcoreapp3.0 aspnetcore;authentication;AzureAD true - true + true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core <_EnableAllInclusiveRazorSdk>true 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 3c3a584bfd..485d3a4085 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 @@ netcoreapp3.0 aspnetcore;authentication;AzureADB2C true - true + true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core <_EnableAllInclusiveRazorSdk>true 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 ac74adf4d7..821f07eb68 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 @@ netcoreapp3.0 true aspnetcore;azure;appservices - true + true diff --git a/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj index fbbef613fd..7cd3dc1453 100644 --- a/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj +++ b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj @@ -7,7 +7,7 @@ true true aspnetcore;azure;appservices - true + true diff --git a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj index 8625812671..6f03745885 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 @@ true false Roslyn analyzers for ASP.NET Core Components. - true + true false diff --git a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj index ce6abf27ba..97fba4e00a 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 @@ netstandard2.0 Build client-side single-page applications (SPAs) with Razor Components running under WebAssembly. - true + true diff --git a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj index 29d89dbeea..d2085b87a3 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 @@ - + ProjectTemplates\ 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 7889a46f6d..bc43115c74 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 @@ Build mechanism for ASP.NET Core Blazor applications. Exe true - true + true 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 d0127a1981..0f711382cd 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 @@ Exe dotnet-blazor Microsoft.AspNetCore.Blazor.Cli - true + true Microsoft.AspNetCore.Blazor.Cli.Program false 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 2e1afb8c87..6cc0b40a19 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 @@ netcoreapp3.0 Runtime server features for ASP.NET Core Blazor applications. - true + true 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 b5053c4993..7f909a7afe 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 @@ netstandard2.0 Microsoft.AspNetCore.Blazor.Templates.nuspec - true + true False False False diff --git a/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj b/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj index f3fba4e1ae..7cb8410704 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 @@ netstandard2.0 Support for rendering ASP.NET Core components for browsers. - true + true diff --git a/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj index 66366a61ac..9ed61e3a31 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 @@ netcoreapp3.0 Build mechanism for ASP.NET Core components. Library - true + true diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index a2d60c3d03..b0608b621d 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -4,7 +4,7 @@ netstandard2.0 Components feature for ASP.NET Core. true - true + true diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj index 89d775f108..d4d03b45bd 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 @@ netcoreapp3.0 Runtime server features for ASP.NET Core Components. - true + true true diff --git a/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj b/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj index 57eb0530a1..a367382da3 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 @@ true aspnetcore;dataprotection;azure;keyvault false - true + true diff --git a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj index 3d56dbb81f..e53367e38d 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 @@ true true aspnetcore;dataprotection;azure;blob - true + true diff --git a/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj b/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj index 83e6388095..8493504ffb 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 @@ true true aspnetcore;dataprotection;entityframeworkcore - true + true diff --git a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj index 583b455cbc..af2d8cbe7e 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 @@ true true aspnetcore;dataprotection;redis - true + true diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj index 7c4a0c7419..63fec7add9 100644 --- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj +++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;json;jsonpatch - true + true diff --git a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj index 6fcde005e7..c7ed2a83cf 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. - true + true diff --git a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj index d3efcd102f..7d3c92d525 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. - true + true true $(MSBuildThisFileDirectory)runtime.fx.nuspec diff --git a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj index 00423705cc..b32fe8549a 100644 --- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj +++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;hosting;testing - true + true diff --git a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj index 75790589ab..43aabd97a9 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);CS1591 true aspnetcore;hosting + true 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 9b2b7f8f15..e8400d052c 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);CS1591 true aspnetcore - true + true diff --git a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj index 12a48179a3..ef6d70075d 100644 --- a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj +++ b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;owin - true + true diff --git a/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj index 2c558a1c4a..a6bb3b58ee 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 @@ netcoreapp3.0 true aspnetcore;entityframeworkcore;identity;membership - true + true 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 b257b97b0a..857c8e53a2 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 @@ true aspnetcore;identity;membership false - true + true diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index b90fa1a437..663429210a 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 @@ netcoreapp3.0 true aspnetcore;identity;membership;razorpages - true + true true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core false 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 bdf570e00d..481720db16 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);CS1591 true aspnetcore;diagnostics;entityframeworkcore - true + true 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 2531c795a8..fd9542da8f 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);CS1591 true diagnostics;healthchecks;entityframeworkcore - true + true Microsoft.Extensions.Diagnostics.HealthChecks diff --git a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj index e9aec8c771..47fd76d040 100644 --- a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj +++ b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;diagnostics - true + true diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj index 8a1916ba5f..fc460f6afe 100644 --- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj @@ -3,7 +3,7 @@ Invoke Node.js modules at runtime in ASP.NET Core applications. netcoreapp3.0 - true + true 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 482fb519dd..4c07ef7529 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 @@ Helpers for building single-page applications on ASP.NET MVC Core. netcoreapp3.0 + true diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj index a0df83dcfd..94ff1d4f92 100644 --- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj @@ -3,7 +3,7 @@ Helpers for building single-page applications on ASP.NET MVC Core. netcoreapp3.0 - true + true 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 23c329ceb2..3478a92fb8 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 @@ CSharp Analyzers for ASP.NET Core MVC. aspnetcore;aspnetcoremvc - true + true netstandard1.3 false 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 35900f7360..ef2a747a17 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 @@ CSharp Analyzers for ASP.NET Core MVC. aspnetcore;aspnetcoremvc - true + true netstandard1.3 false 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 8e4e81faf1..e1645892c9 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);CS1591 true aspnetcore;aspnetcoremvc;json - true + true 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 36f14c1bc8..25a1229f2f 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);CS1591 true aspnetcore;aspnetcoremvc;aspnetcoremvctesting - true + true 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 486fc9d28e..650a39dcca 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 @@ $(MSBuildProjectName).nuspec $(MSBuildProjectName) Build Tasks;MSBuild;Swagger;Open API;code generation; Web API client - true + true $(ExperimentalPackageVersion) $(AssemblyName) netstandard2.0;net461 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 ed95ec1799..ae327e6ab7 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);CS1591 true aspnetcore;authentication;security - true + true 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 1572906303..55ea3b2ec9 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);CS1591 true aspnetcore;authentication;security - true + true 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 031b422413..b0c6cde4c8 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);CS1591 true aspnetcore;authentication;security - true + true 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 7869e63d96..1678826d97 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);CS1591 true aspnetcore;authentication;security - true + true 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 2ccf7b01d8..eb0ef01568 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);CS1591 true aspnetcore;authentication;security - true + true 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 40113b1a75..2dbb515a4a 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);CS1591 true aspnetcore;authentication;security - true + true 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 72106df001..1e864c5662 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 @@ netcoreapp3.0 true aspnetcore;authentication;security - true + true 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 8ce855f807..baa0fd66b2 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 @@ true aspnetcore CS1591;$(NoWarn) - true + true 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 c2a4ab39aa..2b52fe7f46 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 @@ aspnetcore;kestrel true CS1591;$(NoWarn) - true + true diff --git a/src/SignalR/Directory.Build.targets b/src/SignalR/Directory.Build.targets index ab603676a5..74f2ca08b8 100644 --- a/src/SignalR/Directory.Build.targets +++ b/src/SignalR/Directory.Build.targets @@ -8,15 +8,4 @@ win7-x86 - - - false - - $(ProductPackageOutputPath) - $(InternalPackageOutputPath) - - 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 a09d8104c0..333ff3f101 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 @@ Client for ASP.NET Core SignalR netstandard2.0 Microsoft.AspNetCore.SignalR.Client - true + true 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 4df771fbca..5f9ce585c0 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 @@ Client for ASP.NET Core SignalR netstandard2.0 - true + true 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 838f980d8d..983ea8d4b2 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 @@ Client for ASP.NET Core Connection Handlers netstandard2.0;netcoreapp3.0 - true + true diff --git a/src/SignalR/clients/java/signalr/signalr.javaproj b/src/SignalR/clients/java/signalr/signalr.javaproj index db43b5522e..3cbe6887b3 100644 --- a/src/SignalR/clients/java/signalr/signalr.javaproj +++ b/src/SignalR/clients/java/signalr/signalr.javaproj @@ -8,8 +8,8 @@ true - - true + + true -PpackageVersion="$(PackageVersion)" 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 c8a96da87f..d918ed1ed0 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 @@ @aspnet/signalr-protocol-msgpack true false - true + true diff --git a/src/SignalR/clients/ts/signalr/signalr.npmproj b/src/SignalR/clients/ts/signalr/signalr.npmproj index b8237ca7c3..7c145fae0d 100644 --- a/src/SignalR/clients/ts/signalr/signalr.npmproj +++ b/src/SignalR/clients/ts/signalr/signalr.npmproj @@ -5,7 +5,7 @@ @aspnet/signalr true false - true + true 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 185ede5334..6b8195785f 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 @@ netstandard2.0 Microsoft.AspNetCore.Http.Connections true + true 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 7c4b43b76f..b76c522f1c 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 @@ netstandard2.0 Microsoft.AspNetCore.SignalR true - true + true 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 f074eec9c8..04f27fbe95 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 @@ netstandard2.0 Microsoft.AspNetCore.SignalR true - true + true 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 1c6f3a8dc5..b369977dc4 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 @@ netstandard2.0;netcoreapp3.0 Microsoft.AspNetCore.SignalR true - true + true 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 4497273ebc..a3a179f36e 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 @@ Tests for users to verify their own implementations of SignalR types netcoreapp3.0 - true + true false 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 389d673cd4..526238dfb5 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 @@ Provides scale-out support for ASP.NET Core SignalR using a Redis server and the StackExchange.Redis client. netcoreapp3.0 - true + true diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index 5ca77d6880..4b0c31060c 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -12,7 +12,7 @@ AspNetCoreRuntime.$(TrimmedVersion).$(SharedFxArchitecture) true $(RepositoryRoot)obj\ar\$(SharedFxRid)\ - true + true diff --git a/src/Templating/Directory.Build.props b/src/Templating/Directory.Build.props index 43c79d4f60..5954174631 100644 --- a/src/Templating/Directory.Build.props +++ b/src/Templating/Directory.Build.props @@ -19,10 +19,9 @@ $(MSBuildThisFileDirectory)..\..\artifacts\ - $(ArtifactsDir)$(Configuration)\ - $(ArtifactsConfigurationDir)packages\ - $(BasePackageOutputPath)product\ - $(BasePackageOutputPath)internal\ + $(ArtifactsDir)packages\$(Configuration)\ + $(ArtifactsPackagesDir)Shipping\ + $(ArtifactsPackagesDir)NonShipping\ diff --git a/src/Templating/Directory.Build.targets b/src/Templating/Directory.Build.targets index f5a3f65909..28e6ca569a 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. --> - false + false - $(ProductPackageOutputPath) - $(InternalPackageOutputPath) + $(ArtifactsShippingPackagesDir) + $(ArtifactsNonShippingPackagesDir) 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 9c3e04798e..1b409ca7ec 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)'. - true + true 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 609e42dc46..b274d5c506 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 @@ Web File Templates for Microsoft Template Engine To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. - true + true 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 9115ba2ce1..95c510c45f 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 @@ ASP.NET Core Web Template Pack for Microsoft Template Engine To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. - true + true 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 6b82f0a5b9..4d705179d5 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)'. $(PackageTags);spa - true + true