diff --git a/Directory.Build.props b/Directory.Build.props
index e9b788e01dd321dd446653f6a7338851cee0f2ac..a33ef67d4f4837b45360c31b6e95663de5227d43 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -154,6 +154,8 @@
<Import Project="eng\Dependencies.props" />
<Import Project="eng\PatchConfig.props" />
<Import Project="eng\ProjectReferences.props" />
+ <Import Project="eng\SharedFramework.Local.props" />
+ <Import Project="eng\SharedFramework.External.props" />
<Import Project="eng\targets\Cpp.Common.props" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
<Import Project="eng\targets\CSharp.Common.props" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
<Import Project="eng\targets\Wix.Common.props" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
diff --git a/build/SharedFrameworkOnly.props b/build/SharedFrameworkOnly.props
deleted file mode 100644
index 58f688c67845176ca1863590241d585a2ede6872..0000000000000000000000000000000000000000
--- a/build/SharedFrameworkOnly.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- This lists all assemblies which are part of the Microsoft.AspNetCore.App shared framework
- and should not ship as NuGet packages.
--->
-<Project>
-
- <Import Project="..\src\Framework\Microsoft.AspNetCore.App.props" />
-
- <ItemGroup>
- <!-- Packages to be removed from the shared framework but not done yet due to JSON.net dependency. -->
- <SharedFrameworkAndPackage Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" />
-
- <!-- Assemblies required by components and WebAssembly -->
- <SharedFrameworkAndPackage Include="Microsoft.AspNetCore.Components" />
- <SharedFrameworkAndPackage Include="Microsoft.AspNetCore.Components.Browser" />
-
- <!-- Assemblies required by the SignalR client. -->
- <SharedFrameworkAndPackage Include="Microsoft.AspNetCore.Http.Features" />
- <SharedFrameworkAndPackage Include="Microsoft.AspNetCore.SignalR.Common" />
- <SharedFrameworkAndPackage Include="Microsoft.AspNetCore.Connections.Abstractions" />
- <SharedFrameworkAndPackage Include="Microsoft.AspNetCore.Http.Connections.Common" />
-
- <SharedFrameworkOnlyPackage Include="@(Dependency)" Exclude="@(SharedFrameworkAndPackage);@(ExternalDependency)" />
- </ItemGroup>
-
-</Project>
diff --git a/build/repo.props b/build/repo.props
index b8a6ec4e6e7f453c6322c0388b61f2f55028f8fe..588fc15d8475e600a46cb7a026c2a593a5b890bb 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -1,6 +1,4 @@
<Project>
- <Import Project="SharedFrameworkOnly.props" />
-
<PropertyGroup>
<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
</PropertyGroup>
@@ -180,6 +178,8 @@
</Choose>
<Import Project="..\eng\Versions.props" />
+ <Import Project="..\eng\SharedFramework.Local.props" />
+ <Import Project="..\eng\SharedFramework.External.props" />
<Import Project="runtimes.props" />
<Import Project="CodeSign.props" />
</Project>
diff --git a/build/repo.targets b/build/repo.targets
index ae6bd42c1272be97c71f45d099d440472f7c20d0..eaf4a9fb1fa5ed3870f23814db4e1a7f5396cddf 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -67,6 +67,11 @@
<Output TaskParameter="TargetOutputs" ItemName="_ProjectReferenceProvider"/>
</MSBuild>
+ <ItemGroup>
+ <_SharedFrameworkAndPackageRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsShippingPackage', 'true')->Distinct())" />
+ <_SharedFrameworkRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsShippingPackage', 'false')->Distinct())" />
+ </ItemGroup>
+
<PropertyGroup>
<ProjectListFile>$(MSBuildThisFileDirectory)..\eng\ProjectReferences.props</ProjectListFile>
<ProjectListContent>
@@ -86,6 +91,32 @@
</PropertyGroup>
<WriteLinesToFile File="$(ProjectListFile)" Lines="$(ProjectListContent)" Overwrite="true" />
+
+ <PropertyGroup>
+ <SharedFxDepList>$(MSBuildThisFileDirectory)..\eng\SharedFramework.Local.props</SharedFxDepList>
+ <SharedFxDepListContent>
+ <![CDATA[
+<!--
+ This file is automatically generated. Run `./eng/scripts/GenerateProjectList.ps1` to update.
+
+ This file contains a complete list of the assemblies which are part of the shared framework.
+
+ This project is generated using the <IsAspNetCoreApp> and <IsShippingPackage> properties from each .csproj in this repository.
+-->
+<Project>
+ <ItemGroup>
+ <!-- These assemblies are available as both a NuGet package and in the shared framework -->
+ @(_SharedFrameworkAndPackageRef->'<AspNetCoreAppReferenceAndPackage Include="%(Identity)" />', '%0A ')
+
+ <!-- These assemblies are only in the shared framework -->
+ @(_SharedFrameworkRef->'<AspNetCoreAppReference Include="%(Identity)" />', '%0A ')
+ </ItemGroup>
+</Project>
+ ]]>
+ </SharedFxDepListContent>
+ </PropertyGroup>
+
+ <WriteLinesToFile File="$(SharedFxDepList)" Lines="$(SharedFxDepListContent)" Overwrite="true" />
</Target>
<!-- This is temporary until we can use FrameworkReference to build our own packages. -->
@@ -97,7 +128,7 @@
<RepoTasks.RemoveSharedFrameworkDependencies Condition="@(_BuildOutput->Count()) != 0"
Files="@(_BuildOutput)"
- FrameworkOnlyPackages="@(SharedFrameworkOnlyPackage)" />
+ FrameworkOnlyPackages="@(AspNetCoreAppReference)" />
</Target>
<Target Name="GenerateBuildAssetManifest">
diff --git a/docs/ProjectProperties.md b/docs/ProjectProperties.md
index fe5bba6bafcc3f9a85c82ac02c55f1c9e1efe26b..939c7c8bcd5f58f060a1a1bc53549d8ef818fd5c 100644
--- a/docs/ProjectProperties.md
+++ b/docs/ProjectProperties.md
@@ -6,3 +6,4 @@ In addition to the standard set of MSBuild properties supported by Microsoft.NET
Property name | Meaning
-------------------|--------------------------------------------------------------------------------------------
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.
+IsAspNetCoreApp | Set to `true` when the assembly is part of the [Microsoft.AspNetCore.App shared framework](./SharedFramework.md)
\ No newline at end of file
diff --git a/docs/SharedFramework.md b/docs/SharedFramework.md
index b24cde5706a4534afa7c030a9a044221e9e3d386..fa8721506148045c06f3086e590dfa939bc4c551 100644
--- a/docs/SharedFramework.md
+++ b/docs/SharedFramework.md
@@ -7,7 +7,7 @@ Guidance on developing the ASP.NET Core shared framework (`Microsoft.AspNetCore.
The ASP.NET Core shared framework contains assemblies that are fully developed, supported, and serviceable by Microsoft. You can think of this as constituting the ASP.NET Core *platform*. As such, all assemblies which are included in the shared framework are expected to meet specific requirements. Here are the principles we are using to guide our decisions about what is allowed in the shared framework.
-* Breaking changes are highly discouraged. Therefore,
+* Breaking changes are highly discouraged. Therefore,
* If it's in, it must be broadly useful and expected to be supported for at least several years.
* The API for all assemblies in shared framework MUST NOT make breaking changes in patch or minor releases.
* The complete closure of all assemblies must be in the shared framework, or must be in the "base framework", Microsoft.NETCore.App
@@ -19,3 +19,12 @@ The ASP.NET Core shared framework contains assemblies that are fully developed,
* API we believe is essential for central experiences in .NET Core should be in the shared framework
* Examples of central experiences: MVC, Kestrel, Razor, SignalR
* New API can ship as out-of-band packages first, and move into the base framework later when it meets these standards
+
+### How to adjust what is in the shared framework
+
+The contents of the shared framework are defined in two ways:
+
+* [src/Framework/LocalDependencies.props](/src/Framework/LocalDependencies.props) - this file is generated from the .csproj files in this repo
+ by looking for projects which have set `<IsAspNetCoreApp>true</IsAspNetCoreApp>`.
+* [src/Framework/Microsoft.AspNetCore.App.props](/src/Framework/Microsoft.AspNetCore.App.props) - this file lists all assemblies shipped
+ in Microsoft.AspNetCore.App which are built by source code found in other repositories.
\ No newline at end of file
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 88323dff63f9410ba9ae3ad1c58818c2f1c97b4e..841d7a086d548cd9f00bec5ce7a12760b9cd2dd6 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -134,17 +134,13 @@ and are generated based on the last package release.
<LatestPackageReference Include="StackExchange.Redis" Version="$(StackExchangeRedisPackageVersion)" />
<LatestPackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
<LatestPackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
- <LatestPackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsPackageVersion)" />
<LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
- <LatestPackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<LatestPackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
<LatestPackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtPackageVersion)" />
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
- <LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
<LatestPackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
<LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
- <LatestPackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsPackageVersion)" />
<LatestPackageReference Include="System.Reactive.Linq" Version="$(SystemReactiveLinqPackageVersion)" />
<LatestPackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props
new file mode 100644
index 0000000000000000000000000000000000000000..3d3f44d186b80d31f5aec26f5851a013dac5ba1f
--- /dev/null
+++ b/eng/SharedFramework.External.props
@@ -0,0 +1,105 @@
+<!--
+
+ This lists all assemblies which are part of the Microsoft.AspNetCore.App shared framework
+ and are built as packages in another repo.
+
+-->
+<Project>
+
+ <ItemGroup>
+ <!-- Dependencies from aspnet/Extensions -->
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="$(MicrosoftExtensionsConfigurationKeyPerFilePackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.EventSource" Version="$(MicrosoftExtensionsLoggingEventSourcePackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.TraceSource" Version="$(MicrosoftExtensionsLoggingTraceSourcePackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="Microsoft.JSInterop" Version="$(MicrosoftJSInteropPackageVersion)" />
+
+ <!-- Dependencies from dotnet/corefx -->
+ <ExternalAspNetCoreAppReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+ <ExternalAspNetCoreAppReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" />
+
+ <!-- Dependencies from dotnet/core-setup -->
+ <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+
+ <!--
+ Transitive dependencies of other assemblies in the shared framework. These are listed separately and should not be included directly
+ when setting `<Reference>`. These are listed for the purpose of tests and servicing builds only.
+
+ If implementation details change and these assemblies are no longer showing up in the shared framework as a result of that,
+ it is okay to remove these transitive dependencies.
+
+ If these are needed as direct dependencies, it is okay to change them to ExternalAspNetCoreAppReference and move up into sections above.
+ -->
+ <_TransitiveExternalAspNetCoreAppReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
+ <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup Condition=" '$(IsServicingBuild)' == 'true' ">
+ <!--
+ Once we start to build a servicing release, hoist transitive dependencies to be direct dependencies.
+ This will help us ensure servicing builds carry the latest versions of dependencies, even if we aren't rebuilding
+ the original direct dependency that pulled in the transitive reference.
+ -->
+ <ExternalAspNetCoreAppReference Include="@(_TransitiveExternalAspNetCoreAppReference)" />
+ </ItemGroup>
+
+ <!--
+ These compilation references are necessary to compile netstandard2.0 assemblies which are in the shared framework.
+ This references are part of Microsoft.NETCore.App, so are listed here as references to be used during compilation only.
+ -->
+ <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+ <_CompilationOnlyReference Include="System.Buffers" />
+ </ItemGroup>
+
+ <!--
+ These compilation references are necessary to workaround the mismatch of what is found in the ref pack for NETCore.App and what
+ is actually present at runtime. See https://github.com/dotnet/corefx/issues/34906
+ -->
+ <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+ <_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
+ <_CompilationOnlyReference Include="System.Security.Cryptography.Cng" />
+ <_CompilationOnlyReference Include="System.Security.Principal.Windows" />
+ </ItemGroup>
+
+</Project>
diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props
new file mode 100644
index 0000000000000000000000000000000000000000..4907c5f4338da36a85b9d6b4ad42fdc3a13af5fe
--- /dev/null
+++ b/eng/SharedFramework.Local.props
@@ -0,0 +1,91 @@
+<!--
+ This file is automatically generated. Run `./eng/scripts/GenerateProjectList.ps1` to update.
+
+ This file contains a complete list of the assemblies which are part of the shared framework.
+
+ This project is generated using the <IsAspNetCoreApp> and <IsShippingPackage> properties from each .csproj in this repository.
+-->
+<Project>
+ <ItemGroup>
+ <!-- These assemblies are available as both a NuGet package and in the shared framework -->
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Features" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Connections.Abstractions" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Connections.Common" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Common" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components.Browser" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components" />
+
+ <!-- These assemblies are only in the shared framework -->
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Cryptography.Internal" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.DataProtection" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Antiforgery" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Hosting" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Authentication.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Authentication.Core" />
+ <AspNetCoreAppReference Include="Microsoft.Net.Http.Headers" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Http.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Http.Extensions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Http" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Routing.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Routing" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.WebUtilities" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Html.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Identity" />
+ <AspNetCoreAppReference Include="Microsoft.Extensions.Identity.Core" />
+ <AspNetCoreAppReference Include="Microsoft.Extensions.Identity.Stores" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.HttpSys" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.IIS" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.Kestrel" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Authentication" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Authentication.OAuth" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Authorization" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Authorization.Policy" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.CookiePolicy" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Cors" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Diagnostics" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.HostFiltering" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.HttpOverrides" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.HttpsPolicy" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Localization.Routing" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Localization" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.ResponseCaching" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.ResponseCompression" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Rewrite" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Session" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.StaticFiles" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.WebSockets" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Razor.Runtime" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Razor" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Abstractions" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.ApiExplorer" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Core" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Cors" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Localization" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.RazorPages" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Razor" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.Http.Connections" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.SignalR.Core" />
+ <AspNetCoreAppReference Include="Microsoft.AspNetCore.SignalR" />
+ </ItemGroup>
+</Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ccca0f73cded5916f9d015eb1cce264e92bd4b09..d23e550a66f75c079a19c8acc2720854294d1e67 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -289,18 +289,10 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>c38c10d28e223aeea2f363a6ef0bf4a63d00a776</Sha>
</Dependency>
- <Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-preview.19106.2">
- <Uri>https://github.com/dotnet/corefx</Uri>
- <Sha>c38c10d28e223aeea2f363a6ef0bf4a63d00a776</Sha>
- </Dependency>
<Dependency Name="System.Data.SqlClient" Version="4.7.0-preview.19106.2">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>c38c10d28e223aeea2f363a6ef0bf4a63d00a776</Sha>
</Dependency>
- <Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview.19106.2">
- <Uri>https://github.com/dotnet/corefx</Uri>
- <Sha>c38c10d28e223aeea2f363a6ef0bf4a63d00a776</Sha>
- </Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview.19106.2">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>c38c10d28e223aeea2f363a6ef0bf4a63d00a776</Sha>
@@ -317,10 +309,6 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>c38c10d28e223aeea2f363a6ef0bf4a63d00a776</Sha>
</Dependency>
- <Dependency Name="System.Numerics.Vectors" Version="4.6.0-preview.19106.2">
- <Uri>https://github.com/dotnet/corefx</Uri>
- <Sha>c38c10d28e223aeea2f363a6ef0bf4a63d00a776</Sha>
- </Dependency>
<Dependency Name="System.Reflection.Metadata" Version="1.7.0-preview.19106.2">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>c38c10d28e223aeea2f363a6ef0bf4a63d00a776</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 22f4977dc5e22c72a079560c1c0c5593349c0b9d..7652805fe6944d5349ef5c12d08dde28529ad684 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -25,14 +25,11 @@
<MicrosoftBclJsonSourcesPackageVersion>4.6.0-preview.19106.2</MicrosoftBclJsonSourcesPackageVersion>
<MicrosoftCSharpPackageVersion>4.6.0-preview.19106.2</MicrosoftCSharpPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview.19106.2</MicrosoftWin32RegistryPackageVersion>
- <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview.19106.2</SystemComponentModelAnnotationsPackageVersion>
<SystemDataSqlClientPackageVersion>4.7.0-preview.19106.2</SystemDataSqlClientPackageVersion>
- <SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview.19106.2</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview.19106.2</SystemDiagnosticsEventLogPackageVersion>
<SystemIOPipelinesPackageVersion>4.6.0-preview.19106.2</SystemIOPipelinesPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.6.0-preview.19106.2</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0-preview.19106.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
- <SystemNumericsVectorsPackageVersion>4.6.0-preview.19106.2</SystemNumericsVectorsPackageVersion>
<SystemReflectionMetadataPackageVersion>1.7.0-preview.19106.2</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview.19106.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.6.0-preview.19106.2</SystemSecurityCryptographyCngPackageVersion>
@@ -136,7 +133,6 @@
<!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
<SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
<SystemCodeDomPackageVersion>4.4.0</SystemCodeDomPackageVersion>
- <SystemMemoryPackageVersion>4.5.2</SystemMemoryPackageVersion>
<SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
<!-- Packages developed by @aspnet, but manually updated as necessary. -->
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 149ec438222a0e0a17969c24e22a1ec6e4d018df..c397c09ded1116d18fc291595a171b918e397400 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -58,6 +58,18 @@
<_UnusedProjectReferenceProvider Include="@(ProjectReferenceProvider)" Exclude="@(Reference)" />
+ <_CompilationOnlyReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="@(Reference->WithMetadataValue('NuGetPackageId','NETStandard.Library'))" />
+
+ <_InvalidReferenceToNonSharedFxAssembly Condition="'$(IsAspNetCoreApp)' == 'true'"
+ Include="@(Reference)"
+ Exclude="
+ Newtonsoft.Json;
+ @(AspNetCoreAppReference);
+ @(AspNetCoreAppReferenceAndPackage);
+ @(ExternalAspNetCoreAppReference);
+ @(_CompilationOnlyReference)" />
+ <!-- TODO: remove Newtonsoft.Json from this list once https://github.com/aspnet/AspNetCore/issues/4260 is resolved -->
+
<!--
Turn Reference items into a ProjectReference when UseProjectReferences is true.
Order matters. This comes before package resolution because projects should be used when possible instead of packages.
@@ -75,6 +87,27 @@
<Reference Remove="@(Reference)" />
</ItemGroup>
+ <ItemDefinitionGroup>
+ <Reference>
+ <SharedSources>false</SharedSources>
+ </Reference>
+ </ItemDefinitionGroup>
+
+ <!--
+ This target resolves remaining Referene items to Packages, if possible. If not, they are left as Reference items fo the SDK to resolve.
+ This target helps ensure projects within the shared framework do no unintentionally add new references,
+ and that assemblies outside the shared framework reference the framework as a whole instead of using
+ individual assemblies.
+ -->
+ <Target Name="_CheckForReferenceBoundaries" BeforeTargets="CollectPackageReferences;ResolveReferences">
+
+ <Error Condition="@(_InvalidReferenceToSharedFxOnlyAssembly->Count()) != 0"
+ Text="Cannot reference "%(_InvalidReferenceToSharedFxOnlyAssembly.Identity)" directly because it is part of the shared framework and this project is not. Use <FrameworkReference Include="Microsoft.AspNetCore.App" /> instead." />
+
+ <Error Condition="@(_InvalidReferenceToNonSharedFxAssembly->Count()) != 0 AND '%(_InvalidReferenceToNonSharedFxAssembly.SharedSources)' != 'true'"
+ Text="Cannot reference "%(_InvalidReferenceToNonSharedFxAssembly.Identity)". This dependency is not in the shared framework. See docs/SharedFramework.md for instructions on how to modify what is in the shared framework." />
+ </Target>
+
<!--
This target resolves remaining Referene items to Packages, if possible. If not, they are left as Reference items fo the SDK to resolve.
This executes on NuGet restore and during DesignTimeBuild. It should not run in the outer, cross-targeting build.
@@ -84,6 +117,12 @@
<Reference Include="@(_ReferenceTemp)" />
<_ReferenceTemp Remove="@(_ReferenceTemp)" />
+ <!-- Ensure only content asset are consumed from .Sources packages -->
+ <Reference>
+ <IncludeAssets Condition="'%(SharedSources)' == 'true'">ContentFiles</IncludeAssets>
+ <PrivateAssets Condition="'%(SharedSources)' == 'true'">All</PrivateAssets>
+ </Reference>
+
<!-- Identify if any references were present in the last release of this package, but have been removed. -->
<UnusedBaselinePackageReference Include="@(BaselinePackageReference)" Exclude="@(Reference);@(_ProjectReferenceByAssemblyName);@(PackageReference)" />
@@ -165,6 +204,8 @@
<Target Name="_GetReferencesProvided" Returns="@(ProvidesReference)">
<ItemGroup Condition=" '$(IsProjectReferenceProvider)' == 'true' ">
<ProvidesReference Include="$(AssemblyName)">
+ <IsAspNetCoreApp>$([MSBuild]::ValueOrDefault($(IsAspNetCoreApp),'false'))</IsAspNetCoreApp>
+ <IsShippingPackage>$([MSBuild]::ValueOrDefault($(IsShippingPackage),'false'))</IsShippingPackage>
<ProjectFileRelativePath>$([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectFullPath)))</ProjectFileRelativePath>
</ProvidesReference>
</ItemGroup>
diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj
index a157b130ccdfa19da86c39577125dce9b500e55f..c34c52157b7161547941c7ffa40e352b28302a9c 100644
--- a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj
+++ b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>An antiforgery system for ASP.NET Core designed to generate and validate tokens to prevent Cross-Site Request Forgery attacks.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;antiforgery</PackageTags>
diff --git a/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj b/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj
index b203e931a2f6a234281f7a2b8c548b5d1a773881..b1e7c3754876678aa2650cd2a9e5870354699f7d 100644
--- a/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj
+++ b/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<Description>Support for rendering ASP.NET Core components for browsers.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsShippingPackage>true</IsShippingPackage>
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
index 497f023f73e671353a65bfbadd191b94768ce3ad..b9026cff09606115d7ecab5dfa3dbb57deab2988 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -5,6 +5,7 @@
<Description>Components feature for ASP.NET Core.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsShippingPackage>true</IsShippingPackage>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
diff --git a/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
index 8cdcf5d18c794726a3e4feed5d43df6faeabaf83..14606b7db75a7c292d4524974bf8fa8f4ff53def 100644
--- a/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
+++ b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
@@ -6,6 +6,7 @@ Commonly used types:
Microsoft.AspNetCore.DataProtection.IDataProtectionProvider
Microsoft.AspNetCore.DataProtection.IDataProtector</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;dataprotection</PackageTags>
</PropertyGroup>
diff --git a/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj
index 9859f30a111ee6d347887e13b357d698f5fc3232..1ee230c0e11737fb234688aa743ebde756e65284 100644
--- a/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj
+++ b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Infrastructure for ASP.NET Core cryptographic packages. Applications and libraries should not reference this package directly.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
index 69982996dc7c78dc1e7844bb8ba309ccab156dfe..016ac5a57a7d04e6fedd15287f53a95f0c7fb99b 100644
--- a/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
+++ b/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core utilities for key derivation.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;dataprotection</PackageTags>
diff --git a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
index c843a00dd400dc2b172fd882a21badd2ef94e5b0..067f987981df8c032e2c596428ce034e06aec561 100644
--- a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
+++ b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core logic to protect and unprotect data, similar to DPAPI.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
index 7a4c008f784d05fcf627eca3326d8adca71fb9be..fff474980f96aae684428c684bbdd9f651ef7eb6 100644
--- a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
+++ b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Additional APIs for ASP.NET Core data protection.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;dataprotection</PackageTags>
</PropertyGroup>
diff --git a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj
index 60c7a459d516257a6c4e4b2c009b89c1871ee505..23c9ec38520dad29f88c1798a0fe7e3b21506d03 100644
--- a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj
+++ b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<PackageTags>aspnetcore</PackageTags>
<Description>Microsoft.AspNetCore</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Framework/Microsoft.AspNetCore.App.props b/src/Framework/Microsoft.AspNetCore.App.props
deleted file mode 100644
index 23785af4dfc5da16b83128f29d5da8b5097ba936..0000000000000000000000000000000000000000
--- a/src/Framework/Microsoft.AspNetCore.App.props
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
- This lists all assemblies which are part of the Microsoft.AspNetCore.App metapackage and shared framework.
--->
-<Project>
-
- <ItemGroup>
- <Dependency Include="Microsoft.AspNetCore.Antiforgery" />
- <Dependency Include="Microsoft.AspNetCore.Authentication.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Authentication.Cookies" />
- <Dependency Include="Microsoft.AspNetCore.Authentication.Core" />
- <Dependency Include="Microsoft.AspNetCore.Authentication.OAuth" />
- <Dependency Include="Microsoft.AspNetCore.Authentication" />
- <Dependency Include="Microsoft.AspNetCore.Authorization.Policy" />
- <Dependency Include="Microsoft.AspNetCore.Authorization" />
- <Dependency Include="Microsoft.AspNetCore.Components.Browser" />
- <Dependency Include="Microsoft.AspNetCore.Components" />
- <Dependency Include="Microsoft.AspNetCore.Connections.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.CookiePolicy" />
- <Dependency Include="Microsoft.AspNetCore.Cors" />
- <Dependency Include="Microsoft.AspNetCore.Cryptography.Internal" />
- <Dependency Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
- <Dependency Include="Microsoft.AspNetCore.DataProtection.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.DataProtection.Extensions" />
- <Dependency Include="Microsoft.AspNetCore.DataProtection" />
- <Dependency Include="Microsoft.AspNetCore.Diagnostics.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
- <Dependency Include="Microsoft.AspNetCore.Diagnostics" />
- <Dependency Include="Microsoft.AspNetCore.HostFiltering" />
- <Dependency Include="Microsoft.AspNetCore.Hosting.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Hosting" />
- <Dependency Include="Microsoft.AspNetCore.Html.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Http.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Http.Connections.Common" />
- <Dependency Include="Microsoft.AspNetCore.Http.Connections" />
- <Dependency Include="Microsoft.AspNetCore.Http.Extensions" />
- <Dependency Include="Microsoft.AspNetCore.Http.Features" />
- <Dependency Include="Microsoft.AspNetCore.Http" />
- <Dependency Include="Microsoft.AspNetCore.HttpOverrides" />
- <Dependency Include="Microsoft.AspNetCore.HttpsPolicy" />
- <Dependency Include="Microsoft.AspNetCore.Identity" />
- <Dependency Include="Microsoft.AspNetCore.Localization.Routing" />
- <Dependency Include="Microsoft.AspNetCore.Localization" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.ApiExplorer" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.Core" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.Cors" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.DataAnnotations" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.Formatters.Json" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.Localization" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.Razor" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.RazorPages" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.TagHelpers" />
- <Dependency Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
- <Dependency Include="Microsoft.AspNetCore.Mvc" />
- <Dependency Include="Microsoft.AspNetCore.Razor.Runtime" />
- <Dependency Include="Microsoft.AspNetCore.Razor" />
- <Dependency Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.ResponseCaching" />
- <Dependency Include="Microsoft.AspNetCore.ResponseCompression" />
- <Dependency Include="Microsoft.AspNetCore.Rewrite" />
- <Dependency Include="Microsoft.AspNetCore.Routing.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Routing" />
- <Dependency Include="Microsoft.AspNetCore.Server.HttpSys" />
- <Dependency Include="Microsoft.AspNetCore.Server.IIS" />
- <Dependency Include="Microsoft.AspNetCore.Server.IISIntegration" />
- <Dependency Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
- <Dependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" />
- <Dependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" />
- <Dependency Include="Microsoft.AspNetCore.Server.Kestrel" />
- <Dependency Include="Microsoft.AspNetCore.Session" />
- <Dependency Include="Microsoft.AspNetCore.SignalR.Common" />
- <Dependency Include="Microsoft.AspNetCore.SignalR.Core" />
- <Dependency Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" />
- <Dependency Include="Microsoft.AspNetCore.SignalR" />
- <Dependency Include="Microsoft.AspNetCore.StaticFiles" />
- <Dependency Include="Microsoft.AspNetCore.WebSockets" />
- <Dependency Include="Microsoft.AspNetCore.WebUtilities" />
- <Dependency Include="Microsoft.AspNetCore" />
- <Dependency Include="Microsoft.Extensions.Identity.Core" />
- <Dependency Include="Microsoft.Extensions.Identity.Stores" />
- <Dependency Include="Microsoft.Net.Http.Headers" />
-
- <!-- We still be the shared framework but running restore against packages we just built. This sets the version to match the current build number. -->
- <Dependency Update="@(Dependency)" Version="$(PackageVersion)" />
-
- <!-- Dependencies built as packages in other repos that we definitely want in the shared framework. -->
- <ExternalDependency Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="$(MicrosoftExtensionsConfigurationKeyPerFilePackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Logging.EventSource" Version="$(MicrosoftExtensionsLoggingEventSourcePackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Logging.TraceSource" Version="$(MicrosoftExtensionsLoggingTraceSourcePackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
- <ExternalDependency Include="Microsoft.JSInterop" Version="$(MicrosoftJSInteropPackageVersion)" />
-
- <!--
- Transitive dependencies of other assemblies in the shared framework. These are listed separately and should not be included directly
- when setting `<Reference>`. These are listed for the purpose of tests and servicing builds only.
- If implementation details change and these assemblies are no longer showing up in the shared framework as a result of that,
- it is okay to remove these transitive dependencies.
- -->
- <_TransitiveExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
- <_TransitiveExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
- <_TransitiveExternalDependency Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
- <_TransitiveExternalDependency Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
- <_TransitiveExternalDependency Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
- <_TransitiveExternalDependency Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
- <_TransitiveExternalDependency Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
- <_TransitiveExternalDependency Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
- <_TransitiveExternalDependency Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
- <_TransitiveExternalDependency Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup Condition=" '$(IsServicingBuild)' == 'true' ">
- <!--
- Once we start to build a servicing release, hoist transitive dependencies to be direct dependencies.
- This will help us ensure servicing builds carry the latest versions of dependencies, even if we aren't rebuilding
- the original direct dependency that pulled in the transitive reference.
- -->
- <ExternalDependency Include="@(_TransitiveExternalDependency)" />
- </ItemGroup>
-
-</Project>
diff --git a/src/Framework/pkg/Metapackage.targets b/src/Framework/pkg/Metapackage.targets
index 1e43373b9b288593c25ba5c749b29d8e6f98230f..51479945e5768a3d830ffc510a0423e789b9f26d 100644
--- a/src/Framework/pkg/Metapackage.targets
+++ b/src/Framework/pkg/Metapackage.targets
@@ -30,8 +30,12 @@
<AllowExplicitVersion>true</AllowExplicitVersion>
</PackageReference>
- <!-- Note: do not add _TransitiveExternalDependency to this list. This is intentionally not listed as a direct package reference. -->
- <PackageReference Include="@(Dependency);@(ExternalDependency)" />
+ <!-- Add version metadata. These are expected to match the metapackage version. -->
+ <AspNetCoreAppReferenceAndPackage Update="@(AspNetCoreAppReferenceAndPackage)" Version="$(SharedFxVersion)" />
+ <AspNetCoreAppReference Update="@(AspNetCoreAppReference)" Version="$(SharedFxVersion)" />
+
+ <!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
+ <PackageReference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
</ItemGroup>
<ItemDefinitionGroup>
@@ -71,8 +75,9 @@
<Target Name="GenerateBuildProps" BeforeTargets="BeforeBuild" DependsOnTargets="PrepareOutputPaths">
<ItemGroup>
- <_AspNetAppPackageConflictOverrides Include="@(Dependency->'%(Identity)|%(Version)')" Condition=" '%(Dependency.Version)' != '' " />
- <_AspNetAppPackageConflictOverrides Include="@(ExternalDependency->'%(Identity)|%(Version)')" Condition=" '%(ExternalDependency.Version)' != '' " />
+ <_AspNetAppPackageConflictOverrides Include="@(AspNetCoreAppReference->'%(Identity)|%(Version)')" Condition=" '%(AspNetCoreAppReference.Version)' != '' " />
+ <_AspNetAppPackageConflictOverrides Include="@(AspNetCoreAppReferenceAndPackage->'%(Identity)|%(Version)')" Condition=" '%(AspNetCoreAppReferenceAndPackage.Version)' != '' " />
+ <_AspNetAppPackageConflictOverrides Include="@(ExternalAspNetCoreAppReference->'%(Identity)|%(Version)')" Condition=" '%(ExternalAspNetCoreAppReference.Version)' != '' " />
</ItemGroup>
<PropertyGroup>
diff --git a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
index c7ed2a83cf0bfad9d21c1f2438c2d4de4be421cf..4325322c0a75d86b2aae0e21caaef272f1ecee97 100644
--- a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
+++ b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
@@ -32,8 +32,6 @@ This package requires the ASP.NET Core runtime. This runtime is installed by the
</ProjectReference>
</ItemGroup>
- <Import Project="..\Microsoft.AspNetCore.App.props" />
-
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Import Project="Metapackage.targets" />
</Project>
diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
index cc20b131659d8e7d49f546c15960d61df13bd151..9acbccd90105ab78c1fa969bde6c390a7fe83b7a 100644
--- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
+++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
@@ -7,7 +7,6 @@
</PropertyGroup>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
- <Import Project="..\Microsoft.AspNetCore.App.props" />
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -39,8 +38,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
</PropertyGroup>
<ItemGroup>
- <!-- Note: do not add _TransitiveExternalDependency to this list. This is intentionally not listed as a direct package reference. -->
- <Reference Include="@(Dependency);@(ExternalDependency)" />
+ <!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
+ <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
index 02988ace392f5462378dba5eb466ce50e67c5422..170ced504d2866f4813a7dd11a3e14763adac46d 100644
--- a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
+++ b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
@@ -52,8 +52,6 @@ $(MSBuildProjectName) provides a default set of APIs for building an ASP.NET Cor
<NoPackageAnalysis>true</NoPackageAnalysis>
</PropertyGroup>
- <Import Project="..\Microsoft.AspNetCore.App.props" />
-
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Import Project="SharedFx.targets" />
diff --git a/src/Framework/src/SharedFx.targets b/src/Framework/src/SharedFx.targets
index 2f2d722635ccffe9f51db2a7f743c1adad9044f1..07f9de44b3f18f9eebbcbd2ae7c6ca7562048761 100644
--- a/src/Framework/src/SharedFx.targets
+++ b/src/Framework/src/SharedFx.targets
@@ -139,8 +139,12 @@ This targets file should only be imported by .shfxproj files.
<AllowExplicitVersion>true</AllowExplicitVersion>
</PackageReference>
- <!-- Note: do not add _TransitiveExternalDependency to this list. This is intentionally not listed as a direct package reference. -->
- <PackageReference Include="@(Dependency);@(ExternalDependency)">
+ <!-- Add version metadata. These are expected to match the metapackage version. -->
+ <AspNetCoreAppReferenceAndPackage Update="@(AspNetCoreAppReferenceAndPackage)" Version="$(SharedFxVersion)" />
+ <AspNetCoreAppReference Update="@(AspNetCoreAppReference)" Version="$(SharedFxVersion)" />
+
+ <!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
+ <PackageReference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)">
<IncludeAssets>Runtime;Native</IncludeAssets>
<Publish>true</Publish>
</PackageReference>
diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index c2958edfac052d20f69bd812c6e37518954aa62e..94ae36e6b5ec1352db70882073e660ec772ac3d6 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -5,8 +5,6 @@
<RootNamespace>Microsoft.AspNetCore</RootNamespace>
</PropertyGroup>
- <Import Project="..\Microsoft.AspNetCore.App.props" />
-
<ItemGroup>
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
<_Parameter1>PackageVersion</_Parameter1>
@@ -41,7 +39,7 @@
<ItemGroup>
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
<_Parameter1>SharedFxDependencies</_Parameter1>
- <_Parameter2>@(Dependency);@(ExternalDependency);@(_TransitiveExternalDependency)</_Parameter2>
+ <_Parameter2>@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)</_Parameter2>
</AssemblyAttribute>
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
<_Parameter1>MetadataOutputPath</_Parameter1>
diff --git a/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj
index 83a6b4aa6fac1388c10506a83ebe3782fb7c9b7f..f0a3c27ae68fb59c6d9187bdb443d78d089559bb 100644
--- a/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj
+++ b/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core hosting and startup abstractions for web applications.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;hosting</PackageTags>
diff --git a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
index be6280508722591a76e44350e72e98a36c4c302a..a14fd61d072d56b64baadb529db2ae5f79e5c84d 100644
--- a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
+++ b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core hosting infrastructure and startup logic for web applications.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;hosting</PackageTags>
@@ -25,9 +26,7 @@
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" PrivateAssets="All" />
- <Reference Include="System.Diagnostics.DiagnosticSource" />
- <Reference Include="System.Reflection.Metadata" />
+ <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" SharedSources="true" />
</ItemGroup>
</Project>
diff --git a/src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj b/src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj
index 15c34d469b209ac12a28c30f5fc5bc0ebe437d43..48b93a678e8612252509759fe3014a92cbb292f1 100644
--- a/src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj
+++ b/src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core hosting server abstractions for web applications.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;hosting</PackageTags>
diff --git a/src/Html/Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj b/src/Html/Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj
index b7dcbfce470c0a7075da74b0522e2de3ae4dc6a6..7a60043cf840758f455ab83c4a0b2240a8d5aecb 100644
--- a/src/Html/Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj
+++ b/src/Html/Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj
@@ -7,6 +7,7 @@ Commonly used types:
Microsoft.AspNetCore.Html.HtmlString
Microsoft.AspNetCore.Html.IHtmlContent</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
</PropertyGroup>
diff --git a/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj b/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj
index 15bc1ffaf321754db9432d21a14ae2a46251ac5b..b2ff9f8ce15f611a665112812cad49ee250da4b1 100644
--- a/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj
+++ b/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<Description>ASP.NET Core common types used by the various authentication components.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
@@ -14,4 +15,4 @@
<Reference Include="Microsoft.Extensions.Options" />
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj b/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj
index b0a33541258e46f4481bc706272f4e5aa11492f0..e562b91b1b821c3532429136243f45005906e807 100644
--- a/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj
+++ b/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core common types used by the various authentication middleware components.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
diff --git a/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj b/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj
index 88fdff16945436493c1bfcc4b5f554a793047b6e..720ac8cecbddaefd2293c046e1f2dced21201ddc 100644
--- a/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj
+++ b/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>HTTP header parser implementations.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -11,7 +12,6 @@
<ItemGroup>
<Reference Include="Microsoft.Extensions.Primitives" />
- <Reference Include="System.Buffers" />
</ItemGroup>
</Project>
diff --git a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
index 2f17e520197a4845c13d350a864261601150b61a..8101d02e7447ae8aa47c37bb9c4dd32552de19a8 100644
--- a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
+++ b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
@@ -9,6 +9,7 @@ Microsoft.AspNetCore.Http.HttpContext
Microsoft.AspNetCore.Http.HttpRequest
Microsoft.AspNetCore.Http.HttpResponse</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -20,7 +21,7 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" PrivateAssets="All" />
+ <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" SharedSources="true" />
<Reference Include="System.Text.Encodings.Web" />
</ItemGroup>
diff --git a/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj b/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj
index f59ccfca18b920c9fc1064c577a1b6f5d400dd99..751be4bedd837b4ba176ff4f593b49c9c3aa1ff7 100644
--- a/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj
+++ b/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core common extension methods for HTTP abstractions, HTTP headers, HTTP request/response, and session state.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
@@ -12,7 +13,6 @@
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.Net.Http.Headers" />
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
- <Reference Include="System.Buffers" />
</ItemGroup>
</Project>
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 e8400d052c3bee9e3f0c9fc21218e4266d98a771..4e052998c096de5fc7d3844fccb3547d490b0a6a 100644
--- a/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj
+++ b/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core HTTP feature interface definitions.</Description>
<TargetFramework>netstandard2.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
diff --git a/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj b/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj
index d091f7d690ee5902af8bf22efb56861d70b22f52..ffb49ec6496fdb0bd44ac5eeb764d8ef8ce343d8 100644
--- a/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj
+++ b/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core default HTTP feature implementations.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj
index 4b2518a515c0e09159d3843c8711d558a9f785bd..a0249fd7fdb41c146d5a78a3190cd78ef8d98a1f 100644
--- a/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj
+++ b/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj
@@ -6,6 +6,7 @@ Commonly used types:
Microsoft.AspNetCore.Routing.IRouter
Microsoft.AspNetCore.Routing.RouteData</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;routing</PackageTags>
diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
index 6bcff41bb5e000a48461624a228cab1cc497b60f..bc189d19a2cf94d765d2aa9e0e37b7806c6f27e9 100644
--- a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
+++ b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
@@ -6,6 +6,7 @@ Commonly used types:
Microsoft.AspNetCore.Routing.Route
Microsoft.AspNetCore.Routing.RouteCollection</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;routing</PackageTags>
@@ -27,7 +28,7 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" />
+ <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" SharedSources="true" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.ObjectPool" />
<Reference Include="Microsoft.Extensions.Options" />
diff --git a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj
index befbf9abc47209cc186a60399311d93f2d2e1789..5e123dfff803a63cc17c690e7013dec9263e5064 100644
--- a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj
+++ b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core utilities, such as for working with forms, multipart messages, and query strings.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<DefineConstants>$(DefineConstants);WebEncoders_In_WebUtilities</DefineConstants>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
index 7641e348971be61bc32f7a4dc0d6b7dbc26e5aa8..6006e4fa1ed0212feb8b7ddf11c9118a441bb69d 100644
--- a/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
+++ b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core Identity is the membership system for building ASP.NET Core web applications, including membership, login, and user data. ASP.NET Core Identity allows you to add login features to your application and makes it easy to customize data about the logged in user.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;identity;membership</PackageTags>
</PropertyGroup>
diff --git a/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
index 8a471194b9584b9213ee8fec2ce8db7c528c9be3..526f2bd7e7fec67a7ed28f7ee676dc0434453aee 100644
--- a/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
+++ b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core Identity is the membership system for building ASP.NET Core web applications, including membership, login, and user data. ASP.NET Core Identity allows you to add login features to your application and makes it easy to customize data about the logged in user.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;identity;membership</PackageTags>
</PropertyGroup>
@@ -11,7 +12,6 @@
<Reference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="System.ComponentModel.Annotations" />
</ItemGroup>
</Project>
diff --git a/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj
index a5e7c7c5fa7d3b5642f2405650f1e344e0dc3687..b51bcb7b27d1c267c3ac7e62dce1fce64486d87f 100644
--- a/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj
+++ b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core Identity is the membership system for building ASP.NET Core web applications, including membership, login, and user data. ASP.NET Core Identity allows you to add login features to your application and makes it easy to customize data about the logged in user.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;identity;membership</PackageTags>
</PropertyGroup>
@@ -10,7 +11,6 @@
<ItemGroup>
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Identity.Core" />
- <Reference Include="System.ComponentModel.Annotations" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj b/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj
index 5fb397467c2a28360a0c32171a210c9d5d4f8d6a..4a9008883bf2e6d351222caa29ee5cc3e4eaf797 100644
--- a/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj
+++ b/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj
@@ -6,6 +6,7 @@ Commonly used types:
Microsoft.AspNetCore.Cors.DisableCorsAttribute
Microsoft.AspNetCore.Cors.EnableCorsAttribute</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;cors</PackageTags>
diff --git a/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj b/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj
index 361dfe0452c572028f2d98e42c37fbb776b17ad1..94a61d84d0676dcda0f3ab9fc741d6d5aae1f2c0 100644
--- a/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj
+++ b/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core diagnostics middleware abstractions and feature interface definitions.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;diagnostics</PackageTags>
diff --git a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
index 775fe57a6af4e516761d2d35ae04149964d988e1..61dc0e986a27ca207b84e8c0b354fba9b37e5acd 100644
--- a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
+++ b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;diagnostics</PackageTags>
@@ -23,9 +24,7 @@
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" PrivateAssets="All" />
- <Reference Include="System.Diagnostics.DiagnosticSource" />
- <Reference Include="System.Reflection.Metadata" />
+ <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" SharedSources="true" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj b/src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj
index 8ac2df90d715a01ec54b810c82146c14f8bf0663..34929e104e004d63eb5190c8615c56e057109401 100644
--- a/src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj
+++ b/src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj
@@ -3,11 +3,12 @@
<PropertyGroup>
<Description>ASP.NET Core middleware for returning the results of Health Checks in the application</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>diagnostics;healthchecks</PackageTags>
<Description>ASP.NET Core middleware for returning the results of Health Checks in the application
-
+
</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj
index b18fc411cb973c479f2bd5157ed28d7c10b97075..3680fd570dd320090a2e814b77c554da07c75fb8 100644
--- a/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj
+++ b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj
@@ -5,6 +5,7 @@
ASP.NET Core middleware for filtering out requests with unknown HTTP host headers.
</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
</PropertyGroup>
@@ -13,6 +14,6 @@
<Reference Include="Microsoft.AspNetCore.Http" />
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
+ <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj
index 23b78b1c16e35c68b23bea111f0783930d85462c..f398eb67d204c7d10143f2da313769bb8df01774 100644
--- a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj
+++ b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj
@@ -5,6 +5,7 @@
* X-Forwarded-* headers to forward headers from a proxy.
* HTTP method override header.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;proxy;headers;xforwarded</PackageTags>
diff --git a/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj
index 35061ff21816ac640123c1a03bab6f3338ce8194..d8858bd7b48270d4379ce4d86c3baa96852ae513 100644
--- a/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj
+++ b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj
@@ -5,6 +5,7 @@
ASP.NET Core basic middleware for supporting HTTPS Redirection and HTTP Strict-Transport-Security.
</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;https;hsts</PackageTags>
@@ -15,6 +16,6 @@
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.Extensions.Configuration.Binder" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
+ <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj
index 18d5d0788e05874118deff47dc7f0827e8a90115..f66c77765cbf63464b5d5cfbcb254711af55efdd 100644
--- a/src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj
+++ b/src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj
@@ -4,6 +4,7 @@
<Product>Microsoft ASP.NET Core</Product>
<Description>Provides a request culture provider which gets culture and ui-culture from request's route data.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;localization</PackageTags>
diff --git a/src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj b/src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj
index 00f43deee7adfdbd0be4bbea0968e547d30678ab..48dae9489a8f3b3f26551b15e4b153362a608c87 100644
--- a/src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj
+++ b/src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj
@@ -4,6 +4,7 @@
<Product>Microsoft ASP.NET Core</Product>
<Description>ASP.NET Core middleware for automatically applying culture information to HTTP requests. Culture information can be specified in the HTTP header, query string, cookie, or custom source.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;localization</PackageTags>
diff --git a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj
index 47fd76d040f33361eadd5bab8fde8d4592bf4ed6..038cfb34443b7bdacd5114c8823b7ce06f590f3e 100644
--- a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj
+++ b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj
@@ -12,7 +12,6 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
- <Reference Include="System.Diagnostics.DiagnosticSource" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj b/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj
index fc79cf53d4d9f367cda63c7583405c816b5169e4..0dc8be2b8d818f74e69408673e95c4d1eebcaa1f 100644
--- a/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj
+++ b/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core response caching middleware abstractions and feature interface definitions.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;cache;caching</PackageTags>
</PropertyGroup>
diff --git a/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj
index 727a9397bccde828ade625cbf76c044eddf2aa5e..9611dfbdaf39ee9940e942bfe835fecdc8be5e95 100644
--- a/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj
+++ b/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core middleware for caching HTTP responses on the server.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj
index f35baf967dc866e78eaf19d3933b4bfcc04da532..6b4ee0120441eac254aad89625499f982031b412 100644
--- a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj
+++ b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core middleware for HTTP Response compression.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
</PropertyGroup>
diff --git a/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj
index 0ac6ec15b168d763bd0e551da8496c052cc4ee6c..d203b74371d3cf85a36c39c3b5f64e7cacd41482 100644
--- a/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj
+++ b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj
@@ -6,6 +6,7 @@
* Support for running IIS URL Rewrite module rules
* Support for running Apache mod_rewrite rules.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;urlrewrite;mod_rewrite</PackageTags>
diff --git a/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj b/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj
index 65e72cae6ecac96d0ede57f7ef87aaf68b5629cd..3d917be5a07c37780ca09f9813531aceef16119d 100644
--- a/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj
+++ b/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core session state middleware.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj b/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj
index 9e74b57dead46fe25e77805b3a336699a7d96b49..1b8d3d29a020924fea222dd9931c48a1de626da2 100644
--- a/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj
+++ b/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core static files middleware. Includes middleware for serving static files, directory browsing, and default files.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;staticfiles</PackageTags>
diff --git a/src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj b/src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj
index f0e3e8a74be6ab7efdedb7afee2689e0786e5ac9..ff746ce830f554d0b0ce4ce24f7b25cfde6eb2c6 100644
--- a/src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj
+++ b/src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core web socket middleware for use on top of opaque servers.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
index 62e497bb4d6b40ee7b41e2db47f9e25476ccfe9e..a8ff4cf3b3229f7d75a65e2cfcdad39686504aed 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
@@ -5,6 +5,7 @@
Commonly used types:
Microsoft.AspNetCore.Mvc.IActionResult</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
@@ -20,7 +21,7 @@ Microsoft.AspNetCore.Mvc.IActionResult</Description>
</ItemGroup>
<ItemGroup Label="Sources packages">
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" />
+ <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" SharedSources="true" />
</ItemGroup>
</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
index 1e16a72cf35fec61ab2a26eb4e773f6890882050..601fe601baeeff26314def6a47c6ea09688c5fac 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC API explorer functionality for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
index ed0ec60fec304a70d2f233247984eb3b201e837c..abe65430e2dee35f4f59f2f90da98e70f71f56c5 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
@@ -11,6 +11,7 @@ Microsoft.AspNetCore.Mvc.FromFormAttribute
Microsoft.AspNetCore.Mvc.RequireHttpsAttribute
Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
@@ -40,14 +41,12 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
<Reference Include="Microsoft.Extensions.DependencyModel" />
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
- <Reference Include="System.Diagnostics.DiagnosticSource" />
- <Reference Include="System.Threading.Tasks.Extensions" />
</ItemGroup>
<ItemGroup Label="Sources packages">
- <Reference Include="Microsoft.Extensions.ParameterDefaultValue.Sources" PrivateAssets="All" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" PrivateAssets="All" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" PrivateAssets="All" />
+ <Reference Include="Microsoft.Extensions.ParameterDefaultValue.Sources" SharedSources="true" />
+ <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" SharedSources="true" />
+ <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" SharedSources="true" />
</ItemGroup>
</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
index 3f9681beb5854857d2adfe978c025cd9c47ca3ad..b193c3e16659052259b15a3512f92502cad7adb3 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC cross-origin resource sharing (CORS) features.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;cors</PackageTags>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
index a716acc0a427d94fd9aca95d1f121c17ec4ed97a..b0c0c4d041c86cc3d0f5f1c35acb5cd9aeb864b0 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
@@ -10,8 +11,6 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
-
<Reference Include="Microsoft.Extensions.Localization" />
- <Reference Include="System.ComponentModel.Annotations" />
</ItemGroup>
</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
index 2bc49661a17763e9c3b05d0094e12bdc1957dde5..a8ad907b98487153dfd4c15a01b388a341f6aa8f 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC formatters for JSON input and output.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;json</PackageTags>
</PropertyGroup>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
index e73b3b5f014fd96c3049027ccc353efaa1826888..4ac6c2733c1446bb315127e189e9ba7e1aa369a5 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;xml</PackageTags>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
index 0a16e8ddd3c5ff0dcaba27cd251b35f87826f284..17d8c33678ae64b9c852d15d431931b1e9efcb3c 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
@@ -6,6 +6,7 @@ Commonly used types:
Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer<TResource>
Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;localization</PackageTags>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
index 1221665e7e3e011e3a0a2ae4a1d2ee2deea124ed..a6561e544a108db3cdce2f0e70034919b855cc80 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC Razor view engine for CSHTML files.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;cshtml;razor</PackageTags>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
index 03cede054bba902cfc248e3eef41838db065ca6e..3e2db552aad74ef95e6b24152f68f813f575e8a4 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core MVC Razor Pages.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;cshtml;razor</PackageTags>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
index 5fef110490b8d75cb99b59eddf1d8fbea0a8f54b..1ab0b5c30a5c0e1317101fd2f9be057cc0c67211 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
@@ -6,6 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;taghelper;taghelpers</PackageTags>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
index 5dbf2094c3f2d08a24b93fc02ea77ddeb9353e4b..316a0d417168a1039edc992ebe0f26e37e984130 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
@@ -11,6 +11,7 @@ Microsoft.AspNetCore.Mvc.ViewComponent</Description>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
index 74de1de6ea6eec8d551edd73e565841f3ce87302..9ca43f3c5a116435398e0e41f1eb1fd54bef5c21 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
@@ -6,6 +6,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj
index ff40bb76ee88302c22359c2966d1725056625cce..7e0dc091879fc70708ed52b1bd95c7426dd06b1e 100644
--- a/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj
+++ b/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Runtime infrastructure for rendering Razor pages and tag helpers.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>$(PackageTags);taghelper;taghelpers</PackageTags>
</PropertyGroup>
diff --git a/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj
index a8cc379a58e3852fd0f14b7303b7549a908d6ce6..b1cff0664fdd60882d354b59cad1cf43f0b5515b 100644
--- a/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj
+++ b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj
@@ -9,6 +9,7 @@ Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute
Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute
Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>$(PackageTags);taghelper;taghelpers</PackageTags>
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -19,7 +20,7 @@ Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper</Description>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Html.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" />
+ <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" SharedSources="true" />
</ItemGroup>
</Project>
diff --git a/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj
index d4d24b81ad0422b37ceff642d364d18a6124337f..c86d9b94ac98f4fabcfc795745f5226567c9def5 100644
--- a/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj
+++ b/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core middleware that enables an application to use cookie based authentication.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<DefineConstants>$(DefineConstants);SECURITY</DefineConstants>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj b/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj
index f80469e4650dfe6319bff543fb137d4694f61397..f4b26c9968c5f01ab2c5e447d209e3a725ed5ffc 100644
--- a/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj
+++ b/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core common types used by the various authentication middleware components.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
diff --git a/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj
index 85623aebce297c6edadb67e5b5d3458caca70adf..29137840ffb88034ac4b3a3cd64a9748b1346325 100644
--- a/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj
+++ b/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core middleware that enables an application to support any standard OAuth 2.0 authentication workflow.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags>
diff --git a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
index c58c135f90f6fb9a6fc21f3e73ffbece25757ca0..01ee46d07d8f03b82e3dda127eb0bcc0a77ce34e 100644
--- a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
+++ b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
@@ -6,6 +6,7 @@ Commonly used types:
Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute
Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authorization</PackageTags>
diff --git a/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj
index 0f302058e57808a701fc4d8280571e103ae72bc9..ecd83793a4c2ff993f89c8c892a8b7f757e164a7 100644
--- a/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj
+++ b/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core authorization policy helper classes.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591;NU1605</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authorization</PackageTags>
diff --git a/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj
index 81079fe12640618a336ba18e1bd7f8bdf5257013..f4b039bcb9e7edde3142693cd52a8cb13fb172ca 100644
--- a/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj
+++ b/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core cookie policy classes to control the behavior of cookies.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
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 baa0fd66b2ed4bb9691bfb092108288341a8167c..a9582339923d823ace20629f6a1b8cf69c8af805 100644
--- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
+++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Core components of ASP.NET Core networking protocol stack.</Description>
<TargetFramework>netstandard2.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
<NoWarn>CS1591;$(NoWarn)</NoWarn>
@@ -11,7 +12,7 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" PrivateAssets="All" />
+ <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" SharedSources="true" />
<Reference Include="System.IO.Pipelines" />
</ItemGroup>
diff --git a/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj
index 7618aad939a744c067dfac521fb97e3a4d40172b..9117a4d39bb9c8cd46077a06c2c65c2700866c12 100644
--- a/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj
+++ b/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core HTTP server that uses the Windows HTTP Server API.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
index f2ceee919c89e1741557bed95ccff361e7d72be6..9f71d3f6cad579ac56aeddf1ea3430baeb482b68 100644
--- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<PackageId>Microsoft.AspNetCore.Server.IIS</PackageId>
<Description>Provides support for hosting ASP.NET Core in IIS using the AspNetCoreModule.</Description>
<NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj
index c4825392476e8bcb19940a31578e372545342a25..ca33bbaba67c58c92b7559ebcc00c1d7cb67b133 100644
--- a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj
+++ b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core components for working with the IIS AspNetCoreModule.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;iis</PackageTags>
@@ -17,10 +18,7 @@
<Reference Include="Microsoft.AspNetCore.HttpOverrides" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="System.Buffers" />
<Reference Include="System.IO.Pipelines" />
- <Reference Include="System.Memory" />
- <Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>
diff --git a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
index 17bd70a6757e8f484ada98df8f7006f9ea1d8cfb..c12d43df2d473d1e9205d0b6516820e8c58c2e01 100644
--- a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
+++ b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Core components of ASP.NET Core Kestrel cross-platform web server.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;kestrel</PackageTags>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -22,11 +23,8 @@
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
<Reference Include="Microsoft.Net.Http.Headers" />
- <Reference Include="System.Memory" />
- <Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
<Reference Include="System.Security.Cryptography.Cng" />
- <Reference Include="System.Threading.Tasks.Extensions" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
index bcfc3e6f4e19d088f0d626b32ef62d4b3ad81b0d..84e378410f36caf40dbcc1a28793bc5a74b4dbe5 100644
--- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
+++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
@@ -19,7 +19,6 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" />
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.Extensions.Logging" />
- <Reference Include="System.Memory" />
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
</ItemGroup>
diff --git a/src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj b/src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj
index 7394ffae00298753e4fb6ea892ae62c6003749d7..c7a721311ce7b21e4d5e69d446ea978c45fe207d 100644
--- a/src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj
+++ b/src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core Kestrel cross-platform web server.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;kestrel</PackageTags>
<NoWarn>CS1591;$(NoWarn)</NoWarn>
diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj b/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
index 39c53a73ff7b2f840a3cb00a7fc3e2173281b108..0d812732ebaceb1ccc21a3a70732077b5feff5a0 100644
--- a/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
+++ b/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Transport abstractions for the ASP.NET Core Kestrel cross-platform web server.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;kestrel</PackageTags>
<NoWarn>CS1570;CS1571;CS1572;CS1573;CS1574;CS1591;$(NoWarn)</NoWarn>
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
index 2df07062fd2524fc0ba5967ec597a8ba2239f84c..e5ffbb53b6475ec6016851c7ee8522477024dc9e 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
+++ b/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Managed socket transport for the ASP.NET Core Kestrel cross-platform web server.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;kestrel</PackageTags>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
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 a54ac4c17b8a606bb4bd3bec87f2ca23334b8e9b..6be1dd1629a223adabb66afd866b7845dd226376 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
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Common primitives for ASP.NET Connection Handlers and clients</Description>
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<RootNamespace>Microsoft.AspNetCore.Http.Connections</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsShippingPackage>true</IsShippingPackage>
@@ -16,10 +17,12 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
+ <Reference Include="System.Runtime.CompilerServices.Unsafe" />
+ </ItemGroup>
+
+ <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'" >
+ <Reference Include="Microsoft.Bcl.Json.Sources" SharedSources="true" />
<Reference Include="System.Buffers" />
- <Reference Include="Microsoft.Bcl.Json.Sources" Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <PrivateAssets>All</PrivateAssets>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
</ItemGroup>
+
</Project>
diff --git a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj
index 42845dcee4d1f961dbe2dd2db4aaeb382a6c2177..6a99c1f762104b3c3de3497d9adf9983e6d80e6f 100644
--- a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj
+++ b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Components for providing real-time bi-directional communication across the Web.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
@@ -27,10 +28,9 @@
<Reference Include="Microsoft.AspNetCore.Http" />
<Reference Include="Microsoft.AspNetCore.Routing" />
<Reference Include="Microsoft.AspNetCore.WebSockets" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" PrivateAssets="All" />
+ <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" SharedSources="true" />
<Reference Include="Newtonsoft.Json" />
<Reference Include="System.Security.Principal.Windows" />
-
</ItemGroup>
</Project>
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 04f27fbe951f7b2e5749c32192fec38dab52e9ad..79a299f9ef7d67db6aa146b7ce6bcfe3b4876a4e 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
@@ -3,6 +3,8 @@
<PropertyGroup>
<Description>Implements the SignalR Hub Protocol using Newtonsoft.Json.</Description>
<TargetFramework>netstandard2.0</TargetFramework>
+ <!-- TODO: remove this from the shared framework once we have a JSON protocol implementation which doesn't use Newtonsoft.Json. -->
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsShippingPackage>true</IsShippingPackage>
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 05f40dbebbfdd43c0932e40e9ac28cb3b52a3635..f2cdf6f8e1f0decba70f2f5a0d2d496cf2677fd8 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
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Common serialiation primitives for SignalR Clients Servers</Description>
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsShippingPackage>true</IsShippingPackage>
@@ -21,11 +22,12 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
+ <Reference Include="System.Runtime.CompilerServices.Unsafe" />
+ </ItemGroup>
+
+ <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+ <Reference Include="Microsoft.Bcl.Json.Sources" SharedSources="true" />
<Reference Include="System.Buffers" />
- <Reference Include="Microsoft.Bcl.Json.Sources" Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <PrivateAssets>All</PrivateAssets>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
</ItemGroup>
</Project>
diff --git a/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj b/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj
index 3bfcfd26e7d5c405c20b3ab7c115c7a1d17454ca..d26d4a30a9efd5eb21b37ebaadc7468cb366be62 100644
--- a/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj
+++ b/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj
@@ -3,6 +3,7 @@
<PropertyGroup>
<Description>Real-time communication framework for ASP.NET Core.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
<RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
</PropertyGroup>
diff --git a/src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj b/src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj
index 4c9b1c58864e9e19228bc52bc037431bb3bc0afc..cb71376f8903fb11e3aecf801d168cc5533203c1 100644
--- a/src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj
+++ b/src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<Description>Components for providing real-time bi-directional communication across the Web.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>