diff --git a/Directory.Build.props b/Directory.Build.props index b235a5fa08..43fb9fcfd1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -76,12 +76,14 @@ - + $(MSBuildThisFileDirectory)artifacts\ $(ArtifactsDir)obj\ $(ArtifactsDir)$(Configuration)\ - $(ArtifactsDir)build\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ $(ArtifactsConfigurationDir)installers\ diff --git a/Directory.Build.targets b/Directory.Build.targets index 47fc0c1fb9..4ac8ecef98 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,17 @@ + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + $(AssemblyName) false @@ -45,9 +57,6 @@ true false - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) $(MicrosoftNETCoreApp30PackageVersion) $(NETStandardLibrary20PackageVersion) diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index 76ab436c8f..bf9fbc0389 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -25,7 +25,7 @@ - + diff --git a/build/CodeSign.targets b/build/CodeSign.targets index dcbc68c5f2..d7f2ba57de 100644 --- a/build/CodeSign.targets +++ b/build/CodeSign.targets @@ -28,8 +28,7 @@ PackageSigningCertName=$(PackageSigningCertName); VsixSigningCertName=$(VsixSigningCertName); JarSigningCertName=$(JarSigningCertName); - ArtifactsDir=$(ArtifactsDir); - BuildDir=$(BuildDir) + ArtifactsDir=$(ArtifactsDir) diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index a660b6c317..623f8c4395 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -13,7 +13,6 @@ DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); - OutputPath=$(ArtifactsDir)lzma\; _BuildToolsAssembly=$(_BuildToolsAssembly) diff --git a/build/Publish.targets b/build/Publish.targets index 19d87fb73f..baec750a5c 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -1,19 +1,8 @@ - $(RepositoryRoot).deps\assets\ - $(RepositoryRoot).deps\packages\ - - aspnetcore_base_runtime.version - $(IntermediateDir)$(BaseRuntimeVersionFileName) - latest.version - $(IntermediateDir)$(LatestRuntimeVersionFileName) - - ResolveCommitHash; - PrepareOutputPaths; GetFilesToPublish; - PublishToLocalFolder; PublishToAzureFeed; PublishToMyGet; @@ -21,167 +10,70 @@ - - - - - - - - - - - <_AllSharedFxRIDs Include="$(SupportedRuntimeIdentifiers)" /> - - - - - - - + aspnetcore/Runtime/$(PackageVersion)/ - aspnetcore/npm/ - aspnetcore/jar/ - aspnetcore/Runtime/$(SharedFxCliBlobChannel)/ - aspnetcore-runtime-$(PackageVersion) - aspnetcore-runtime-latest - aspnetcore-runtime-internal-$(PackageVersion) - dotnet-hosting-$(PackageVersion)-win.exe + aspnetcore/npm/$(PackageVersion)/ + aspnetcore/jar/$(PackageVersion)/ - - - $(BlobBasePath)$(WindowsHostingBundleInstallerFileName) - - - - - $(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).zip - - - - - $(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip - - - - - $(BlobBasePath)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip - - - - - $(BlobBasePath)nuGetPackagesArchive-$(PackageVersion).lzma - - - - $(BlobBasePath)$(IntermediateInstallerBaseFileName)-%(IntermediateInstaller.Identity)%(IntermediateInstaller.FileExt) - - - - $(BlobBasePath)$(BaseRuntimeVersionFileName) + + + $(BlobBasePath)%(FileName)%(Extension) text/plain - - - $(BlobBasePath)$(InstallerBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt) - - - - - $(AliasBlobBasePath)$(InstallerAliasBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt) + + $(BlobBasePath)%(FileName)%(Extension) + text/plain + no-cache, no-store, must-revalidate true - - true - - $(AliasBlobBasePath)%(SharedFxVersionBadge.FileName)%(SharedFxVersionBadge.Extension) + + $(BlobBasePath)%(FileName)%(Extension) no-cache, no-store, must-revalidate image/svg+xml true - - $(AliasBlobBasePath)$(LatestRuntimeVersionFileName) - no-cache, no-store, must-revalidate - text/plain - true + + + $(BlobBasePath)%(FileName)%(Extension) - - <_PackageArtifactInfo - Include="@(ArtifactInfo)" - ArtifactPath="$(DependencyPackagesDir)%(ArtifactInfo.PackageId).%(ArtifactInfo.Version).nupkg" - Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetPackage'" /> - - <_SymbolsPackageArtifactInfo - Include="@(ArtifactInfo)" - ArtifactPath="$(DependencyPackagesDir)%(ArtifactInfo.PackageId).%(ArtifactInfo.Version).symbols.nupkg" - Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetSymbolsPackage'" /> - - - $(JarBlobBasePath)%(ArtifactInfo.FileName)%(ArtifactInfo.Extension) + + + $(JarBlobBasePath)%(FileName)%(Extension) - - $(JarBlobBasePath)%(ArtifactInfo.FileName)%(ArtifactInfo.Extension) + + $(JarBlobBasePath)%(FileName)%(Extension) - - $(NpmBlobBasePath)%(ArtifactInfo.PackageId)/%(ArtifactInfo.FileName)%(ArtifactInfo.Extension) + + + $(NpmBlobBasePath)%(FileName)%(Extension) application/tar+gzip - + + + + - - - - - - - <_RidSpecificPackages Include="$(SupportedRuntimeIdentifiers)" Exclude="$(SharedFxRid)" /> - + + + + NonShipping=true + + + NonShipping=true + - - - - - - - - - <_MissingArtifactFile Include="@(FilesToPublish)" Condition="!Exists(%(FilesToPublish.Identity))" /> - <_MissingArtifactFile Include="@(NpmPackageToPublish)" Condition="!Exists(%(NpmPackageToPublish.Identity))" /> - <_MissingArtifactFile Include="@(PackageToPublish)" Condition="!Exists(%(PackageToPublish.Identity))" /> - - - - - - - - - - - - $(AzureBlobRelativePathBase)/ - - - - - - /t:CleanArtifacts /t:Build /p:SkipTests=true $(RepositoryBuildArguments) $(BuildArguments) /bl:$(LogOutputDir)$(RepositoryToBuild).build.binlog - $(BuildRepositoryRoot)artifacts\ - $(RepositoryArtifactsRoot)build\ - $(RepositoryArtifactsRoot)msbuild\ + $(BuildRepositoryRoot)artifacts\msbuild\ @@ -142,14 +140,9 @@ - - - diff --git a/build/SharedFx.targets b/build/SharedFx.targets index d5439003ac..3c8a6d463b 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -24,12 +24,12 @@ - - - - - - + + + + + + diff --git a/build/artifacts.props b/build/artifacts.props index fc9f95be8d..cf871a7d84 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -1,3 +1,7 @@ + diff --git a/build/repo.props b/build/repo.props index 15ca73dba3..eec740e85d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -8,14 +8,18 @@ true false + false + false true false $(RepositoryRoot)src\ - $(RepositoryRoot).deps\build\ - $(RepositoryRoot).deps\Signed\Packages\ + $(ArtifactsDir)$(Configuration)\packages\product\ + $(ArtifactsDir)$(Configuration)\packages\internal\ + $(ArtifactsDir)$(Configuration)\installers\ + $(RepositoryRoot)eng\signcheck.exclusions.txt @@ -28,35 +32,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -104,14 +79,6 @@ $(RepositoryRoot)**\obj\**\*;" /> - - - - true - - true - - diff --git a/build/repo.targets b/build/repo.targets index a33916c3d6..3592232a23 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -46,7 +46,7 @@ - + @@ -195,9 +195,8 @@ <_LineupPackages Include="@(ExternalDependency)" /> <_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " /> - <_RestoreSources Include="$(DependencyPackageDir)" Condition="'$(DependencyPackageDir)' != '' AND Exists('$(DependencyPackageDir)')" /> - <_RestoreSources Include="$(SignedDependencyPackageDir)" Condition="'$(SignedDependencyPackageDir)' != '' AND Exists('$(SignedDependencyPackageDir)')" /> - <_RestoreSources Include="$(BuildDir)" /> + <_RestoreSources Include="$(ProductPackageOutputPath)" /> + <_RestoreSources Include="$(InternalPackageOutputPath)" /> <_RestoreSources Include="$(RestoreSources)" /> @@ -263,7 +262,7 @@ - <_BuildOutput Include="$(BuildDir)%(PackageArtifact.Identity).*.nupkg" + <_BuildOutput Include="$(ProductPackageOutputPath)%(PackageArtifact.Identity).*.nupkg" Condition=" '%(PackageArtifact.Category)' == 'ship' " /> diff --git a/docs/Artifacts.md b/docs/Artifacts.md new file mode 100644 index 0000000000..a9378c4672 --- /dev/null +++ b/docs/Artifacts.md @@ -0,0 +1,20 @@ +Artifacts +========= + +Building this repo produces build artifacts in the directory structure described below. Build outputs are organized into logical groups based on artifact type and the intended usage of the artifacts. + +``` +artifacts/ + $(Configuration)/ + installers/ + *.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'. + *.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/ + *.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 5e82cbc909..e96d350bc1 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -156,6 +156,7 @@ NoBuild | `true` or `false`. Runs tests without rebuilding. ## Use the result of your build 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. - Add a NuGet.Config to your project directory with the following content: @@ -165,7 +166,7 @@ After building ASP.NET Core from source, you will need to install and use your l - + @@ -180,6 +181,5 @@ After building ASP.NET Core from source, you will need to install and use your l ``` - Some features, such as new target frameworks, may require prerelease tooling builds for Visual Studio. These are available in the [Visual Studio Preview](https://www.visualstudio.com/vs/preview/). diff --git a/docs/ProjectProperties.md b/docs/ProjectProperties.md new file mode 100644 index 0000000000..98332931b9 --- /dev/null +++ b/docs/ProjectProperties.md @@ -0,0 +1,8 @@ +Project Properties +================== + +In addition to the standard set of MSBuild properties supported by Microsoft.NET.Sdk, projects in this repo often use these additional properties. + +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. diff --git a/src/AADIntegration/Directory.Build.props b/src/AADIntegration/Directory.Build.props index 1cc732270e..1c968415ec 100644 --- a/src/AADIntegration/Directory.Build.props +++ b/src/AADIntegration/Directory.Build.props @@ -17,4 +17,13 @@ true + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/AADIntegration/Directory.Build.targets b/src/AADIntegration/Directory.Build.targets index 7e3f8df92e..f5a3f65909 100644 --- a/src/AADIntegration/Directory.Build.targets +++ b/src/AADIntegration/Directory.Build.targets @@ -1,6 +1,17 @@ $(MicrosoftNETCoreAppPackageVersion) - $(NETStandardLibrary20PackageVersion) + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + diff --git a/src/AADIntegration/build/repo.props b/src/AADIntegration/build/repo.props index 00a0c65cc2..744ce282f7 100644 --- a/src/AADIntegration/build/repo.props +++ b/src/AADIntegration/build/repo.props @@ -1,6 +1,10 @@ + + false + + diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj index 00a3d36749..1192afae5d 100644 --- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj +++ b/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj @@ -6,6 +6,7 @@ netcoreapp3.0 aspnetcore;authentication;AzureAD true + true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core <_EnableAllInclusiveRazorSdk>true @@ -32,10 +33,10 @@ <_Parameter2>$(BuildNumber) - + - + diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj index c1f77ce905..da8af667f8 100644 --- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj +++ b/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj @@ -6,6 +6,7 @@ netcoreapp3.0 aspnetcore;authentication;AzureADB2C true + true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core <_EnableAllInclusiveRazorSdk>true @@ -32,10 +33,10 @@ <_Parameter2>$(BuildNumber) - + - + diff --git a/src/AzureIntegration/Directory.Build.props b/src/AzureIntegration/Directory.Build.props index f1021ec41a..9a82191584 100644 --- a/src/AzureIntegration/Directory.Build.props +++ b/src/AzureIntegration/Directory.Build.props @@ -18,4 +18,13 @@ $(MSBuildThisFileDirectory)..\Shared\ + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/AzureIntegration/Directory.Build.targets b/src/AzureIntegration/Directory.Build.targets index 7e3f8df92e..f5a3f65909 100644 --- a/src/AzureIntegration/Directory.Build.targets +++ b/src/AzureIntegration/Directory.Build.targets @@ -1,6 +1,17 @@ $(MicrosoftNETCoreAppPackageVersion) - $(NETStandardLibrary20PackageVersion) + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + diff --git a/src/AzureIntegration/build/repo.props b/src/AzureIntegration/build/repo.props index f3a8446fbb..4b07653315 100644 --- a/src/AzureIntegration/build/repo.props +++ b/src/AzureIntegration/build/repo.props @@ -1,6 +1,10 @@ + + false + + $(RepositoryRoot)test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\Microsoft.AspNetCore.AzureAppServices.FunctionalTests.csproj diff --git a/src/AzureIntegration/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj b/src/AzureIntegration/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj index 6ff0419a6f..e971d8aa28 100644 --- a/src/AzureIntegration/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj +++ b/src/AzureIntegration/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj @@ -6,6 +6,7 @@ This site extension installs Microsoft.AspNetCore.All, Microsoft.AspNetCore.App and Microsoft.NetCore.App shared runtimes. aspnetcore;AzureSiteExtension AspNetCoreRuntime.$(TrimmedVersion).$(RuntimeArch) + true diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj index 37da02ef70..fc57aaf3cb 100644 --- a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj +++ b/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj @@ -7,6 +7,7 @@ netcoreapp3.0 true aspnetcore;azure;appservices + true diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj index dd72a33a90..4370120fc2 100644 --- a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj +++ b/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj @@ -7,6 +7,7 @@ true true aspnetcore;azure;appservices + true diff --git a/src/AzureIntegration/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj b/src/AzureIntegration/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj index 4222ec4e2d..21c67cfb14 100644 --- a/src/AzureIntegration/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj +++ b/src/AzureIntegration/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props index 9e1947bcc8..2a06c36124 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -25,4 +25,13 @@ + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/Components/Directory.Build.targets b/src/Components/Directory.Build.targets index 923e244638..da4852969b 100644 --- a/src/Components/Directory.Build.targets +++ b/src/Components/Directory.Build.targets @@ -2,4 +2,16 @@ $(MicrosoftNETCoreAppPackageVersion) + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj index 6ea2234ffb..b8cafaa23a 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj @@ -5,6 +5,7 @@ Exe dotnet-blazor Microsoft.AspNetCore.Blazor.Cli + true Microsoft.AspNetCore.Blazor.Cli.Program false diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/Directory.Build.targets b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/Directory.Build.targets index 6e8eca687c..d69d2a5ba4 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/Directory.Build.targets +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/Directory.Build.targets @@ -1,4 +1,5 @@ + false false diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.csproj index a75bd91785..b5053c4993 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.csproj @@ -1,7 +1,8 @@  - netstandard20 + netstandard2.0 Microsoft.AspNetCore.Blazor.Templates.nuspec + true False False False diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor/Microsoft.AspNetCore.Blazor.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor/Microsoft.AspNetCore.Blazor.csproj index eeb6d02f25..b01c0d97d0 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor/Microsoft.AspNetCore.Blazor.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor/Microsoft.AspNetCore.Blazor.csproj @@ -3,6 +3,7 @@ netstandard2.0 Build client-side single-page applications (SPAs) with Razor Components running under WebAssembly. + true diff --git a/src/Components/build/arcade.props b/src/Components/build/arcade.props index 6f7432c583..f16f0b2bff 100644 --- a/src/Components/build/arcade.props +++ b/src/Components/build/arcade.props @@ -17,7 +17,6 @@ This files is a temporary while this project transitions to using arcade. $(ArtifactsDir)obj\ $(ArtifactsDir)$(Configuration)\ $(ArtifactsConfigurationDir)bin\ - $(ArtifactsDir)build\ diff --git a/src/Components/build/repo.props b/src/Components/build/repo.props index a74cc6e6a9..c10f4f7030 100644 --- a/src/Components/build/repo.props +++ b/src/Components/build/repo.props @@ -1,6 +1,10 @@  + + false + + true diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj index 11aff15c45..276f246bcd 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj @@ -6,6 +6,7 @@ true false Roslyn analyzers for ASP.NET Core Components. + true diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Components.Browser.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Components.Browser.csproj index 9983846c6f..d56001821d 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Components.Browser.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Components.Browser.csproj @@ -3,6 +3,7 @@ netstandard2.0 Support for rendering ASP.NET Core components in browsers. + true diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj index 54c6869845..322bd288d2 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj @@ -5,6 +5,7 @@ Build mechanism for ASP.NET Core Components. Exe true + true diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props b/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props index dae35da3f1..f524d0cc37 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props @@ -25,16 +25,16 @@ - - - - - + + false + + true + TargetFramework + + true diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj index 50cf3cf2a3..b80f261c5c 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj @@ -3,6 +3,7 @@ netstandard2.0 Runtime server features for ASP.NET Core Components. + true diff --git a/src/Components/src/Microsoft.AspNetCore.Components/Microsoft.AspNetCore.Components.csproj b/src/Components/src/Microsoft.AspNetCore.Components/Microsoft.AspNetCore.Components.csproj index bf2746fc61..58295c79da 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components/Microsoft.AspNetCore.Components.csproj @@ -4,6 +4,7 @@ netstandard2.0 Components feature for ASP.NET Core. 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 58167df456..57eb0530a1 100644 --- a/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj +++ b/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj @@ -6,6 +6,7 @@ true aspnetcore;dataprotection;azure;keyvault false + true diff --git a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj index d7042db87a..3d56dbb81f 100644 --- a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj +++ b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj @@ -6,6 +6,7 @@ true true aspnetcore;dataprotection;azure;blob + true diff --git a/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj b/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj index f0713f0ecb..83e6388095 100644 --- a/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj +++ b/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj @@ -6,6 +6,7 @@ true true aspnetcore;dataprotection;entityframeworkcore + true diff --git a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj index a53d924f3c..583b455cbc 100644 --- a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj +++ b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj @@ -6,6 +6,7 @@ true true aspnetcore;dataprotection;redis + true diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj index b543615a88..7c4a0c7419 100644 --- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj +++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;json;jsonpatch + true diff --git a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj index 79a90fbed8..6fcde005e7 100644 --- a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj +++ b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj @@ -16,6 +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 diff --git a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj index 9be08d7d7b..d3efcd102f 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj @@ -46,6 +46,7 @@ $(MSBuildProjectName) provides a default set of APIs for building an ASP.NET Core application. + 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 58bdddfb9a..f309bf0eea 100644 --- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj +++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;hosting;testing + 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 7a2310a6fd..f1cf8b0b9e 100644 --- a/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj +++ b/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore + true diff --git a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj index 354454b384..12a48179a3 100644 --- a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj +++ b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;owin + true diff --git a/src/Identity/Directory.Build.props b/src/Identity/Directory.Build.props index 5a4e9d7eef..3f03503e4d 100644 --- a/src/Identity/Directory.Build.props +++ b/src/Identity/Directory.Build.props @@ -20,4 +20,13 @@ $(MSBuildThisFileDirectory)..\Shared\ + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/Identity/Directory.Build.targets b/src/Identity/Directory.Build.targets index 7e3f8df92e..f5a3f65909 100644 --- a/src/Identity/Directory.Build.targets +++ b/src/Identity/Directory.Build.targets @@ -1,6 +1,17 @@ $(MicrosoftNETCoreAppPackageVersion) - $(NETStandardLibrary20PackageVersion) + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + diff --git a/src/Identity/build/repo.props b/src/Identity/build/repo.props index 00a0c65cc2..744ce282f7 100644 --- a/src/Identity/build/repo.props +++ b/src/Identity/build/repo.props @@ -1,6 +1,10 @@ + + false + + diff --git a/src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj index 69565262fb..5d20f316e2 100644 --- a/src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj +++ b/src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj @@ -5,6 +5,7 @@ netcoreapp3.0 true aspnetcore;entityframeworkcore;identity;membership + true diff --git a/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj index 22a7b552f9..0c8446af4d 100644 --- a/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj +++ b/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj @@ -5,6 +5,7 @@ netcoreapp3.0 true aspnetcore;identity;membership + true diff --git a/src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj index 6f79a1e4bb..8cefb6242d 100644 --- a/src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj @@ -1,11 +1,12 @@  - + ASP.NET Core Identity UI is the default Razor Pages built-in UI for the ASP.NET Core Identity framework. Compiled Razor views assembly for the ASP.NET Core Identity UI package. netcoreapp3.0 true aspnetcore;identity;membership;razorpages + true true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core false @@ -26,7 +27,7 @@ - + @@ -38,7 +39,7 @@ - + diff --git a/src/Installers/Archive/Archive.Redist.zipproj b/src/Installers/Archive/Archive.Redist.zipproj index ede7d4a7f7..ac9d504534 100644 --- a/src/Installers/Archive/Archive.Redist.zipproj +++ b/src/Installers/Archive/Archive.Redist.zipproj @@ -16,6 +16,12 @@ dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFxRid)$(ArchiveExtension) $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppPackageVersion)/$(DotNetRuntimeArchiveFileName) $(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName) + + aspnetcore_base_runtime.version + $(OutputPath)$(BaseRuntimeVersionFileName) + + aspnetcore-runtime-$(SharedFxRid)-version-badge.svg + $(OutputPath)$(SvgBadgeFileName) @@ -29,9 +35,43 @@ - + + + + + + + + version + $(PackageVersion) + #007EC6 + $([MSBuild]::Add(56, $([MSBuild]::Multiply($(PackageVersion.Length), 6.67)))) + + + + + + + + $(SvgBadgeLabel) + $(SvgBadgeLabel) + $(SvgBadgeValue) + $(SvgBadgeValue) + + +]]> + + + + + + + AspNetCoreRuntime.$(TrimmedVersion).$(SharedFxArchitecture) true $(RepositoryRoot)obj\ar\$(SharedFxRid)\ + true @@ -48,4 +49,4 @@ - \ No newline at end of file + diff --git a/src/JavaScriptServices/Directory.Build.props b/src/JavaScriptServices/Directory.Build.props index eaf3f3cfaa..aa926e10c0 100644 --- a/src/JavaScriptServices/Directory.Build.props +++ b/src/JavaScriptServices/Directory.Build.props @@ -12,4 +12,14 @@ true true + + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/JavaScriptServices/Directory.Build.targets b/src/JavaScriptServices/Directory.Build.targets index 7e3f8df92e..f5a3f65909 100644 --- a/src/JavaScriptServices/Directory.Build.targets +++ b/src/JavaScriptServices/Directory.Build.targets @@ -1,6 +1,17 @@ $(MicrosoftNETCoreAppPackageVersion) - $(NETStandardLibrary20PackageVersion) + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + diff --git a/src/JavaScriptServices/build/repo.props b/src/JavaScriptServices/build/repo.props index 00a0c65cc2..744ce282f7 100644 --- a/src/JavaScriptServices/build/repo.props +++ b/src/JavaScriptServices/build/repo.props @@ -1,6 +1,10 @@ + + false + + diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 742aa3faa4..ac9d2e87e8 100644 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -3,6 +3,7 @@ Invoke Node.js modules at runtime in ASP.NET Core applications. netcoreapp3.0 + true diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj index e263efb93e..e0abc18d6c 100644 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj +++ b/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/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/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 0b0cfe2f3a..810aed0625 100644 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -3,6 +3,7 @@ Helpers for building single-page applications on ASP.NET MVC Core. netcoreapp3.0 + true 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 1f3d40ab64..bdf570e00d 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;diagnostics;entityframeworkcore + 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 6b59175d82..2531c795a8 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,6 +8,7 @@ $(NoWarn);CS1591 true diagnostics;healthchecks;entityframeworkcore + 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 c5bec0395a..e9aec8c771 100644 --- a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj +++ b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;diagnostics + true diff --git a/src/MusicStore/build/repo.props b/src/MusicStore/build/repo.props index 6b9aec60b8..738780b26d 100644 --- a/src/MusicStore/build/repo.props +++ b/src/MusicStore/build/repo.props @@ -1,6 +1,10 @@  + + false + + diff --git a/src/Mvc/Directory.Build.props b/src/Mvc/Directory.Build.props index f6dd751dff..f8f26e3f63 100644 --- a/src/Mvc/Directory.Build.props +++ b/src/Mvc/Directory.Build.props @@ -19,4 +19,13 @@ $(MSBuildThisFileDirectory)..\Shared\ + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/Mvc/Directory.Build.targets b/src/Mvc/Directory.Build.targets index 7a09b207eb..f5a3f65909 100644 --- a/src/Mvc/Directory.Build.targets +++ b/src/Mvc/Directory.Build.targets @@ -2,4 +2,16 @@ $(MicrosoftNETCoreAppPackageVersion) + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + diff --git a/src/Mvc/build/repo.props b/src/Mvc/build/repo.props index 4a6cc42c99..2e58a82120 100644 --- a/src/Mvc/build/repo.props +++ b/src/Mvc/build/repo.props @@ -1,6 +1,10 @@ + + false + + 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 7e796c0673..ebb82309cd 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,6 +2,7 @@ CSharp Analyzers for ASP.NET Core MVC. aspnetcore;aspnetcoremvc + 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 97ec69ad41..b155fac341 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,6 +2,7 @@ CSharp Analyzers for ASP.NET Core MVC. aspnetcore;aspnetcoremvc + true netstandard1.3 false 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 83c53ddb69..275552fbb8 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,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;aspnetcoremvc;aspnetcoremvctesting + 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 1a648b1f93..6200c827ca 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,6 +15,7 @@ $(MSBuildProjectName).nuspec $(MSBuildProjectName) Build Tasks;MSBuild;Swagger;Open API;code generation; Web API client + true $(ExperimentalPackageVersion) $(AssemblyName) netstandard2.0;net461 diff --git a/src/PackageArchive/Archive.props b/src/PackageArchive/Archive.props index d7d933bf58..2da1d26e3a 100644 --- a/src/PackageArchive/Archive.props +++ b/src/PackageArchive/Archive.props @@ -7,5 +7,7 @@ netcoreapp3.0 + + $(InstallersOutputPath) diff --git a/src/Razor/Directory.Build.props b/src/Razor/Directory.Build.props index fc7aabfa0e..2e24e9518b 100644 --- a/src/Razor/Directory.Build.props +++ b/src/Razor/Directory.Build.props @@ -23,4 +23,13 @@ + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/Razor/Directory.Build.targets b/src/Razor/Directory.Build.targets index 4bcc9df925..c73225cc3f 100644 --- a/src/Razor/Directory.Build.targets +++ b/src/Razor/Directory.Build.targets @@ -1,8 +1,17 @@ $(MicrosoftNETCoreApp30PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + diff --git a/src/Razor/build/repo.props b/src/Razor/build/repo.props index 58a02ecf2f..99b418cc36 100644 --- a/src/Razor/build/repo.props +++ b/src/Razor/build/repo.props @@ -1,6 +1,10 @@ + + false + + 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 2f939bcf4f..ed95ec1799 100644 --- a/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj +++ b/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security + 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 dd5a32be3a..1572906303 100644 --- a/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj +++ b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security + 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 d7726e2ebf..7869e63d96 100644 --- a/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj +++ b/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security + 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 02c8054f80..40113b1a75 100644 --- a/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj +++ b/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security + 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 94619e53d7..72106df001 100644 --- a/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj +++ b/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj @@ -5,9 +5,9 @@ netcoreapp3.0 true aspnetcore;authentication;security + true - diff --git a/src/ServerTests/build/repo.props b/src/ServerTests/build/repo.props index 9cfb4ee513..182d6778c8 100644 --- a/src/ServerTests/build/repo.props +++ b/src/ServerTests/build/repo.props @@ -1,6 +1,10 @@ + + false + + 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 5546aef7b8..8ce855f807 100644 --- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj +++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj @@ -6,6 +6,7 @@ true aspnetcore CS1591;$(NoWarn) + true diff --git a/src/Servers/IIS/build/repo.props b/src/Servers/IIS/build/repo.props index a859fa8cac..7397809756 100644 --- a/src/Servers/IIS/build/repo.props +++ b/src/Servers/IIS/build/repo.props @@ -1,6 +1,11 @@ + + + false + + true diff --git a/src/Servers/IIS/build/repo.targets b/src/Servers/IIS/build/repo.targets index 9785c82fdf..12023b84c4 100644 --- a/src/Servers/IIS/build/repo.targets +++ b/src/Servers/IIS/build/repo.targets @@ -36,8 +36,8 @@ - $(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg - $(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg + $(ProductPackageOutputPath)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg + $(ProductPackageOutputPath)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg @@ -74,13 +74,13 @@ OutputPath="$(AspNetCoreModuleV2PropsOutputFile)" /> 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 b7b4f6d53e..c2a4ab39aa 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,6 +7,7 @@ aspnetcore;kestrel true CS1591;$(NoWarn) + true diff --git a/src/SignalR/Directory.Build.props b/src/SignalR/Directory.Build.props index c02d5445b4..7240ddea80 100644 --- a/src/SignalR/Directory.Build.props +++ b/src/SignalR/Directory.Build.props @@ -18,4 +18,14 @@ latest $(MSBuildThisFileDirectory)..\Shared\ + + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/SignalR/Directory.Build.targets b/src/SignalR/Directory.Build.targets index 923e244638..da4852969b 100644 --- a/src/SignalR/Directory.Build.targets +++ b/src/SignalR/Directory.Build.targets @@ -2,4 +2,16 @@ $(MicrosoftNETCoreAppPackageVersion) + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + diff --git a/src/SignalR/build/repo.props b/src/SignalR/build/repo.props index 6bc7995c6f..c61bb25768 100644 --- a/src/SignalR/build/repo.props +++ b/src/SignalR/build/repo.props @@ -1,6 +1,10 @@  + + false + + true diff --git a/src/SignalR/build/repo.targets b/src/SignalR/build/repo.targets index a307f480d4..8fd6e3373c 100644 --- a/src/SignalR/build/repo.targets +++ b/src/SignalR/build/repo.targets @@ -11,6 +11,8 @@ + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)..\..\..\artifacts\$(Configuration)\packages\product\')) + -PpackageVersion="$(JavaPackageVersion)" @@ -83,7 +85,7 @@ $([System.IO.Path]::Combine(%(NPMPackage.FullPath), 'package.json')) $([System.IO.Path]::Combine(%(NPMPackage.FullPath), '%(NPMPackage.TarName)-$(PackageVersion).tgz')) - $([System.IO.Path]::Combine($(BuildDir), '%(NPMPackage.TarName)-$(PackageVersion).tgz')) + $([System.IO.Path]::Combine($(ProductPackageOutputPath), '%(NPMPackage.TarName)-$(PackageVersion).tgz')) @@ -101,19 +103,19 @@ - + JavaJar $(JavaClientVersion) ship - + MavenPOM $(JavaClientVersion) ship - - + + @@ -174,7 +176,7 @@ - + diff --git a/src/SignalR/src/Microsoft.AspNetCore.Http.Connections.Client/Microsoft.AspNetCore.Http.Connections.Client.csproj b/src/SignalR/src/Microsoft.AspNetCore.Http.Connections.Client/Microsoft.AspNetCore.Http.Connections.Client.csproj index 8a018490d4..45c82df1d8 100644 --- a/src/SignalR/src/Microsoft.AspNetCore.Http.Connections.Client/Microsoft.AspNetCore.Http.Connections.Client.csproj +++ b/src/SignalR/src/Microsoft.AspNetCore.Http.Connections.Client/Microsoft.AspNetCore.Http.Connections.Client.csproj @@ -3,6 +3,7 @@ Client for ASP.NET Core Connection Handlers netstandard2.0;netcoreapp3.0 + true diff --git a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj index 2557d6e233..07f74757ea 100644 --- a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj +++ b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj @@ -4,6 +4,7 @@ Client for ASP.NET Core SignalR netstandard2.0 Microsoft.AspNetCore.SignalR.Client + true diff --git a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj index ed9c13e792..55d3d76492 100644 --- a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj +++ b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj @@ -3,6 +3,7 @@ Client for ASP.NET Core SignalR netstandard2.0 + true diff --git a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj index 6e1fb9d892..7087f4e017 100644 --- a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj @@ -5,6 +5,7 @@ netstandard2.0;netcoreapp3.0 Microsoft.AspNetCore.SignalR true + true diff --git a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj index f92a2c9aad..a98eef9bfc 100644 --- a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj +++ b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj @@ -5,6 +5,7 @@ netstandard2.0 Microsoft.AspNetCore.SignalR true + true diff --git a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj index ada3fdadb3..a3ba4f2108 100644 --- a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj +++ b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj @@ -5,6 +5,7 @@ netstandard2.0 Microsoft.AspNetCore.SignalR true + true diff --git a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Specification.Tests/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Specification.Tests/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj index 7cb0c7c64c..e7835cdbf5 100644 --- a/src/SignalR/src/Microsoft.AspNetCore.SignalR.Specification.Tests/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj +++ b/src/SignalR/src/Microsoft.AspNetCore.SignalR.Specification.Tests/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj @@ -3,6 +3,7 @@ Tests for users to verify their own implementations of SignalR types netcoreapp3.0 + true diff --git a/src/SignalR/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj b/src/SignalR/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj index 45ff7d501b..8cb03a97f8 100644 --- a/src/SignalR/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj +++ b/src/SignalR/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj @@ -3,6 +3,7 @@ Provides scale-out support for ASP.NET Core SignalR using a Redis server and the StackExchange.Redis client. netcoreapp3.0 + true diff --git a/src/Templating/Directory.Build.props b/src/Templating/Directory.Build.props index 961a62f191..43c79d4f60 100644 --- a/src/Templating/Directory.Build.props +++ b/src/Templating/Directory.Build.props @@ -16,6 +16,15 @@ $(MSBuildThisFileDirectory)..\Shared\ + + + $(MSBuildThisFileDirectory)..\..\artifacts\ + $(ArtifactsDir)$(Configuration)\ + $(ArtifactsConfigurationDir)packages\ + $(BasePackageOutputPath)product\ + $(BasePackageOutputPath)internal\ + + diff --git a/src/Templating/Directory.Build.targets b/src/Templating/Directory.Build.targets index 0863fc67a8..c73225cc3f 100644 --- a/src/Templating/Directory.Build.targets +++ b/src/Templating/Directory.Build.targets @@ -1,8 +1,17 @@ $(MicrosoftNETCoreApp30PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 - \ No newline at end of file + + + + false + + $(ProductPackageOutputPath) + $(InternalPackageOutputPath) + + + diff --git a/src/Templating/build/repo.props b/src/Templating/build/repo.props index 9fce48972f..0dcc5a7de2 100644 --- a/src/Templating/build/repo.props +++ b/src/Templating/build/repo.props @@ -1,6 +1,10 @@ + + false + + diff --git a/src/Templating/src/Directory.Build.props b/src/Templating/src/Directory.Build.props index 03608a0aa8..fbd5ab84f5 100644 --- a/src/Templating/src/Directory.Build.props +++ b/src/Templating/src/Directory.Build.props @@ -15,7 +15,6 @@ true - $(MSBuildThisFileDirectory)..\artifacts\build\ 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 c78ecd9774..9c3e04798e 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,6 +6,7 @@ To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. + 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 3476cedd61..609e42dc46 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,6 +5,7 @@ Web File Templates for Microsoft Template Engine To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. + 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 d776b66fd7..b03a13c938 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,6 +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 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 060d541e11..19a07f29d5 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,6 +8,7 @@ To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. $(PackageTags);spa + true