From 7d1f5d8c0b290043180d345f688049a17c23eddf Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Sat, 15 Feb 2020 02:13:19 -0800
Subject: [PATCH] Updates for extensions migrations
- Multi-target ObjectPool
- Move Embedded.Manifest.Task.Internal.Entry to the public namespace
- Remove ref assemblies from AspNetCore.Testing
- Skip TestPathUtilitiesTest since it's a pattern we want to migrate away from
- Fix FileProviders.Abstractions version in Embedded.*.nuspec
- Add workarounds for project references to FileProviders.Embedded
---
eng/Build.props | 9 +
eng/Dependencies.props | 21 +-
eng/ProjectReferences.props | 10 +
eng/SharedFramework.External.props | 9 -
eng/SharedFramework.Local.props | 9 +
eng/Version.Details.xml | 72 ----
eng/Versions.props | 20 +-
eng/targets/ResolveReferences.targets | 2 +-
...osoft.AspNetCore.Blazor.Build.Tests.csproj | 2 +-
...crosoft.AspNetCore.Blazor.DevServer.csproj | 3 +-
...t.AspNetCore.Components.Performance.csproj | 3 +-
.../Microsoft.AspNetCore.Components.csproj | 2 -
.../Microsoft.AspNetCore.Components.csproj | 10 +-
.../Server/src/Directory.Build.targets | 6 +
...rosoft.AspNetCore.Components.Server.csproj | 15 +-
.../Directory.Build.props | 9 -
...Extensions.Configuration.KeyPerFile.csproj | 4 +
.../test/ConfigurationProviderTestBase.cs | 4 +-
...ions.Configuration.KeyPerFile.Tests.csproj | 4 -
src/FileProviders/Directory.Build.props | 8 -
...t.Extensions.FileProviders.Embedded.csproj | 5 +
....FileProviders.Embedded.multitarget.nuspec | 6 +-
...s.FileProviders.Embedded.netcoreapp.nuspec | 4 +-
.../Manifest.MSBuildTask/src/Entry.cs | 2 +-
.../Manifest.MSBuildTask/src/Manifest.cs | 1 -
...ileProviders.Embedded.Manifest.Task.csproj | 1 +
.../GenerateEmbeddedResourcesManifestTest.cs | 1 -
.../test/SetExtensions.cs | 2 -
...agnostics.HealthChecks.Abstractions.csproj | 1 +
...Extensions.Diagnostics.HealthChecks.csproj | 5 +-
...ions.Diagnostics.HealthChecks.Tests.csproj | 4 +-
.../ref/Microsoft.AspNetCore.Hosting.csproj | 1 -
.../src/Microsoft.AspNetCore.Hosting.csproj | 3 +-
.../ref/Microsoft.AspNetCore.TestHost.csproj | 1 -
.../src/Microsoft.AspNetCore.TestHost.csproj | 3 +-
...rosoft.AspNetCore.Http.Abstractions.csproj | 1 -
...rosoft.AspNetCore.Http.Abstractions.csproj | 4 +-
...crosoft.AspNetCore.Http.Performance.csproj | 3 +-
...soft.AspNetCore.Routing.Performance.csproj | 3 +-
.../ref/Microsoft.AspNetCore.Routing.csproj | 1 -
.../src/Microsoft.AspNetCore.Routing.csproj | 3 +-
.../tools/Swaggatherer/Swaggatherer.csproj | 3 +-
...AspNetCore.WebUtilities.Performance.csproj | 2 +-
...oft.AspNetCore.Http.Microbenchmarks.csproj | 3 +-
.../src/Microsoft.JSInterop.csproj | 1 +
...xtensions.Localization.Abstractions.csproj | 1 +
.../Microsoft.Extensions.Localization.csproj | 1 +
.../src/ResourceManagerStringLocalizer.cs | 4 +
...osoft.Extensions.Localization.Tests.csproj | 1 -
....ConcurrencyLimiter.Microbenchmarks.csproj | 3 +-
...osoft.AspNetCore.ConcurrencyLimiter.csproj | 1 -
...osoft.AspNetCore.ConcurrencyLimiter.csproj | 3 +-
.../Microsoft.AspNetCore.Diagnostics.csproj | 1 -
.../Microsoft.AspNetCore.Diagnostics.csproj | 2 +-
...ore.ResponseCompression.Performance.csproj | 3 +-
...pNetCore.WebSockets.Microbenchmarks.csproj | 3 +-
...ore.ResponseCaching.Microbenchmarks.csproj | 3 +-
.../MusicStore.E2ETests.csproj | 3 +-
...crosoft.AspNetCore.Mvc.Abstractions.csproj | 1 -
...crosoft.AspNetCore.Mvc.Abstractions.csproj | 4 +-
.../ref/Microsoft.AspNetCore.Mvc.Core.csproj | 3 -
.../src/Microsoft.AspNetCore.Mvc.Core.csproj | 6 +-
.../Microsoft.AspNetCore.Mvc.Testing.csproj | 1 -
.../Microsoft.AspNetCore.Mvc.Testing.csproj | 3 +-
...icrosoft.AspNetCore.Mvc.Performance.csproj | 3 +-
.../Microsoft.Extensions.ObjectPool.csproj | 6 +-
...rosoft.Extensions.ObjectPool.netcoreapp.cs | 76 ++++
.../Microsoft.Extensions.ObjectPool.csproj | 3 +-
.../test/ProjectTemplates.Tests.csproj | 3 +-
.../ref/Microsoft.AspNetCore.Razor.csproj | 1 -
.../src/Microsoft.AspNetCore.Razor.csproj | 3 +-
...oft.AspNetCore.Security.Performance.csproj | 3 +-
...AspNetCore.Connections.Abstractions.csproj | 3 -
...AspNetCore.Connections.Abstractions.csproj | 4 +-
.../IIS.Performance/IIS.Performance.csproj | 3 +-
.../Microsoft.AspNetCore.Server.IIS.csproj | 1 -
.../Microsoft.AspNetCore.Server.IIS.csproj | 2 +-
...pNetCore.Server.Kestrel.Performance.csproj | 3 +-
.../InMemory.FunctionalTests.csproj | 2 +-
.../Microsoft.AspNetCore.Shared.Tests.csproj | 3 +-
...crosoft.AspNetCore.Http.Connections.csproj | 1 -
...crosoft.AspNetCore.Http.Connections.csproj | 3 +-
...soft.AspNetCore.SignalR.Tests.Utils.csproj | 3 +-
....AspNetCore.SignalR.Microbenchmarks.csproj | 6 +-
.../benchmarkapps/Crankier/Crankier.csproj | 3 +-
.../samples/ClientSample/ClientSample.csproj | 2 +-
.../ref/Microsoft.AspNetCore.Testing.csproj | 32 --
.../ref/Microsoft.AspNetCore.Testing.net46.cs | 374 ------------------
...osoft.AspNetCore.Testing.netstandard2.0.cs | 374 ------------------
.../src/Microsoft.AspNetCore.Testing.csproj | 1 -
src/Testing/test/TestPathUtilitiesTest.cs | 2 +-
.../src/GetDocumentInsider.csproj | 5 +-
.../src/Microsoft.dotnet-openapi.csproj | 2 +-
.../src/dotnet-dev-certs.csproj | 2 +-
.../src/dotnet-getdocument.csproj | 2 +-
.../src/dotnet-sql-cache.csproj | 2 +-
.../src/dotnet-user-secrets.csproj | 2 +-
.../dotnet-watch/src/dotnet-watch.csproj | 5 +-
.../Microsoft.Extensions.WebEncoders.csproj | 1 +
99 files changed, 255 insertions(+), 1019 deletions(-)
create mode 100644 src/Components/Server/src/Directory.Build.targets
delete mode 100644 src/Configuration.KeyPerFile/Directory.Build.props
delete mode 100644 src/FileProviders/Directory.Build.props
create mode 100644 src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.netcoreapp.cs
delete mode 100644 src/Testing/ref/Microsoft.AspNetCore.Testing.csproj
delete mode 100644 src/Testing/ref/Microsoft.AspNetCore.Testing.net46.cs
delete mode 100644 src/Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs
diff --git a/eng/Build.props b/eng/Build.props
index 876c87b6f4f..e40aa38bd62 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -109,6 +109,7 @@
$(RepoRoot)src\Components\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj;
$(RepoRoot)src\SignalR\**\*.npmproj;
$(RepoRoot)src\Middleware\**\*.npmproj;
+ $(RepoRoot)src\JSInterop\**\*.npmproj;
"
RestoreInParallel="false"
Exclude="@(ProjectToExclude)" />
@@ -151,6 +152,14 @@
$(RepoRoot)src\SignalR\**\*.csproj;
$(RepoRoot)src\Components\**\*.csproj;
$(RepoRoot)src\Analyzers\**\*.csproj;
+ $(RepoRoot)src\FileProviders\**\*.csproj;
+ $(RepoRoot)src\Configuration.KeyPerFile\**\*.csproj;
+ $(RepoRoot)src\Localization\**\*.csproj;
+ $(RepoRoot)src\ObjectPool\**\*.csproj;
+ $(RepoRoot)src\JSInterop\**\*.csproj;
+ $(RepoRoot)src\WebEncoders\**\*.csproj;
+ $(RepoRoot)src\HealthChecks\**\*.csproj;
+ $(RepoRoot)src\Testing\**\*.csproj;
$(RepoRoot)src\ProjectTemplates\*\*.csproj;
$(RepoRoot)src\ProjectTemplates\testassets\*\*.csproj;
"
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 2bedb5af612..4fc197153cf 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -30,10 +30,8 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
<LatestPackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiPackageVersion)" />
<LatestPackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
@@ -41,7 +39,6 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="$(MicrosoftExtensionsConfigurationKeyPerFilePackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
@@ -49,20 +46,13 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.HostFactoryResolver.Sources" Version="$(MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
@@ -71,16 +61,10 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="$(MicrosoftExtensionsLoggingEventLogPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.TraceSource" Version="$(MicrosoftExtensionsLoggingTraceSourcePackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="$(MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.ValueStopWatch.Sources" Version="$(MicrosoftExtensionsValueStopwatchSourcesPackageVersion)" />
- <LatestPackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
- <LatestPackageReference Include="Microsoft.JSInterop" Version="$(MicrosoftJSInteropPackageVersion)" />
<LatestPackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<LatestPackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
<LatestPackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
@@ -92,13 +76,16 @@ and are generated based on the last package release.
<LatestPackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
<LatestPackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
+ <LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationPackageVersion)" />
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
<LatestPackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
<LatestPackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
<LatestPackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
<LatestPackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
+ <LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
<LatestPackageReference Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
<LatestPackageReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" />
+ <LatestPackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
<!-- Runtime packages required for crossgen -->
<LatestPackageReference Include="microsoft.netcore.app.runtime.win-x64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
@@ -117,9 +104,7 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.AspNetCore.Analyzer.Testing" Version="$(MicrosoftAspNetCoreAnalyzerTestingPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.1" Version="$(MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.2" Version="$(MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion)" />
- <LatestPackageReference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
- <LatestPackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
<LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)" />
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 8d1040b1575..4518d9b44d3 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -144,5 +144,15 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Forms" ProjectPath="$(RepoRoot)src\Components\Forms\src\Microsoft.AspNetCore.Components.Forms.csproj" RefProjectPath="$(RepoRoot)src\Components\Forms\ref\Microsoft.AspNetCore.Components.Forms.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Server" ProjectPath="$(RepoRoot)src\Components\Server\src\Microsoft.AspNetCore.Components.Server.csproj" RefProjectPath="$(RepoRoot)src\Components\Server\ref\Microsoft.AspNetCore.Components.Server.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Web" ProjectPath="$(RepoRoot)src\Components\Web\src\Microsoft.AspNetCore.Components.Web.csproj" RefProjectPath="$(RepoRoot)src\Components\Web\ref\Microsoft.AspNetCore.Components.Web.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.Extensions.FileProviders.Embedded" ProjectPath="$(RepoRoot)src\FileProviders\Embedded\src\Microsoft.Extensions.FileProviders.Embedded.csproj" RefProjectPath="$(RepoRoot)src\FileProviders\Embedded\ref\Microsoft.Extensions.FileProviders.Embedded.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.Extensions.Configuration.KeyPerFile" ProjectPath="$(RepoRoot)src\Configuration.KeyPerFile\src\Microsoft.Extensions.Configuration.KeyPerFile.csproj" RefProjectPath="$(RepoRoot)src\Configuration.KeyPerFile\ref\Microsoft.Extensions.Configuration.KeyPerFile.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.Extensions.Localization.Abstractions" ProjectPath="$(RepoRoot)src\Localization\Abstractions\src\Microsoft.Extensions.Localization.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\Localization\Abstractions\ref\Microsoft.Extensions.Localization.Abstractions.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.Extensions.Localization" ProjectPath="$(RepoRoot)src\Localization\Localization\src\Microsoft.Extensions.Localization.csproj" RefProjectPath="$(RepoRoot)src\Localization\Localization\ref\Microsoft.Extensions.Localization.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.Extensions.ObjectPool" ProjectPath="$(RepoRoot)src\ObjectPool\src\Microsoft.Extensions.ObjectPool.csproj" RefProjectPath="$(RepoRoot)src\ObjectPool\ref\Microsoft.Extensions.ObjectPool.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.JSInterop" ProjectPath="$(RepoRoot)src\JSInterop\Microsoft.JSInterop\src\Microsoft.JSInterop.csproj" RefProjectPath="$(RepoRoot)src\JSInterop\Microsoft.JSInterop\ref\Microsoft.JSInterop.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" RefProjectPath="$(RepoRoot)src\WebEncoders\ref\Microsoft.Extensions.WebEncoders.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" ProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\src\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\ref\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks" ProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\src\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" RefProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\ref\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
+ <ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj" RefProjectPath="$(RepoRoot)src\Testing\ref\Microsoft.AspNetCore.Testing.csproj" />
</ItemGroup>
</Project>
diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props
index 5c0c46740e2..ec6b304d9ec 100644
--- a/eng/SharedFramework.External.props
+++ b/eng/SharedFramework.External.props
@@ -17,24 +17,18 @@
<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)" />
@@ -43,13 +37,10 @@
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.EventLog" Version="$(MicrosoftExtensionsLoggingEventLogPackageVersion)" />
<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)" />
diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props
index 5f09d593dea..87b203638b2 100644
--- a/eng/SharedFramework.Local.props
+++ b/eng/SharedFramework.Local.props
@@ -26,6 +26,15 @@
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components" />
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components.Forms" />
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components.Web" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.FileProviders.Embedded" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Configuration.KeyPerFile" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Localization.Abstractions" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Localization" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.ObjectPool" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.JSInterop" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.WebEncoders" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
+ <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
<!-- These assemblies are only in the shared framework -->
<AspNetCoreAppReference Include="Microsoft.AspNetCore" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 36195e902f8..fcebe42564b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -61,14 +61,6 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
- <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
@@ -85,10 +77,6 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
@@ -121,10 +109,6 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
@@ -149,14 +133,6 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
- <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
@@ -165,10 +141,6 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
@@ -177,10 +149,6 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
@@ -189,22 +157,10 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
- <Dependency Name="Microsoft.Extensions.Localization" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
@@ -245,10 +201,6 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.ObjectPool" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
@@ -261,34 +213,14 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
- <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
- <Dependency Name="Microsoft.Extensions.WebEncoders" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Internal.Extensions.Refs" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
</Dependency>
- <Dependency Name="Microsoft.JSInterop" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.CSharp" Version="5.0.0-alpha.1.19563.6" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
@@ -420,10 +352,6 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f50767f96246063f33a6565d318f3adf9058bace</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-preview.1.20114.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
- <Uri>https://github.com/dotnet/extensions</Uri>
- <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
- </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.5.0-beta3-20114-02" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>92790e24cc2b9f9e336ed0365d610e106c01df88</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index d399cc33049..b56e758a880 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -98,14 +98,10 @@
<!-- Packages from dotnet/extensions -->
<InternalAspNetCoreAnalyzersPackageVersion>5.0.0-preview.1.20114.1</InternalAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>5.0.0-preview.1.20114.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
- <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
- <MicrosoftAspNetCoreTestingPackageVersion>5.0.0-preview.1.20114.1</MicrosoftAspNetCoreTestingPackageVersion>
- <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsCachingSqlServerPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsCachingSqlServerPackageVersion>
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
- <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
@@ -114,27 +110,19 @@
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationIniPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
- <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
- <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>
- <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
- <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
- <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsHostingPackageVersion>
- <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsHttpPackageVersion>
- <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
- <MicrosoftExtensionsLocalizationPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsLocalizationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
@@ -145,17 +133,11 @@
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingTestingPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsLoggingTestingPackageVersion>
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
- <MicrosoftExtensionsObjectPoolPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsObjectPoolPackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsOptionsPackageVersion>
- <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsPrimitivesPackageVersion>
- <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
- <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
- <MicrosoftExtensionsWebEncodersPackageVersion>5.0.0-preview.1.20114.1</MicrosoftExtensionsWebEncodersPackageVersion>
<MicrosoftInternalExtensionsRefsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftInternalExtensionsRefsPackageVersion>
- <MicrosoftJSInteropPackageVersion>5.0.0-preview.1.20114.1</MicrosoftJSInteropPackageVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.0-preview.1.20113.3</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.1.20113.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
@@ -197,7 +179,9 @@
<SystemCommandlineExperimentalPackageVersion>0.3.0-alpha.19317.1</SystemCommandlineExperimentalPackageVersion>
<SystemComponentModelPackageVersion>4.3.0</SystemComponentModelPackageVersion>
<SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion>
+ <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.5.3</SystemThreadingTasksExtensionsPackageVersion>
+ <SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
<!-- Packages developed by @aspnet, but manually updated as necessary. -->
<LibuvPackageVersion>1.10.0</LibuvPackageVersion>
<MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 4efbe58e976..67f6a757377 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -119,7 +119,7 @@
<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"
+ <Error Condition="@(_InvalidReferenceToNonSharedFxAssembly->Count()) != 0 AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"
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>
diff --git a/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj b/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj
index 25b791e22aa..d5ae182a874 100644
--- a/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj
+++ b/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj
@@ -29,13 +29,13 @@
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Utilities.Core" />
<Reference Include="Microsoft.CodeAnalysis.Razor" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\testassets\StandaloneApp\StandaloneApp.csproj" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="$(ComponentsSharedSourceRoot)test\**\*.cs" LinkBase="Helpers" />
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
index d18ab7c9e44..5546b0db029 100644
--- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
+++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
@@ -18,8 +18,9 @@
<Reference Include="Microsoft.AspNetCore.Components.Server" />
<Reference Include="Microsoft.AspNetCore.ResponseCompression" />
<Reference Include="Microsoft.AspNetCore" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="Microsoft.Extensions.Hosting" />
+
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
</ItemGroup>
<!-- Pack settings -->
diff --git a/src/Components/Components/perf/Microsoft.AspNetCore.Components.Performance.csproj b/src/Components/Components/perf/Microsoft.AspNetCore.Components.Performance.csproj
index a893d64abd8..f40a0a40987 100644
--- a/src/Components/Components/perf/Microsoft.AspNetCore.Components.Performance.csproj
+++ b/src/Components/Components/perf/Microsoft.AspNetCore.Components.Performance.csproj
@@ -10,7 +10,8 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
<Reference Include="Microsoft.AspNetCore.Components" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj
index 8a32a89b9e9..259b3240f0a 100644
--- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj
@@ -7,13 +7,11 @@
<Compile Include="Microsoft.AspNetCore.Components.netstandard2.0.cs" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
<Reference Include="System.Buffers" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<Compile Include="Microsoft.AspNetCore.Components.netcoreapp.cs" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
index 4c0a31a3f6e..88989ad03ce 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -16,7 +16,8 @@
<ItemGroup>
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)HashCodeCombiner\*.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
@@ -34,12 +35,16 @@
<Target Name="_GetNuspecDependencyPackageVersions">
<MSBuild Targets="_GetPackageVersionInfo"
BuildInParallel="$(BuildInParallel)"
- Projects="../../Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj;../../../Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj">
+ Projects="
+ ../../Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj;
+ ../../../JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj;
+ ../../../Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj">
<Output TaskParameter="TargetOutputs" ItemName="_ProjectPathWithVersion" />
</MSBuild>
<ItemGroup>
<NuspecProperty Include="@(_ProjectPathWithVersion->WithMetadataValue('PackageId', 'Microsoft.AspnetCore.Components.Analyzers')->'componentAnalyzerPackageVersion=%(PackageVersion)')" />
<NuspecProperty Include="@(_ProjectPathWithVersion->WithMetadataValue('PackageId', 'Microsoft.AspnetCore.Authorization')->'authorizationPackageVersion=%(PackageVersion)')" />
+ <NuspecProperty Include="@(_ProjectPathWithVersion->WithMetadataValue('PackageId', 'Microsoft.JSInterop')->'jsInteropPackageVersion=%(PackageVersion)')" />
</ItemGroup>
</Target>
@@ -51,7 +56,6 @@
</PropertyGroup>
<ItemGroup>
- <NuspecProperty Include="jsInteropPackageVersion=$(MicrosoftJSInteropPackageVersion)" />
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
<NuspecProperty Include="OutputPath=$(OutputPath)" />
diff --git a/src/Components/Server/src/Directory.Build.targets b/src/Components/Server/src/Directory.Build.targets
new file mode 100644
index 00000000000..09953b9b6c9
--- /dev/null
+++ b/src/Components/Server/src/Directory.Build.targets
@@ -0,0 +1,6 @@
+<Project>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
+ <!-- Workaround target import for project references to Microsoft.Extensions.FileProviders.Embedded -->
+ <Import
+ Project="$(RepoRoot)src\FileProviders\Embedded\src\build\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.targets" />
+</Project>
diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
index 04475e35405..57b11b159e1 100644
--- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
+++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<Description>Runtime server features for ASP.NET Core Components.</Description>
@@ -10,6 +9,7 @@
<NoWarn>CS0436;$(NoWarn)</NoWarn>
<DefineConstants>$(DefineConstants);ENABLE_UNSAFE_MSGPACK;SPAN_BUILTIN;MESSAGEPACK_INTERNAL;COMPONENTS_SERVER</DefineConstants>
<IsShippingPackage>false</IsShippingPackage>
+ <EmbeddedFilesManifestFileName>Microsoft.Extensions.FileProviders.Embedded.Manifest.xml</EmbeddedFilesManifestFileName>
</PropertyGroup>
<ItemGroup>
@@ -22,7 +22,8 @@
<Reference Include="Microsoft.Extensions.FileProviders.Composite" />
<Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
<Reference Include="Microsoft.Extensions.Logging" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" PrivateAssets="All" />
+
+ <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
<!-- Add a project dependency without reference output assemblies to enforce build order -->
<!-- Applying workaround for https://github.com/microsoft/msbuild/issues/2661 and https://github.com/dotnet/sdk/issues/952 -->
@@ -39,6 +40,15 @@
<MessagePackRoot>$(RepoRoot)src\submodules\MessagePack-CSharp\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\</MessagePackRoot>
</PropertyGroup>
+ <!-- This workaround is required when referencing FileProviders.Embedded as a project -->
+ <PropertyGroup>
+ <_FileProviderTaskAssembly>$(ArtifactsDir)bin\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task\$(Configuration)\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll</_FileProviderTaskAssembly>
+ </PropertyGroup>
+
+ <UsingTask
+ AssemblyFile="$(_FileProviderTaskAssembly)"
+ TaskName="Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.GenerateEmbeddedResourcesManifest" />
+
<ItemGroup>
<Compile Include="$(ComponentsSharedSourceRoot)src\CacheHeaderSettings.cs" Link="Shared\CacheHeaderSettings.cs" />
<Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="Circuits" />
@@ -84,5 +94,4 @@
<EmbeddedResource Include="$(BlazorServerJSFile)" LogicalName="_framework/%(Filename)%(Extension)" />
<EmbeddedResource Include="$(BlazorServerJSFile).map" LogicalName="_framework/%(Filename)%(Extension)" Condition="Exists('$(BlazorServerJSFile).map')" />
</ItemGroup>
-
</Project>
\ No newline at end of file
diff --git a/src/Configuration.KeyPerFile/Directory.Build.props b/src/Configuration.KeyPerFile/Directory.Build.props
deleted file mode 100644
index 63d0c8b102d..00000000000
--- a/src/Configuration.KeyPerFile/Directory.Build.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
- <PropertyGroup>
- <GenerateDocumentationFile Condition=" '$(IsUnitTestProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</GenerateDocumentationFile>
- <PackageTags>configuration</PackageTags>
- <NoWarn>$(NoWarn);PKG0001</NoWarn>
- </PropertyGroup>
-</Project>
diff --git a/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj b/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj
index 7f9c5e7eb19..b8b281716e5 100644
--- a/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj
+++ b/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj
@@ -6,6 +6,10 @@
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ <PackageTags>configuration</PackageTags>
+ <NoWarn>$(NoWarn);PKG0001</NoWarn>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Configuration.KeyPerFile/test/ConfigurationProviderTestBase.cs b/src/Configuration.KeyPerFile/test/ConfigurationProviderTestBase.cs
index 4609ee2560f..67cb20c6c38 100644
--- a/src/Configuration.KeyPerFile/test/ConfigurationProviderTestBase.cs
+++ b/src/Configuration.KeyPerFile/test/ConfigurationProviderTestBase.cs
@@ -239,7 +239,7 @@ Section3:
var section3 = config.GetSection("Section3");
Assert.Equal("Section3", section3.Path, StringComparer.InvariantCultureIgnoreCase);
Assert.Null(section3.Value);
-
+
var section4 = config.GetSection("Section3:Section4");
Assert.Equal(value344, section4["Key4"], StringComparer.InvariantCultureIgnoreCase);
Assert.Equal("Section3:Section4", section4.Path, StringComparer.InvariantCultureIgnoreCase);
@@ -758,4 +758,4 @@ Section3:
};
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Configuration.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj b/src/Configuration.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj
index 7abceed7028..053553b984e 100644
--- a/src/Configuration.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj
+++ b/src/Configuration.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj
@@ -4,10 +4,6 @@
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
</PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Config\test\Microsoft.Extensions.Configuration.Tests.csproj" />
- </ItemGroup>
-
<ItemGroup>
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
<Reference Include="Microsoft.Extensions.Configuration.Binder" />
diff --git a/src/FileProviders/Directory.Build.props b/src/FileProviders/Directory.Build.props
deleted file mode 100644
index 709c47ddbd7..00000000000
--- a/src/FileProviders/Directory.Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
- <PropertyGroup>
- <GenerateDocumentationFile Condition=" '$(IsUnitTestProject)' != 'true' ">true</GenerateDocumentationFile>
- <PackageTags>files;filesystem</PackageTags>
- </PropertyGroup>
-</Project>
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
index 3d5fe3cf54f..97d9600f131 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
@@ -9,6 +9,10 @@
<NuspecFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildProjectName).netcoreapp.nuspec</NuspecFile>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ <PackageTags>files;filesystem</PackageTags>
+ <NoPackageAnalysis>true</NoPackageAnalysis>
</PropertyGroup>
<ItemGroup>
@@ -28,6 +32,7 @@
<ItemGroup>
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
<NuspecProperty Include="OutputPath=$(OutputPath)" />
+ <NuspecProperty Include="AbstractionsPackageVersion=$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
<NuspecProperty Include="TaskAssemblyNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll"/>
<NuspecProperty Include="TaskSymbolNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb" Condition="'$(DebugType)'!='embedded'"/>
</ItemGroup>
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
index 6acde4ec1d7..08148f6430b 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
@@ -3,11 +3,11 @@
<metadata>
$CommonMetadataElements$
<dependencies>
- <group targetFramework=".NETCoreApp3.1">
- <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$version$" exclude="Build,Analyzers" />
+ <group targetFramework=".NETCoreApp5.0">
+ <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsPackageVersion$" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
- <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$version$" exclude="Build,Analyzers" />
+ <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsPackageVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
index 217efb6cea9..4a55fc9230c 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
@@ -3,8 +3,8 @@
<metadata>
$CommonMetadataElements$
<dependencies>
- <group targetFramework=".NETCoreApp3.1">
- <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$version$" exclude="Build,Analyzers" />
+ <group targetFramework=".NETCoreApp5.0">
+ <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsPackageVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
diff --git a/src/FileProviders/Manifest.MSBuildTask/src/Entry.cs b/src/FileProviders/Manifest.MSBuildTask/src/Entry.cs
index 1a7f18bef81..93f4c0d277f 100644
--- a/src/FileProviders/Manifest.MSBuildTask/src/Entry.cs
+++ b/src/FileProviders/Manifest.MSBuildTask/src/Entry.cs
@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
-namespace Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Internal
+namespace Microsoft.Extensions.FileProviders.Embedded.Manifest.Task
{
/// <summary>
/// This API supports infrastructure and is not intended to be used
diff --git a/src/FileProviders/Manifest.MSBuildTask/src/Manifest.cs b/src/FileProviders/Manifest.MSBuildTask/src/Manifest.cs
index 86e99477ff4..d21c2f74bb0 100644
--- a/src/FileProviders/Manifest.MSBuildTask/src/Manifest.cs
+++ b/src/FileProviders/Manifest.MSBuildTask/src/Manifest.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml.Linq;
-using Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Internal;
namespace Microsoft.Extensions.FileProviders.Embedded.Manifest.Task
{
diff --git a/src/FileProviders/Manifest.MSBuildTask/src/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj b/src/FileProviders/Manifest.MSBuildTask/src/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj
index cdc4ffdcb0b..ab693848c50 100644
--- a/src/FileProviders/Manifest.MSBuildTask/src/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj
+++ b/src/FileProviders/Manifest.MSBuildTask/src/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj
@@ -8,6 +8,7 @@
<IsShippingAssembly>true</IsShippingAssembly>
<IsPackable>false</IsPackable>
<IsImplementationProject>false</IsImplementationProject>
+ <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
</PropertyGroup>
<ItemGroup>
diff --git a/src/FileProviders/Manifest.MSBuildTask/test/GenerateEmbeddedResourcesManifestTest.cs b/src/FileProviders/Manifest.MSBuildTask/test/GenerateEmbeddedResourcesManifestTest.cs
index c7285913af1..260d15f7f71 100644
--- a/src/FileProviders/Manifest.MSBuildTask/test/GenerateEmbeddedResourcesManifestTest.cs
+++ b/src/FileProviders/Manifest.MSBuildTask/test/GenerateEmbeddedResourcesManifestTest.cs
@@ -10,7 +10,6 @@ using System.Xml;
using System.Xml.Linq;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
-using Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Internal;
using Xunit;
namespace Microsoft.Extensions.FileProviders.Embedded.Manifest.Task
diff --git a/src/FileProviders/Manifest.MSBuildTask/test/SetExtensions.cs b/src/FileProviders/Manifest.MSBuildTask/test/SetExtensions.cs
index 6b2c83a875f..0a80b7fb76d 100644
--- a/src/FileProviders/Manifest.MSBuildTask/test/SetExtensions.cs
+++ b/src/FileProviders/Manifest.MSBuildTask/test/SetExtensions.cs
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Internal;
-
namespace Microsoft.Extensions.FileProviders.Embedded.Manifest.Task
{
internal static class SetExtensions
diff --git a/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj b/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj
index aeb85d3e760..fac2cf9a99e 100644
--- a/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj
+++ b/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj
@@ -14,6 +14,7 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck
<PackageTags>diagnostics;healthchecks</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
diff --git a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
index 35c789a691f..9e89a9e06e1 100644
--- a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
+++ b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
@@ -13,6 +13,7 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder
<PackageTags>diagnostics;healthchecks</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
@@ -20,8 +21,8 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder
</ItemGroup>
<ItemGroup>
- <Compile Include="$(SharedSourceRoot)NonCapturingTimer\**\*.cs" />
- <Compile Include="$(SharedSourceRoot)ValueStopwatch\**\*.cs" />
+ <Compile Include="$(SharedSourceRoot)NonCapturingTimer\*.cs" />
+ <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj b/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj
index 1591585b826..d5cf94e2e5d 100644
--- a/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj
+++ b/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj
@@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="$(RepoRoot)src\Logging\Logging.Testing\src\build\Microsoft.Extensions.Logging.Testing.props" />
-
<PropertyGroup>
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
<RootNamespace>Microsoft.Extensions.Diagnostics.HealthChecks</RootNamespace>
@@ -21,7 +19,7 @@
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\..\Shared\test\SingleThreadedSynchronizationContext.cs" Link="Shared\SingleThreadedSynchronizationContext.cs"/>
+ <Compile Include="$(SharedSourceRoot)test\Shared.Tests\SingleThreadedSynchronizationContext.cs" Link="Shared\SingleThreadedSynchronizationContext.cs"/>
</ItemGroup>
</Project>
diff --git a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj
index 4c426161185..959abbb1608 100644
--- a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj
+++ b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj
@@ -17,6 +17,5 @@
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
index 0e71bb69c99..e8315ef18bb 100644
--- a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
+++ b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
@@ -29,7 +29,8 @@
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)TypeNameHelper\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj
index 7dd0c1a2d2e..8da7c426050 100644
--- a/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj
+++ b/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj
@@ -6,7 +6,6 @@
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<Compile Include="Microsoft.AspNetCore.TestHost.netcoreapp.cs" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
- <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
<Reference Include="System.IO.Pipelines" />
</ItemGroup>
</Project>
diff --git a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
index 0ef4679eb1c..d2072045201 100644
--- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
+++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
@@ -11,8 +11,9 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Hosting" />
- <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
<Reference Include="System.IO.Pipelines" />
+
+ <Compile Include="$(SharedSourceRoot)HostFactoryResolver\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj
index a3f0a4268f7..fc6109502d2 100644
--- a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj
+++ b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj
@@ -6,7 +6,6 @@
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<Compile Include="Microsoft.AspNetCore.Http.Abstractions.netcoreapp.cs" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" />
<Reference Include="Microsoft.Net.Http.Headers" />
</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 c5ab085eef0..77591367513 100644
--- a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
+++ b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
@@ -22,8 +22,10 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" />
<Reference Include="Microsoft.Net.Http.Headers" />
+
+ <Compile Include="$(SharedSourceRoot)ActivatorUtilities\*.cs" />
+ <Compile Include="$(SharedSourceRoot)ParameterDefaultValue\*.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj b/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj
index 6a42bef5fe3..7f371de3801 100644
--- a/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj
+++ b/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj
@@ -12,7 +12,8 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
<Reference Include="Microsoft.AspNetCore.Http" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj
index 308dc68011f..4f68c48487a 100644
--- a/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj
+++ b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj
@@ -37,11 +37,12 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.Http" />
<Reference Include="Microsoft.AspNetCore.Routing" />
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.Extensions.Logging" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj
index 90ff9fea7c3..e8a4a831ba1 100644
--- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj
+++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj
@@ -8,7 +8,6 @@
<Reference Include="Microsoft.AspNetCore.Authorization" />
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.ObjectPool" />
<Reference Include="Microsoft.Extensions.Options" />
diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
index 7c399fe5575..56072134d08 100644
--- a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
+++ b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
@@ -30,10 +30,11 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
<Reference Include="Microsoft.AspNetCore.Authorization" />
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.ObjectPool" />
<Reference Include="Microsoft.Extensions.Options" />
+
+ <Compile Include="$(SharedSourceRoot)HashCodeCombiner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Http/Routing/tools/Swaggatherer/Swaggatherer.csproj b/src/Http/Routing/tools/Swaggatherer/Swaggatherer.csproj
index cd256b125c0..1d083a55e46 100644
--- a/src/Http/Routing/tools/Swaggatherer/Swaggatherer.csproj
+++ b/src/Http/Routing/tools/Swaggatherer/Swaggatherer.csproj
@@ -9,7 +9,8 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json" />
<Reference Include="Microsoft.AspNetCore.Routing" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/Microsoft.AspNetCore.WebUtilities.Performance.csproj b/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/Microsoft.AspNetCore.WebUtilities.Performance.csproj
index adbd0714f6d..a170bf6cc11 100644
--- a/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/Microsoft.AspNetCore.WebUtilities.Performance.csproj
+++ b/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/Microsoft.AspNetCore.WebUtilities.Performance.csproj
@@ -13,10 +13,10 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
<Reference Include="Microsoft.AspNetCore.WebUtilities" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
</ItemGroup>
<ItemGroup>
<Compile Include="$(SharedSourceRoot)Buffers.Testing\**\*.cs" />
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj b/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj
index 08e9b73b5fd..f4f35eea006 100644
--- a/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj
+++ b/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj
@@ -7,8 +7,9 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Http" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj
index a45484e0d3a..83acae807fe 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj
+++ b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj
@@ -8,6 +8,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
diff --git a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj
index 4b881604014..92139f6145f 100644
--- a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj
+++ b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj
@@ -13,6 +13,7 @@ Microsoft.Extensions.Localization.IStringLocalizer<T></Description>
<PackageTags>localization</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
diff --git a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj
index b6b059ce827..f69b533885e 100644
--- a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj
+++ b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj
@@ -10,6 +10,7 @@
<PackageTags>localization</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs b/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs
index 4f13611a47d..0f033a52271 100644
--- a/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs
+++ b/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs
@@ -54,7 +54,9 @@ namespace Microsoft.Extensions.Localization
/// </summary>
public ResourceManagerStringLocalizer(
ResourceManager resourceManager,
+#pragma warning disable PUB0001 // Pubternal type AssemblyWrapper in public API
AssemblyWrapper resourceAssemblyWrapper,
+#pragma warning restore PUB0001 // Pubternal type AssemblyWrapper in public API
string baseName,
IResourceNamesCache resourceNamesCache,
ILogger logger)
@@ -76,7 +78,9 @@ namespace Microsoft.Extensions.Localization
/// </summary>
public ResourceManagerStringLocalizer(
ResourceManager resourceManager,
+#pragma warning disable PUB0001 // Pubternal type IResourceStringProvider in public API
IResourceStringProvider resourceStringProvider,
+#pragma warning restore PUB0001 // Pubternal type IResourceStringProvider in public API
string baseName,
IResourceNamesCache resourceNamesCache,
ILogger logger)
diff --git a/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj b/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj
index 70e7a6de1a9..747bafc7015 100644
--- a/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj
+++ b/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj
@@ -11,7 +11,6 @@
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging.Testing" />
- <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Options" />
<Reference Include="Microsoft.Extensions.Primitives" />
diff --git a/src/Middleware/ConcurrencyLimiter/perf/Microbenchmarks/Microsoft.AspNetCore.ConcurrencyLimiter.Microbenchmarks.csproj b/src/Middleware/ConcurrencyLimiter/perf/Microbenchmarks/Microsoft.AspNetCore.ConcurrencyLimiter.Microbenchmarks.csproj
index 83717156dfb..2674be405d1 100644
--- a/src/Middleware/ConcurrencyLimiter/perf/Microbenchmarks/Microsoft.AspNetCore.ConcurrencyLimiter.Microbenchmarks.csproj
+++ b/src/Middleware/ConcurrencyLimiter/perf/Microbenchmarks/Microsoft.AspNetCore.ConcurrencyLimiter.Microbenchmarks.csproj
@@ -12,7 +12,8 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.ConcurrencyLimiter" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj b/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj
index 1b36bc0211b..4aea744d909 100644
--- a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj
+++ b/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj
@@ -8,6 +8,5 @@
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj b/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj
index fd2eb47d66a..5bdff90f900 100644
--- a/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj
+++ b/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj
@@ -12,7 +12,8 @@
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj
index 1cb4a825a63..eb5f581428e 100644
--- a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj
+++ b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj
@@ -13,6 +13,5 @@
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
index 6a82485ad68..3697cbee0f3 100644
--- a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
+++ b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
@@ -14,6 +14,7 @@
<Compile Include="$(SharedSourceRoot)Diagnostics\*.cs" />
<Compile Include="$(SharedSourceRoot)RazorViews\*.cs" />
<Compile Include="$(SharedSourceRoot)StackTrace\**\*.cs" />
+ <Compile Include="$(SharedSourceRoot)TypeNameHelper\*.cs" />
</ItemGroup>
<ItemGroup>
@@ -25,7 +26,6 @@
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj b/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj
index a4ec7230f61..5b01d110339 100644
--- a/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj
+++ b/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj
@@ -8,9 +8,10 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
<Reference Include="Microsoft.AspNetCore.Http" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.ResponseCompression" />
<Reference Include="Microsoft.Extensions.DependencyInjection" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/perf/Microbenchmarks/Microsoft.AspNetCore.WebSockets.Microbenchmarks.csproj b/src/Middleware/perf/Microbenchmarks/Microsoft.AspNetCore.WebSockets.Microbenchmarks.csproj
index 96a0535de79..81d4c4f6431 100644
--- a/src/Middleware/perf/Microbenchmarks/Microsoft.AspNetCore.WebSockets.Microbenchmarks.csproj
+++ b/src/Middleware/perf/Microbenchmarks/Microsoft.AspNetCore.WebSockets.Microbenchmarks.csproj
@@ -7,7 +7,8 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.WebSockets" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Middleware/perf/ResponseCaching.Microbenchmarks/Microsoft.AspNetCore.ResponseCaching.Microbenchmarks.csproj b/src/Middleware/perf/ResponseCaching.Microbenchmarks/Microsoft.AspNetCore.ResponseCaching.Microbenchmarks.csproj
index 5fc2110b404..15f456fd2f4 100644
--- a/src/Middleware/perf/ResponseCaching.Microbenchmarks/Microsoft.AspNetCore.ResponseCaching.Microbenchmarks.csproj
+++ b/src/Middleware/perf/ResponseCaching.Microbenchmarks/Microsoft.AspNetCore.ResponseCaching.Microbenchmarks.csproj
@@ -7,7 +7,8 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.ResponseCaching" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
index 8a4bebf5466..111d4764aca 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@@ -27,7 +27,6 @@
<Reference Include="Microsoft.AspNetCore.Identity" />
<Reference Include="Microsoft.AspNetCore.WebUtilities" />
<Reference Include="Microsoft.Data.SqlClient" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="Microsoft.Extensions.Configuration.Binder" />
<Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
<Reference Include="Microsoft.Extensions.Configuration.Json" />
@@ -36,6 +35,8 @@
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Microsoft.Extensions.Logging.Testing" />
<Reference Include="Microsoft.Extensions.Logging" />
+
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj
index 86533825ea9..aca1b44ad56 100644
--- a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj
+++ b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj
@@ -7,6 +7,5 @@
<Compile Include="Microsoft.AspNetCore.Mvc.Abstractions.netcoreapp.cs" />
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
<Reference Include="Microsoft.Net.Http.Headers" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj
index 4be8e0b0161..8362bd5cbe2 100644
--- a/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj
+++ b/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj
@@ -20,8 +20,8 @@ Microsoft.AspNetCore.Mvc.IActionResult</Description>
<Reference Include="Microsoft.Net.Http.Headers" />
</ItemGroup>
- <ItemGroup Label="Sources packages">
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
+ <ItemGroup Label="Shared Source">
+ <Compile Include="$(SharedSourceRoot)HashCodeCombiner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj
index 670de5a7d7b..92acf1544ff 100644
--- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj
+++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj
@@ -18,8 +18,5 @@
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
- <Reference Include="Microsoft.Extensions.ParameterDefaultValue.Sources" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj
index 1d1eaa6448e..7ffbe3d3f34 100644
--- a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj
+++ b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj
@@ -48,9 +48,9 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
</ItemGroup>
<ItemGroup Label="Sources packages">
- <Reference Include="Microsoft.Extensions.ParameterDefaultValue.Sources" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />
+ <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
+ <Compile Include="$(SharedSourceRoot)ParameterDefaultValue\*.cs" />
+ <Compile Include="$(SharedSourceRoot)TypeNameHelper\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.csproj
index cb3241a4fa2..eebe8535136 100644
--- a/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.csproj
+++ b/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.csproj
@@ -7,7 +7,6 @@
<Compile Include="Microsoft.AspNetCore.Mvc.Testing.netcoreapp.cs" />
<Reference Include="Microsoft.AspNetCore.TestHost" />
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
- <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
<Reference Include="Microsoft.Extensions.DependencyModel" />
<Reference Include="Microsoft.Extensions.Hosting" />
</ItemGroup>
diff --git a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj
index 0df3b51ffa3..2c851d263bb 100644
--- a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj
+++ b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj
@@ -12,9 +12,10 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.TestHost" />
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
- <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
<Reference Include="Microsoft.Extensions.DependencyModel" />
<Reference Include="Microsoft.Extensions.Hosting" />
+
+ <Compile Include="$(SharedSourceRoot)HostFactoryResolver\*.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
index e2a5cad37af..2c40984a452 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
@@ -11,7 +11,8 @@
<Reference Include="Microsoft.AspNetCore.Mvc" />
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Performance.Views\Microsoft.AspNetCore.Mvc.Performance.Views.csproj" />
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj b/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj
index 1fbb81a9ca6..be298e7ae32 100644
--- a/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj
+++ b/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj
@@ -1,10 +1,14 @@
<!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<Compile Include="Microsoft.Extensions.ObjectPool.netstandard2.0.cs" />
+ </ItemGroup>
+<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
+ <Compile Include="Microsoft.Extensions.ObjectPool.netcoreapp.cs" />
+
</ItemGroup>
</Project>
diff --git a/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.netcoreapp.cs b/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.netcoreapp.cs
new file mode 100644
index 00000000000..b3b72bec86e
--- /dev/null
+++ b/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.netcoreapp.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.Extensions.ObjectPool
+{
+ public partial class DefaultObjectPoolProvider : Microsoft.Extensions.ObjectPool.ObjectPoolProvider
+ {
+ public DefaultObjectPoolProvider() { }
+ public int MaximumRetained { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
+ public override Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy) { throw null; }
+ }
+ public partial class DefaultObjectPool<T> : Microsoft.Extensions.ObjectPool.ObjectPool<T> where T : class
+ {
+ public DefaultObjectPool(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy) { }
+ public DefaultObjectPool(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy, int maximumRetained) { }
+ public override T Get() { throw null; }
+ public override void Return(T obj) { }
+ }
+ public partial class DefaultPooledObjectPolicy<T> : Microsoft.Extensions.ObjectPool.PooledObjectPolicy<T> where T : class, new()
+ {
+ public DefaultPooledObjectPolicy() { }
+ public override T Create() { throw null; }
+ public override bool Return(T obj) { throw null; }
+ }
+ public partial interface IPooledObjectPolicy<T>
+ {
+ T Create();
+ bool Return(T obj);
+ }
+ public partial class LeakTrackingObjectPoolProvider : Microsoft.Extensions.ObjectPool.ObjectPoolProvider
+ {
+ public LeakTrackingObjectPoolProvider(Microsoft.Extensions.ObjectPool.ObjectPoolProvider inner) { }
+ public override Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy) { throw null; }
+ }
+ public partial class LeakTrackingObjectPool<T> : Microsoft.Extensions.ObjectPool.ObjectPool<T> where T : class
+ {
+ public LeakTrackingObjectPool(Microsoft.Extensions.ObjectPool.ObjectPool<T> inner) { }
+ public override T Get() { throw null; }
+ public override void Return(T obj) { }
+ }
+ public static partial class ObjectPool
+ {
+ public static Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy = null) where T : class, new() { throw null; }
+ }
+ public abstract partial class ObjectPoolProvider
+ {
+ protected ObjectPoolProvider() { }
+ public Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>() where T : class, new() { throw null; }
+ public abstract Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy) where T : class;
+ }
+ public static partial class ObjectPoolProviderExtensions
+ {
+ public static Microsoft.Extensions.ObjectPool.ObjectPool<System.Text.StringBuilder> CreateStringBuilderPool(this Microsoft.Extensions.ObjectPool.ObjectPoolProvider provider) { throw null; }
+ public static Microsoft.Extensions.ObjectPool.ObjectPool<System.Text.StringBuilder> CreateStringBuilderPool(this Microsoft.Extensions.ObjectPool.ObjectPoolProvider provider, int initialCapacity, int maximumRetainedCapacity) { throw null; }
+ }
+ public abstract partial class ObjectPool<T> where T : class
+ {
+ protected ObjectPool() { }
+ public abstract T Get();
+ public abstract void Return(T obj);
+ }
+ public abstract partial class PooledObjectPolicy<T> : Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T>
+ {
+ protected PooledObjectPolicy() { }
+ public abstract T Create();
+ public abstract bool Return(T obj);
+ }
+ public partial class StringBuilderPooledObjectPolicy : Microsoft.Extensions.ObjectPool.PooledObjectPolicy<System.Text.StringBuilder>
+ {
+ public StringBuilderPooledObjectPolicy() { }
+ public int InitialCapacity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
+ public int MaximumRetainedCapacity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
+ public override System.Text.StringBuilder Create() { throw null; }
+ public override bool Return(System.Text.StringBuilder obj) { throw null; }
+ }
+}
diff --git a/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj b/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj
index c193ad6e1f1..ab3be847adf 100644
--- a/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj
+++ b/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj
@@ -2,12 +2,13 @@
<PropertyGroup>
<Description>A simple object pool implementation.</Description>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>pooling</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
index 037552d4927..94341404967 100644
--- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
+++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
@@ -33,7 +33,8 @@
<ItemGroup>
<Reference Include="AngleSharp" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj
index 57241da5787..e32a58b3d22 100644
--- a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj
+++ b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj
@@ -6,6 +6,5 @@
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<Compile Include="Microsoft.AspNetCore.Razor.netcoreapp.cs" />
<Reference Include="Microsoft.AspNetCore.Html.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj
index c13602372b5..d849db7d5a7 100644
--- a/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj
+++ b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj
@@ -21,7 +21,8 @@ Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper</Description>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Html.Abstractions" />
- <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)HashCodeCombiner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj b/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
index c6bb2715364..65871e5a783 100644
--- a/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
+++ b/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
@@ -12,10 +12,11 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Authorization.Policy" />
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.Http" />
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.Extensions.Logging" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj
index 290b58c7fe0..8678427a8f4 100644
--- a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj
+++ b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj
@@ -6,20 +6,17 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<Compile Include="Microsoft.AspNetCore.Connections.Abstractions.netstandard2.0.cs" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="Microsoft.Bcl.AsyncInterfaces" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<Compile Include="Microsoft.AspNetCore.Connections.Abstractions.netstandard2.1.cs" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" />
<Reference Include="System.IO.Pipelines" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<Compile Include="Microsoft.AspNetCore.Connections.Abstractions.netcoreapp.cs" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" />
<Reference Include="System.IO.Pipelines" />
</ItemGroup>
</Project>
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 43f6d4b5748..6b0ec1e4781 100644
--- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
+++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
@@ -13,8 +13,10 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" />
<Reference Include="System.IO.Pipelines" />
+
+ <Compile Include="$(SharedSourceRoot)ActivatorUtilities\*.cs" />
+ <Compile Include="$(SharedSourceRoot)ParameterDefaultValue\*.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj
index 9435906632b..2abb302273f 100644
--- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj
+++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj
@@ -33,8 +33,9 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj
index a88930de54c..746230e19c8 100644
--- a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj
@@ -12,7 +12,6 @@
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>
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 a95e4ec56ad..1645d8fd261 100644
--- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
@@ -14,6 +14,7 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Include="$(SharedSourceRoot)TypeNameHelper\*.cs" />
<Compile Include="$(SharedSourceRoot)Buffers.MemoryPool\**\*.cs" LinkBase="Shared\" />
<Compile Include="$(SharedSourceRoot)HttpSys\**\*.cs" LinkBase="Shared\"/>
<Compile Include="$(SharedSourceRoot)StackTrace\**\*.cs" LinkBase="Shared\" />
@@ -39,7 +40,6 @@
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>
diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
index df7255d954f..07c9d49f68a 100644
--- a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
+++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
@@ -23,11 +23,12 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
index e77498d9516..b4442f73ba1 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
@@ -17,13 +17,13 @@
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.cs" Link="Internal\TransportConnection.cs" />
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.Generated.cs" Link="Internal\TransportConnection.Generated.cs" />
<Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.FeatureCollection.cs" Link="Internal\TransportConnection.FeatureCollection.cs" />
+ <Compile Include="$(SharedSourceRoot)TypeNameHelper\*.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Threading.Channels" />
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
<Reference Include="Newtonsoft.Json" />
</ItemGroup>
diff --git a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj
index 76051ab1814..ff221e12056 100644
--- a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj
+++ b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj
@@ -18,6 +18,7 @@
<Compile Include="$(SharedSourceRoot)HttpSys\**\*.cs" Link="Shared\HttpSys\%(Filename)%(Extension)"/>
<Compile Include="$(SharedSourceRoot)NonCapturingTimer\*.cs" Link="Shared\NonCapturingTimer\%(Filename)%(Extension)"/>
<Compile Include="$(SharedSourceRoot)ObjectMethodExecutor\*.cs" Link="Shared\ObjectMethodExecutor\%(Filename)%(Extension)"/>
+ <Compile Include="$(SharedSourceRoot)ParameterDefaultValue\*.cs" Link="Shared\ParameterDefaultValue\%(Filename)%(Extension)"/>
<Compile Include="$(SharedSourceRoot)PropertyActivator\*.cs" Link="Shared\PropertyActivator\%(Filename)%(Extension)"/>
<Compile Include="$(SharedSourceRoot)PropertyHelper\*.cs" Link="Shared\PropertyHelper\%(Filename)%(Extension)"/>
<Compile Include="$(SharedSourceRoot)SecurityHelper\**\*.cs" Link="Shared\SecurityHelper\%(Filename)%(Extension)"/>
@@ -25,6 +26,7 @@
<Compile Include="$(SharedSourceRoot)TypeNameHelper\StackFrame\**\*.cs" Link="Shared\TypeNameHelper\%(Filename)%(Extension)"/>
<Compile Include="$(SharedSourceRoot)ValueStopwatch\**\*.cs" Link="Shared\ValueStopwatch\%(Filename)%(Extension)"/>
<Compile Include="$(SharedSourceRoot)WebEncoders\**\*.cs" Link="Shared\WebEncoders\%(Filename)%(Extension)"/>
+ <Compile Include="$(SharedSourceRoot)TypeNameHelper\*.cs" />
</ItemGroup>
<ItemGroup>
@@ -36,7 +38,6 @@
<Reference Include="System.Security.Principal.Windows" />
<Reference Include="System.Threading.Tasks.Extensions" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
- <Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
<Reference Include="Microsoft.Net.Http.Headers" />
</ItemGroup>
diff --git a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj
index 8b474e9124b..88278791409 100644
--- a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj
+++ b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj
@@ -11,7 +11,6 @@
<Reference Include="Microsoft.AspNetCore.Http" />
<Reference Include="Microsoft.AspNetCore.Routing" />
<Reference Include="Microsoft.AspNetCore.WebSockets" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />
<Reference Include="System.Security.Principal.Windows" />
</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 d19e84efe50..4e739f5c377 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
@@ -31,8 +31,9 @@
<Reference Include="Microsoft.AspNetCore.Http" />
<Reference Include="Microsoft.AspNetCore.Routing" />
<Reference Include="Microsoft.AspNetCore.WebSockets" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />
<Reference Include="System.Security.Principal.Windows" />
+
+ <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj b/src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj
index ce47db0ac82..578f42c20b9 100644
--- a/src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj
+++ b/src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj
@@ -20,7 +20,8 @@
<Reference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" />
<Reference Include="Microsoft.AspNetCore.Testing" />
<Reference Include="Microsoft.Extensions.Logging.Testing" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />
+
+ <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj
index 3f892a8cdf4..ff022626496 100644
--- a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj
+++ b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj
@@ -22,7 +22,6 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
- <Reference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" />
<Reference Include="Microsoft.AspNetCore.Http.Connections.Client" />
<Reference Include="Microsoft.AspNetCore.Http.Connections" />
<Reference Include="Microsoft.AspNetCore.SignalR.Client.Core" />
@@ -32,10 +31,13 @@
<Reference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
<Reference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" />
<Reference Include="Microsoft.Extensions.DependencyInjection" />
- <Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />
<Reference Include="Moq" />
<Reference Include="System.Reactive.Linq" />
<Reference Include="System.Threading.Channels" />
<Reference Include="System.Threading.Tasks.Extensions" />
+
+
+ <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
+ <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/SignalR/perf/benchmarkapps/Crankier/Crankier.csproj b/src/SignalR/perf/benchmarkapps/Crankier/Crankier.csproj
index 23ae6b00273..001d8138de9 100644
--- a/src/SignalR/perf/benchmarkapps/Crankier/Crankier.csproj
+++ b/src/SignalR/perf/benchmarkapps/Crankier/Crankier.csproj
@@ -9,7 +9,6 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.SignalR.Client" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="Microsoft.AspNetCore.SignalR" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
@@ -17,6 +16,8 @@
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Newtonsoft.Json" />
<Reference Include="Microsoft.Azure.SignalR" />
+
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
</ItemGroup>
</Project>
diff --git a/src/SignalR/samples/ClientSample/ClientSample.csproj b/src/SignalR/samples/ClientSample/ClientSample.csproj
index 4c8d780015e..bdbe30c2be9 100644
--- a/src/SignalR/samples/ClientSample/ClientSample.csproj
+++ b/src/SignalR/samples/ClientSample/ClientSample.csproj
@@ -7,13 +7,13 @@
<ItemGroup>
<Compile Include="$(SignalRSharedSourceRoot)DuplexPipe.cs" Link="DuplexPipe.cs" />
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.SignalR.Client" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Microsoft.Extensions.Logging" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
</ItemGroup>
</Project>
diff --git a/src/Testing/ref/Microsoft.AspNetCore.Testing.csproj b/src/Testing/ref/Microsoft.AspNetCore.Testing.csproj
deleted file mode 100644
index 4606a541110..00000000000
--- a/src/Testing/ref/Microsoft.AspNetCore.Testing.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- This file is automatically generated. -->
-<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
- </PropertyGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <Compile Include="Microsoft.AspNetCore.Testing.netstandard2.0.cs" />
- <Reference Include="Microsoft.Win32.Registry" />
- <Reference Include="System.ValueTuple" />
- <Reference Include="xunit.assert" />
- <Reference Include="xunit.extensibility.execution" />
- </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
- <Compile Include="Microsoft.AspNetCore.Testing.net46.cs" />
- <Reference Include="Microsoft.Win32.Registry" />
- <Reference Include="System.ValueTuple" />
- <Reference Include="xunit.assert" />
- <Reference Include="xunit.extensibility.execution" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Numerics" />
- <Reference Include="System.IO.Compression.FileSystem" />
- <Reference Include="mscorlib" />
- </ItemGroup>
-</Project>
diff --git a/src/Testing/ref/Microsoft.AspNetCore.Testing.net46.cs b/src/Testing/ref/Microsoft.AspNetCore.Testing.net46.cs
deleted file mode 100644
index 17a922a6c7b..00000000000
--- a/src/Testing/ref/Microsoft.AspNetCore.Testing.net46.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.AspNetCore.Testing
-{
- public partial class AspNetTestAssemblyRunner : Xunit.Sdk.XunitTestAssemblyRunner
- {
- public AspNetTestAssemblyRunner(Xunit.Abstractions.ITestAssembly testAssembly, System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Abstractions.IMessageSink executionMessageSink, Xunit.Abstractions.ITestFrameworkExecutionOptions executionOptions) : base (default(Xunit.Abstractions.ITestAssembly), default(System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase>), default(Xunit.Abstractions.IMessageSink), default(Xunit.Abstractions.IMessageSink), default(Xunit.Abstractions.ITestFrameworkExecutionOptions)) { }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- protected override System.Threading.Tasks.Task AfterTestAssemblyStartingAsync() { throw null; }
- protected override System.Threading.Tasks.Task BeforeTestAssemblyFinishedAsync() { throw null; }
- protected override System.Threading.Tasks.Task<Xunit.Sdk.RunSummary> RunTestCollectionAsync(Xunit.Sdk.IMessageBus messageBus, Xunit.Abstractions.ITestCollection testCollection, System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases, System.Threading.CancellationTokenSource cancellationTokenSource) { throw null; }
- }
- public partial class AspNetTestCollectionRunner : Xunit.Sdk.XunitTestCollectionRunner
- {
- public AspNetTestCollectionRunner(System.Collections.Generic.Dictionary<System.Type, object> assemblyFixtureMappings, Xunit.Abstractions.ITestCollection testCollection, System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Sdk.IMessageBus messageBus, Xunit.Sdk.ITestCaseOrderer testCaseOrderer, Xunit.Sdk.ExceptionAggregator aggregator, System.Threading.CancellationTokenSource cancellationTokenSource) : base (default(Xunit.Abstractions.ITestCollection), default(System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase>), default(Xunit.Abstractions.IMessageSink), default(Xunit.Sdk.IMessageBus), default(Xunit.Sdk.ITestCaseOrderer), default(Xunit.Sdk.ExceptionAggregator), default(System.Threading.CancellationTokenSource)) { }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- protected override System.Threading.Tasks.Task AfterTestCollectionStartingAsync() { throw null; }
- protected override System.Threading.Tasks.Task BeforeTestCollectionFinishedAsync() { throw null; }
- protected override System.Threading.Tasks.Task<Xunit.Sdk.RunSummary> RunTestClassAsync(Xunit.Abstractions.ITestClass testClass, Xunit.Abstractions.IReflectionTypeInfo @class, System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases) { throw null; }
- }
- public partial class AspNetTestFramework : Xunit.Sdk.XunitTestFramework
- {
- public AspNetTestFramework(Xunit.Abstractions.IMessageSink messageSink) : base (default(Xunit.Abstractions.IMessageSink)) { }
- protected override Xunit.Abstractions.ITestFrameworkExecutor CreateExecutor(System.Reflection.AssemblyName assemblyName) { throw null; }
- }
- public partial class AspNetTestFrameworkExecutor : Xunit.Sdk.XunitTestFrameworkExecutor
- {
- public AspNetTestFrameworkExecutor(System.Reflection.AssemblyName assemblyName, Xunit.Abstractions.ISourceInformationProvider sourceInformationProvider, Xunit.Abstractions.IMessageSink diagnosticMessageSink) : base (default(System.Reflection.AssemblyName), default(Xunit.Abstractions.ISourceInformationProvider), default(Xunit.Abstractions.IMessageSink)) { }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- protected override void RunTestCases(System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases, Xunit.Abstractions.IMessageSink executionMessageSink, Xunit.Abstractions.ITestFrameworkExecutionOptions executionOptions) { }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly, AllowMultiple=true)]
- public partial class AssemblyFixtureAttribute : System.Attribute
- {
- public AssemblyFixtureAttribute(System.Type fixtureType) { }
- public System.Type FixtureType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)]
- [Xunit.Sdk.XunitTestCaseDiscovererAttribute("Microsoft.AspNetCore.Testing.ConditionalFactDiscoverer", "Microsoft.AspNetCore.Testing")]
- public partial class ConditionalFactAttribute : Xunit.FactAttribute
- {
- public ConditionalFactAttribute() { }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)]
- [Xunit.Sdk.XunitTestCaseDiscovererAttribute("Microsoft.AspNetCore.Testing.ConditionalTheoryDiscoverer", "Microsoft.AspNetCore.Testing")]
- public partial class ConditionalTheoryAttribute : Xunit.TheoryAttribute
- {
- public ConditionalTheoryAttribute() { }
- }
- public partial class CultureReplacer : System.IDisposable
- {
- public CultureReplacer(System.Globalization.CultureInfo culture, System.Globalization.CultureInfo uiCulture) { }
- public CultureReplacer(string culture = "en-GB", string uiCulture = "en-US") { }
- public static System.Globalization.CultureInfo DefaultCulture { get { throw null; } }
- public static string DefaultCultureName { get { throw null; } }
- public static string DefaultUICultureName { get { throw null; } }
- public void Dispose() { }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method, Inherited=true, AllowMultiple=false)]
- public sealed partial class DockerOnlyAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public DockerOnlyAttribute() { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)]
- public partial class EnvironmentVariableSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public EnvironmentVariableSkipConditionAttribute(string variableName, params string[] values) { }
- public bool IsMet { get { throw null; } }
- public bool RunOnMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- public string SkipReason { get { throw null; } }
- }
- public static partial class ExceptionAssert
- {
- public static System.ArgumentException ThrowsArgument(System.Action testCode, string paramName, string exceptionMessage) { throw null; }
- public static System.Threading.Tasks.Task<System.ArgumentException> ThrowsArgumentAsync(System.Func<System.Threading.Tasks.Task> testCode, string paramName, string exceptionMessage) { throw null; }
- public static System.ArgumentNullException ThrowsArgumentNull(System.Action testCode, string paramName) { throw null; }
- public static System.ArgumentException ThrowsArgumentNullOrEmpty(System.Action testCode, string paramName) { throw null; }
- public static System.Threading.Tasks.Task<System.ArgumentException> ThrowsArgumentNullOrEmptyAsync(System.Func<System.Threading.Tasks.Task> testCode, string paramName) { throw null; }
- public static System.ArgumentException ThrowsArgumentNullOrEmptyString(System.Action testCode, string paramName) { throw null; }
- public static System.Threading.Tasks.Task<System.ArgumentException> ThrowsArgumentNullOrEmptyStringAsync(System.Func<System.Threading.Tasks.Task> testCode, string paramName) { throw null; }
- public static System.ArgumentOutOfRangeException ThrowsArgumentOutOfRange(System.Action testCode, string paramName, string exceptionMessage, object actualValue = null) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<TException> ThrowsAsync<TException>(System.Func<System.Threading.Tasks.Task> testCode, string exceptionMessage) where TException : System.Exception { throw null; }
- public static TException Throws<TException>(System.Action testCode) where TException : System.Exception { throw null; }
- public static TException Throws<TException>(System.Action testCode, string exceptionMessage) where TException : System.Exception { throw null; }
- public static TException Throws<TException>(System.Func<object> testCode, string exceptionMessage) where TException : System.Exception { throw null; }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method)]
- [Xunit.Sdk.TraitDiscovererAttribute("Microsoft.AspNetCore.Testing.FlakyTraitDiscoverer", "Microsoft.AspNetCore.Testing")]
- public sealed partial class FlakyAttribute : System.Attribute, Xunit.Sdk.ITraitAttribute
- {
- public FlakyAttribute(string gitHubIssueUrl, string firstFilter, params string[] additionalFilters) { }
- public System.Collections.Generic.IReadOnlyList<string> Filters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string GitHubIssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- public static partial class FlakyOn
- {
- public const string All = "All";
- public static partial class AzP
- {
- public const string All = "AzP:All";
- public const string Linux = "AzP:OS:Linux";
- public const string macOS = "AzP:OS:Darwin";
- public const string Windows = "AzP:OS:Windows_NT";
- }
- public static partial class Helix
- {
- public const string All = "Helix:Queue:All";
- public const string Centos7Amd64 = "Helix:Queue:Centos.7.Amd64.Open";
- public const string Debian8Amd64 = "Helix:Queue:Debian.8.Amd64.Open";
- public const string Debian9Amd64 = "Helix:Queue:Debian.9.Amd64.Open";
- public const string Fedora27Amd64 = "Helix:Queue:Fedora.27.Amd64.Open";
- public const string Fedora28Amd64 = "Helix:Queue:Fedora.28.Amd64.Open";
- public const string macOS1012Amd64 = "Helix:Queue:OSX.1012.Amd64.Open";
- public const string Redhat7Amd64 = "Helix:Queue:Redhat.7.Amd64.Open";
- public const string Ubuntu1604Amd64 = "Helix:Queue:Ubuntu.1604.Amd64.Open";
- public const string Ubuntu1810Amd64 = "Helix:Queue:Ubuntu.1810.Amd64.Open";
- public const string Windows10Amd64 = "Helix:Queue:Windows.10.Amd64.ClientRS4.VS2017.Open";
- }
- }
- public partial class FlakyTraitDiscoverer : Xunit.Sdk.ITraitDiscoverer
- {
- public FlakyTraitDiscoverer() { }
- public System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> GetTraits(Xunit.Abstractions.IAttributeInfo traitAttribute) { throw null; }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)]
- public partial class FrameworkSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public FrameworkSkipConditionAttribute(Microsoft.AspNetCore.Testing.RuntimeFrameworks excludedFrameworks) { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- }
- public static partial class HelixQueues
- {
- public const string Centos7Amd64 = "Centos.7.Amd64.Open";
- public const string Debian8Amd64 = "Debian.8.Amd64.Open";
- public const string Debian9Amd64 = "Debian.9.Amd64.Open";
- public const string Fedora27Amd64 = "Fedora.27.Amd64.Open";
- public const string Fedora28Amd64 = "Fedora.28.Amd64.Open";
- public const string macOS1012Amd64 = "OSX.1012.Amd64.Open";
- public const string Redhat7Amd64 = "Redhat.7.Amd64.Open";
- public const string Ubuntu1604Amd64 = "Ubuntu.1604.Amd64.Open";
- public const string Ubuntu1810Amd64 = "Ubuntu.1810.Amd64.Open";
- public const string Windows10Amd64 = "Windows.10.Amd64.ClientRS4.VS2017.Open";
- }
- public static partial class HttpClientSlim
- {
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<System.Net.Sockets.Socket> GetSocket(System.Uri requestUri) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<string> GetStringAsync(string requestUri, bool validateCertificate = true) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<string> GetStringAsync(System.Uri requestUri, bool validateCertificate = true) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<string> PostAsync(string requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<string> PostAsync(System.Uri requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; }
- }
- public partial interface ITestCondition
- {
- bool IsMet { get; }
- string SkipReason { get; }
- }
- public partial interface ITestMethodLifecycle
- {
- System.Threading.Tasks.Task OnTestEndAsync(Microsoft.AspNetCore.Testing.TestContext context, System.Exception exception, System.Threading.CancellationToken cancellationToken);
- System.Threading.Tasks.Task OnTestStartAsync(Microsoft.AspNetCore.Testing.TestContext context, System.Threading.CancellationToken cancellationToken);
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)]
- public partial class MaximumOSVersionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public MaximumOSVersionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, string maxVersion) { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)]
- public partial class MinimumOSVersionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public MinimumOSVersionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, string minVersion) { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- }
- [System.FlagsAttribute]
- public enum OperatingSystems
- {
- Linux = 1,
- MacOSX = 2,
- Windows = 4,
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)]
- public partial class OSSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public OSSkipConditionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem) { }
- [System.ObsoleteAttribute("Use the Minimum/MaximumOSVersionAttribute for version checks.", true)]
- public OSSkipConditionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, params string[] versions) { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)]
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
- public partial class RepeatAttribute : System.Attribute
- {
- public RepeatAttribute(int runCount = 10) { }
- public int RunCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- public partial class RepeatContext
- {
- public RepeatContext(int limit) { }
- public static Microsoft.AspNetCore.Testing.RepeatContext Current { get { throw null; } }
- public int CurrentIteration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- public int Limit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method)]
- public partial class ReplaceCultureAttribute : Xunit.Sdk.BeforeAfterTestAttribute
- {
- public ReplaceCultureAttribute() { }
- public ReplaceCultureAttribute(string currentCulture, string currentUICulture) { }
- public System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public System.Globalization.CultureInfo UICulture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public override void After(System.Reflection.MethodInfo methodUnderTest) { }
- public override void Before(System.Reflection.MethodInfo methodUnderTest) { }
- }
- [System.FlagsAttribute]
- public enum RuntimeFrameworks
- {
- None = 0,
- Mono = 1,
- CLR = 2,
- CoreCLR = 4,
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class, AllowMultiple=false)]
- public partial class ShortClassNameAttribute : System.Attribute
- {
- public ShortClassNameAttribute() { }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)]
- public partial class SkipOnCIAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public SkipOnCIAttribute(string issueUrl = "") { }
- public bool IsMet { get { throw null; } }
- public string IssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string SkipReason { get { throw null; } }
- public static string GetIfOnAzdo() { throw null; }
- public static string GetTargetHelixQueue() { throw null; }
- public static bool OnAzdo() { throw null; }
- public static bool OnCI() { throw null; }
- public static bool OnHelix() { throw null; }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)]
- public partial class SkipOnHelixAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public SkipOnHelixAttribute(string issueUrl) { }
- public bool IsMet { get { throw null; } }
- public string IssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string Queues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- public string SkipReason { get { throw null; } }
- public static string GetTargetHelixQueue() { throw null; }
- public static bool OnHelix() { throw null; }
- }
- public partial class SkippedTestCase : Xunit.Sdk.XunitTestCase
- {
- [System.ObsoleteAttribute("Called by the de-serializer; should only be called by deriving classes for de-serialization purposes")]
- public SkippedTestCase() { }
- public SkippedTestCase(string skipReason, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Sdk.TestMethodDisplay defaultMethodDisplay, Xunit.Sdk.TestMethodDisplayOptions defaultMethodDisplayOptions, Xunit.Abstractions.ITestMethod testMethod, object[] testMethodArguments = null) { }
- public override void Deserialize(Xunit.Abstractions.IXunitSerializationInfo data) { }
- protected override string GetSkipReason(Xunit.Abstractions.IAttributeInfo factAttribute) { throw null; }
- public override void Serialize(Xunit.Abstractions.IXunitSerializationInfo data) { }
- }
- public static partial class TaskExtensions
- {
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task TimeoutAfter(this System.Threading.Tasks.Task task, System.TimeSpan timeout, [System.Runtime.CompilerServices.CallerFilePathAttribute] string filePath = null, [System.Runtime.CompilerServices.CallerLineNumberAttribute] int lineNumber = 0) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<T> TimeoutAfter<T>(this System.Threading.Tasks.Task<T> task, System.TimeSpan timeout, [System.Runtime.CompilerServices.CallerFilePathAttribute] string filePath = null, [System.Runtime.CompilerServices.CallerLineNumberAttribute] int lineNumber = 0) { throw null; }
- }
- public sealed partial class TestContext
- {
- public TestContext(System.Type testClass, object[] constructorArguments, System.Reflection.MethodInfo testMethod, object[] methodArguments, Xunit.Abstractions.ITestOutputHelper output) { }
- public object[] ConstructorArguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public Microsoft.AspNetCore.Testing.TestFileOutputContext FileOutput { get { throw null; } }
- public object[] MethodArguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public Xunit.Abstractions.ITestOutputHelper Output { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public System.Type TestClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public System.Reflection.MethodInfo TestMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- public sealed partial class TestFileOutputContext
- {
- public TestFileOutputContext(Microsoft.AspNetCore.Testing.TestContext parent) { }
- public string AssemblyOutputDirectory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string TestClassName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string TestClassOutputDirectory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string TestName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public static string GetAssemblyBaseDirectory(System.Reflection.Assembly assembly, string baseDirectory = null) { throw null; }
- public static string GetOutputDirectory(System.Reflection.Assembly assembly) { throw null; }
- public static bool GetPreserveExistingLogsInOutput(System.Reflection.Assembly assembly) { throw null; }
- public static string GetTestClassName(System.Type type) { throw null; }
- public static string GetTestMethodName(System.Reflection.MethodInfo method, object[] arguments) { throw null; }
- public string GetUniqueFileName(string prefix, string extension) { throw null; }
- public static string RemoveIllegalFileChars(string s) { throw null; }
- }
- public static partial class TestMethodExtensions
- {
- public static string EvaluateSkipConditions(this Xunit.Abstractions.ITestMethod testMethod) { throw null; }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly, AllowMultiple=false, Inherited=true)]
- public partial class TestOutputDirectoryAttribute : System.Attribute
- {
- public TestOutputDirectoryAttribute(string preserveExistingLogsInOutput, string targetFramework, string baseDirectory = null) { }
- public string BaseDirectory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public bool PreserveExistingLogsInOutput { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string TargetFramework { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- [System.ObsoleteAttribute("This API is obsolete and the pattern its usage encouraged should not be used anymore. See https://github.com/dotnet/extensions/issues/1697 for details.")]
- public partial class TestPathUtilities
- {
- public TestPathUtilities() { }
- public static string GetRepoRootDirectory() { throw null; }
- public static string GetSolutionRootDirectory(string solution) { throw null; }
- }
- public static partial class TestPlatformHelper
- {
- public static bool IsLinux { get { throw null; } }
- public static bool IsMac { get { throw null; } }
- public static bool IsMono { get { throw null; } }
- public static bool IsWindows { get { throw null; } }
- }
- public static partial class WindowsVersions
- {
- public const string Win10 = "10.0";
- public const string Win10_19H1 = "10.0.18362";
- public const string Win10_19H2 = "10.0.18363";
- public const string Win10_20H1 = "10.0.19033";
- public const string Win10_RS4 = "10.0.17134";
- public const string Win10_RS5 = "10.0.17763";
- [System.ObsoleteAttribute("Use Win7 instead.", true)]
- public const string Win2008R2 = "6.1";
- public const string Win7 = "6.1";
- public const string Win8 = "6.2";
- public const string Win81 = "6.3";
- }
-}
-namespace Microsoft.AspNetCore.Testing.Tracing
-{
- public partial class CollectingEventListener : System.Diagnostics.Tracing.EventListener
- {
- public CollectingEventListener() { }
- public void CollectFrom(System.Diagnostics.Tracing.EventSource eventSource) { }
- public void CollectFrom(string eventSourceName) { }
- public System.Collections.Generic.IReadOnlyList<System.Diagnostics.Tracing.EventWrittenEventArgs> GetEventsWritten() { throw null; }
- protected override void OnEventSourceCreated(System.Diagnostics.Tracing.EventSource eventSource) { }
- protected override void OnEventWritten(System.Diagnostics.Tracing.EventWrittenEventArgs eventData) { }
- }
- public partial class EventAssert
- {
- public EventAssert(int expectedId, string expectedName, System.Diagnostics.Tracing.EventLevel expectedLevel) { }
- public static void Collection(System.Collections.Generic.IEnumerable<System.Diagnostics.Tracing.EventWrittenEventArgs> events, params Microsoft.AspNetCore.Testing.Tracing.EventAssert[] asserts) { }
- public static Microsoft.AspNetCore.Testing.Tracing.EventAssert Event(int id, string name, System.Diagnostics.Tracing.EventLevel level) { throw null; }
- public Microsoft.AspNetCore.Testing.Tracing.EventAssert Payload(string name, System.Action<object> asserter) { throw null; }
- public Microsoft.AspNetCore.Testing.Tracing.EventAssert Payload(string name, object expectedValue) { throw null; }
- }
- [Xunit.CollectionAttribute("Microsoft.AspNetCore.Testing.Tracing.EventSourceTestCollection")]
- public abstract partial class EventSourceTestBase : System.IDisposable
- {
- public const string CollectionName = "Microsoft.AspNetCore.Testing.Tracing.EventSourceTestCollection";
- public EventSourceTestBase() { }
- protected void CollectFrom(System.Diagnostics.Tracing.EventSource eventSource) { }
- protected void CollectFrom(string eventSourceName) { }
- public void Dispose() { }
- protected System.Collections.Generic.IReadOnlyList<System.Diagnostics.Tracing.EventWrittenEventArgs> GetEvents() { throw null; }
- }
-}
diff --git a/src/Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs b/src/Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs
deleted file mode 100644
index 17a922a6c7b..00000000000
--- a/src/Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.AspNetCore.Testing
-{
- public partial class AspNetTestAssemblyRunner : Xunit.Sdk.XunitTestAssemblyRunner
- {
- public AspNetTestAssemblyRunner(Xunit.Abstractions.ITestAssembly testAssembly, System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Abstractions.IMessageSink executionMessageSink, Xunit.Abstractions.ITestFrameworkExecutionOptions executionOptions) : base (default(Xunit.Abstractions.ITestAssembly), default(System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase>), default(Xunit.Abstractions.IMessageSink), default(Xunit.Abstractions.IMessageSink), default(Xunit.Abstractions.ITestFrameworkExecutionOptions)) { }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- protected override System.Threading.Tasks.Task AfterTestAssemblyStartingAsync() { throw null; }
- protected override System.Threading.Tasks.Task BeforeTestAssemblyFinishedAsync() { throw null; }
- protected override System.Threading.Tasks.Task<Xunit.Sdk.RunSummary> RunTestCollectionAsync(Xunit.Sdk.IMessageBus messageBus, Xunit.Abstractions.ITestCollection testCollection, System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases, System.Threading.CancellationTokenSource cancellationTokenSource) { throw null; }
- }
- public partial class AspNetTestCollectionRunner : Xunit.Sdk.XunitTestCollectionRunner
- {
- public AspNetTestCollectionRunner(System.Collections.Generic.Dictionary<System.Type, object> assemblyFixtureMappings, Xunit.Abstractions.ITestCollection testCollection, System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Sdk.IMessageBus messageBus, Xunit.Sdk.ITestCaseOrderer testCaseOrderer, Xunit.Sdk.ExceptionAggregator aggregator, System.Threading.CancellationTokenSource cancellationTokenSource) : base (default(Xunit.Abstractions.ITestCollection), default(System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase>), default(Xunit.Abstractions.IMessageSink), default(Xunit.Sdk.IMessageBus), default(Xunit.Sdk.ITestCaseOrderer), default(Xunit.Sdk.ExceptionAggregator), default(System.Threading.CancellationTokenSource)) { }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- protected override System.Threading.Tasks.Task AfterTestCollectionStartingAsync() { throw null; }
- protected override System.Threading.Tasks.Task BeforeTestCollectionFinishedAsync() { throw null; }
- protected override System.Threading.Tasks.Task<Xunit.Sdk.RunSummary> RunTestClassAsync(Xunit.Abstractions.ITestClass testClass, Xunit.Abstractions.IReflectionTypeInfo @class, System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases) { throw null; }
- }
- public partial class AspNetTestFramework : Xunit.Sdk.XunitTestFramework
- {
- public AspNetTestFramework(Xunit.Abstractions.IMessageSink messageSink) : base (default(Xunit.Abstractions.IMessageSink)) { }
- protected override Xunit.Abstractions.ITestFrameworkExecutor CreateExecutor(System.Reflection.AssemblyName assemblyName) { throw null; }
- }
- public partial class AspNetTestFrameworkExecutor : Xunit.Sdk.XunitTestFrameworkExecutor
- {
- public AspNetTestFrameworkExecutor(System.Reflection.AssemblyName assemblyName, Xunit.Abstractions.ISourceInformationProvider sourceInformationProvider, Xunit.Abstractions.IMessageSink diagnosticMessageSink) : base (default(System.Reflection.AssemblyName), default(Xunit.Abstractions.ISourceInformationProvider), default(Xunit.Abstractions.IMessageSink)) { }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- protected override void RunTestCases(System.Collections.Generic.IEnumerable<Xunit.Sdk.IXunitTestCase> testCases, Xunit.Abstractions.IMessageSink executionMessageSink, Xunit.Abstractions.ITestFrameworkExecutionOptions executionOptions) { }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly, AllowMultiple=true)]
- public partial class AssemblyFixtureAttribute : System.Attribute
- {
- public AssemblyFixtureAttribute(System.Type fixtureType) { }
- public System.Type FixtureType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)]
- [Xunit.Sdk.XunitTestCaseDiscovererAttribute("Microsoft.AspNetCore.Testing.ConditionalFactDiscoverer", "Microsoft.AspNetCore.Testing")]
- public partial class ConditionalFactAttribute : Xunit.FactAttribute
- {
- public ConditionalFactAttribute() { }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)]
- [Xunit.Sdk.XunitTestCaseDiscovererAttribute("Microsoft.AspNetCore.Testing.ConditionalTheoryDiscoverer", "Microsoft.AspNetCore.Testing")]
- public partial class ConditionalTheoryAttribute : Xunit.TheoryAttribute
- {
- public ConditionalTheoryAttribute() { }
- }
- public partial class CultureReplacer : System.IDisposable
- {
- public CultureReplacer(System.Globalization.CultureInfo culture, System.Globalization.CultureInfo uiCulture) { }
- public CultureReplacer(string culture = "en-GB", string uiCulture = "en-US") { }
- public static System.Globalization.CultureInfo DefaultCulture { get { throw null; } }
- public static string DefaultCultureName { get { throw null; } }
- public static string DefaultUICultureName { get { throw null; } }
- public void Dispose() { }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method, Inherited=true, AllowMultiple=false)]
- public sealed partial class DockerOnlyAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public DockerOnlyAttribute() { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)]
- public partial class EnvironmentVariableSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public EnvironmentVariableSkipConditionAttribute(string variableName, params string[] values) { }
- public bool IsMet { get { throw null; } }
- public bool RunOnMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- public string SkipReason { get { throw null; } }
- }
- public static partial class ExceptionAssert
- {
- public static System.ArgumentException ThrowsArgument(System.Action testCode, string paramName, string exceptionMessage) { throw null; }
- public static System.Threading.Tasks.Task<System.ArgumentException> ThrowsArgumentAsync(System.Func<System.Threading.Tasks.Task> testCode, string paramName, string exceptionMessage) { throw null; }
- public static System.ArgumentNullException ThrowsArgumentNull(System.Action testCode, string paramName) { throw null; }
- public static System.ArgumentException ThrowsArgumentNullOrEmpty(System.Action testCode, string paramName) { throw null; }
- public static System.Threading.Tasks.Task<System.ArgumentException> ThrowsArgumentNullOrEmptyAsync(System.Func<System.Threading.Tasks.Task> testCode, string paramName) { throw null; }
- public static System.ArgumentException ThrowsArgumentNullOrEmptyString(System.Action testCode, string paramName) { throw null; }
- public static System.Threading.Tasks.Task<System.ArgumentException> ThrowsArgumentNullOrEmptyStringAsync(System.Func<System.Threading.Tasks.Task> testCode, string paramName) { throw null; }
- public static System.ArgumentOutOfRangeException ThrowsArgumentOutOfRange(System.Action testCode, string paramName, string exceptionMessage, object actualValue = null) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<TException> ThrowsAsync<TException>(System.Func<System.Threading.Tasks.Task> testCode, string exceptionMessage) where TException : System.Exception { throw null; }
- public static TException Throws<TException>(System.Action testCode) where TException : System.Exception { throw null; }
- public static TException Throws<TException>(System.Action testCode, string exceptionMessage) where TException : System.Exception { throw null; }
- public static TException Throws<TException>(System.Func<object> testCode, string exceptionMessage) where TException : System.Exception { throw null; }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method)]
- [Xunit.Sdk.TraitDiscovererAttribute("Microsoft.AspNetCore.Testing.FlakyTraitDiscoverer", "Microsoft.AspNetCore.Testing")]
- public sealed partial class FlakyAttribute : System.Attribute, Xunit.Sdk.ITraitAttribute
- {
- public FlakyAttribute(string gitHubIssueUrl, string firstFilter, params string[] additionalFilters) { }
- public System.Collections.Generic.IReadOnlyList<string> Filters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string GitHubIssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- public static partial class FlakyOn
- {
- public const string All = "All";
- public static partial class AzP
- {
- public const string All = "AzP:All";
- public const string Linux = "AzP:OS:Linux";
- public const string macOS = "AzP:OS:Darwin";
- public const string Windows = "AzP:OS:Windows_NT";
- }
- public static partial class Helix
- {
- public const string All = "Helix:Queue:All";
- public const string Centos7Amd64 = "Helix:Queue:Centos.7.Amd64.Open";
- public const string Debian8Amd64 = "Helix:Queue:Debian.8.Amd64.Open";
- public const string Debian9Amd64 = "Helix:Queue:Debian.9.Amd64.Open";
- public const string Fedora27Amd64 = "Helix:Queue:Fedora.27.Amd64.Open";
- public const string Fedora28Amd64 = "Helix:Queue:Fedora.28.Amd64.Open";
- public const string macOS1012Amd64 = "Helix:Queue:OSX.1012.Amd64.Open";
- public const string Redhat7Amd64 = "Helix:Queue:Redhat.7.Amd64.Open";
- public const string Ubuntu1604Amd64 = "Helix:Queue:Ubuntu.1604.Amd64.Open";
- public const string Ubuntu1810Amd64 = "Helix:Queue:Ubuntu.1810.Amd64.Open";
- public const string Windows10Amd64 = "Helix:Queue:Windows.10.Amd64.ClientRS4.VS2017.Open";
- }
- }
- public partial class FlakyTraitDiscoverer : Xunit.Sdk.ITraitDiscoverer
- {
- public FlakyTraitDiscoverer() { }
- public System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> GetTraits(Xunit.Abstractions.IAttributeInfo traitAttribute) { throw null; }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)]
- public partial class FrameworkSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public FrameworkSkipConditionAttribute(Microsoft.AspNetCore.Testing.RuntimeFrameworks excludedFrameworks) { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- }
- public static partial class HelixQueues
- {
- public const string Centos7Amd64 = "Centos.7.Amd64.Open";
- public const string Debian8Amd64 = "Debian.8.Amd64.Open";
- public const string Debian9Amd64 = "Debian.9.Amd64.Open";
- public const string Fedora27Amd64 = "Fedora.27.Amd64.Open";
- public const string Fedora28Amd64 = "Fedora.28.Amd64.Open";
- public const string macOS1012Amd64 = "OSX.1012.Amd64.Open";
- public const string Redhat7Amd64 = "Redhat.7.Amd64.Open";
- public const string Ubuntu1604Amd64 = "Ubuntu.1604.Amd64.Open";
- public const string Ubuntu1810Amd64 = "Ubuntu.1810.Amd64.Open";
- public const string Windows10Amd64 = "Windows.10.Amd64.ClientRS4.VS2017.Open";
- }
- public static partial class HttpClientSlim
- {
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<System.Net.Sockets.Socket> GetSocket(System.Uri requestUri) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<string> GetStringAsync(string requestUri, bool validateCertificate = true) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<string> GetStringAsync(System.Uri requestUri, bool validateCertificate = true) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<string> PostAsync(string requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<string> PostAsync(System.Uri requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; }
- }
- public partial interface ITestCondition
- {
- bool IsMet { get; }
- string SkipReason { get; }
- }
- public partial interface ITestMethodLifecycle
- {
- System.Threading.Tasks.Task OnTestEndAsync(Microsoft.AspNetCore.Testing.TestContext context, System.Exception exception, System.Threading.CancellationToken cancellationToken);
- System.Threading.Tasks.Task OnTestStartAsync(Microsoft.AspNetCore.Testing.TestContext context, System.Threading.CancellationToken cancellationToken);
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)]
- public partial class MaximumOSVersionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public MaximumOSVersionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, string maxVersion) { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)]
- public partial class MinimumOSVersionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public MinimumOSVersionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, string minVersion) { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- }
- [System.FlagsAttribute]
- public enum OperatingSystems
- {
- Linux = 1,
- MacOSX = 2,
- Windows = 4,
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)]
- public partial class OSSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public OSSkipConditionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem) { }
- [System.ObsoleteAttribute("Use the Minimum/MaximumOSVersionAttribute for version checks.", true)]
- public OSSkipConditionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, params string[] versions) { }
- public bool IsMet { get { throw null; } }
- public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)]
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
- public partial class RepeatAttribute : System.Attribute
- {
- public RepeatAttribute(int runCount = 10) { }
- public int RunCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- public partial class RepeatContext
- {
- public RepeatContext(int limit) { }
- public static Microsoft.AspNetCore.Testing.RepeatContext Current { get { throw null; } }
- public int CurrentIteration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- public int Limit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Method)]
- public partial class ReplaceCultureAttribute : Xunit.Sdk.BeforeAfterTestAttribute
- {
- public ReplaceCultureAttribute() { }
- public ReplaceCultureAttribute(string currentCulture, string currentUICulture) { }
- public System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public System.Globalization.CultureInfo UICulture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public override void After(System.Reflection.MethodInfo methodUnderTest) { }
- public override void Before(System.Reflection.MethodInfo methodUnderTest) { }
- }
- [System.FlagsAttribute]
- public enum RuntimeFrameworks
- {
- None = 0,
- Mono = 1,
- CLR = 2,
- CoreCLR = 4,
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class, AllowMultiple=false)]
- public partial class ShortClassNameAttribute : System.Attribute
- {
- public ShortClassNameAttribute() { }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)]
- public partial class SkipOnCIAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public SkipOnCIAttribute(string issueUrl = "") { }
- public bool IsMet { get { throw null; } }
- public string IssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string SkipReason { get { throw null; } }
- public static string GetIfOnAzdo() { throw null; }
- public static string GetTargetHelixQueue() { throw null; }
- public static bool OnAzdo() { throw null; }
- public static bool OnCI() { throw null; }
- public static bool OnHelix() { throw null; }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)]
- public partial class SkipOnHelixAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
- {
- public SkipOnHelixAttribute(string issueUrl) { }
- public bool IsMet { get { throw null; } }
- public string IssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string Queues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
- public string SkipReason { get { throw null; } }
- public static string GetTargetHelixQueue() { throw null; }
- public static bool OnHelix() { throw null; }
- }
- public partial class SkippedTestCase : Xunit.Sdk.XunitTestCase
- {
- [System.ObsoleteAttribute("Called by the de-serializer; should only be called by deriving classes for de-serialization purposes")]
- public SkippedTestCase() { }
- public SkippedTestCase(string skipReason, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Sdk.TestMethodDisplay defaultMethodDisplay, Xunit.Sdk.TestMethodDisplayOptions defaultMethodDisplayOptions, Xunit.Abstractions.ITestMethod testMethod, object[] testMethodArguments = null) { }
- public override void Deserialize(Xunit.Abstractions.IXunitSerializationInfo data) { }
- protected override string GetSkipReason(Xunit.Abstractions.IAttributeInfo factAttribute) { throw null; }
- public override void Serialize(Xunit.Abstractions.IXunitSerializationInfo data) { }
- }
- public static partial class TaskExtensions
- {
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task TimeoutAfter(this System.Threading.Tasks.Task task, System.TimeSpan timeout, [System.Runtime.CompilerServices.CallerFilePathAttribute] string filePath = null, [System.Runtime.CompilerServices.CallerLineNumberAttribute] int lineNumber = 0) { throw null; }
- [System.Diagnostics.DebuggerStepThroughAttribute]
- public static System.Threading.Tasks.Task<T> TimeoutAfter<T>(this System.Threading.Tasks.Task<T> task, System.TimeSpan timeout, [System.Runtime.CompilerServices.CallerFilePathAttribute] string filePath = null, [System.Runtime.CompilerServices.CallerLineNumberAttribute] int lineNumber = 0) { throw null; }
- }
- public sealed partial class TestContext
- {
- public TestContext(System.Type testClass, object[] constructorArguments, System.Reflection.MethodInfo testMethod, object[] methodArguments, Xunit.Abstractions.ITestOutputHelper output) { }
- public object[] ConstructorArguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public Microsoft.AspNetCore.Testing.TestFileOutputContext FileOutput { get { throw null; } }
- public object[] MethodArguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public Xunit.Abstractions.ITestOutputHelper Output { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public System.Type TestClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public System.Reflection.MethodInfo TestMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- public sealed partial class TestFileOutputContext
- {
- public TestFileOutputContext(Microsoft.AspNetCore.Testing.TestContext parent) { }
- public string AssemblyOutputDirectory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string TestClassName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string TestClassOutputDirectory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string TestName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public static string GetAssemblyBaseDirectory(System.Reflection.Assembly assembly, string baseDirectory = null) { throw null; }
- public static string GetOutputDirectory(System.Reflection.Assembly assembly) { throw null; }
- public static bool GetPreserveExistingLogsInOutput(System.Reflection.Assembly assembly) { throw null; }
- public static string GetTestClassName(System.Type type) { throw null; }
- public static string GetTestMethodName(System.Reflection.MethodInfo method, object[] arguments) { throw null; }
- public string GetUniqueFileName(string prefix, string extension) { throw null; }
- public static string RemoveIllegalFileChars(string s) { throw null; }
- }
- public static partial class TestMethodExtensions
- {
- public static string EvaluateSkipConditions(this Xunit.Abstractions.ITestMethod testMethod) { throw null; }
- }
- [System.AttributeUsageAttribute(System.AttributeTargets.Assembly, AllowMultiple=false, Inherited=true)]
- public partial class TestOutputDirectoryAttribute : System.Attribute
- {
- public TestOutputDirectoryAttribute(string preserveExistingLogsInOutput, string targetFramework, string baseDirectory = null) { }
- public string BaseDirectory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public bool PreserveExistingLogsInOutput { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- public string TargetFramework { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
- }
- [System.ObsoleteAttribute("This API is obsolete and the pattern its usage encouraged should not be used anymore. See https://github.com/dotnet/extensions/issues/1697 for details.")]
- public partial class TestPathUtilities
- {
- public TestPathUtilities() { }
- public static string GetRepoRootDirectory() { throw null; }
- public static string GetSolutionRootDirectory(string solution) { throw null; }
- }
- public static partial class TestPlatformHelper
- {
- public static bool IsLinux { get { throw null; } }
- public static bool IsMac { get { throw null; } }
- public static bool IsMono { get { throw null; } }
- public static bool IsWindows { get { throw null; } }
- }
- public static partial class WindowsVersions
- {
- public const string Win10 = "10.0";
- public const string Win10_19H1 = "10.0.18362";
- public const string Win10_19H2 = "10.0.18363";
- public const string Win10_20H1 = "10.0.19033";
- public const string Win10_RS4 = "10.0.17134";
- public const string Win10_RS5 = "10.0.17763";
- [System.ObsoleteAttribute("Use Win7 instead.", true)]
- public const string Win2008R2 = "6.1";
- public const string Win7 = "6.1";
- public const string Win8 = "6.2";
- public const string Win81 = "6.3";
- }
-}
-namespace Microsoft.AspNetCore.Testing.Tracing
-{
- public partial class CollectingEventListener : System.Diagnostics.Tracing.EventListener
- {
- public CollectingEventListener() { }
- public void CollectFrom(System.Diagnostics.Tracing.EventSource eventSource) { }
- public void CollectFrom(string eventSourceName) { }
- public System.Collections.Generic.IReadOnlyList<System.Diagnostics.Tracing.EventWrittenEventArgs> GetEventsWritten() { throw null; }
- protected override void OnEventSourceCreated(System.Diagnostics.Tracing.EventSource eventSource) { }
- protected override void OnEventWritten(System.Diagnostics.Tracing.EventWrittenEventArgs eventData) { }
- }
- public partial class EventAssert
- {
- public EventAssert(int expectedId, string expectedName, System.Diagnostics.Tracing.EventLevel expectedLevel) { }
- public static void Collection(System.Collections.Generic.IEnumerable<System.Diagnostics.Tracing.EventWrittenEventArgs> events, params Microsoft.AspNetCore.Testing.Tracing.EventAssert[] asserts) { }
- public static Microsoft.AspNetCore.Testing.Tracing.EventAssert Event(int id, string name, System.Diagnostics.Tracing.EventLevel level) { throw null; }
- public Microsoft.AspNetCore.Testing.Tracing.EventAssert Payload(string name, System.Action<object> asserter) { throw null; }
- public Microsoft.AspNetCore.Testing.Tracing.EventAssert Payload(string name, object expectedValue) { throw null; }
- }
- [Xunit.CollectionAttribute("Microsoft.AspNetCore.Testing.Tracing.EventSourceTestCollection")]
- public abstract partial class EventSourceTestBase : System.IDisposable
- {
- public const string CollectionName = "Microsoft.AspNetCore.Testing.Tracing.EventSourceTestCollection";
- public EventSourceTestBase() { }
- protected void CollectFrom(System.Diagnostics.Tracing.EventSource eventSource) { }
- protected void CollectFrom(string eventSourceName) { }
- public void Dispose() { }
- protected System.Collections.Generic.IReadOnlyList<System.Diagnostics.Tracing.EventWrittenEventArgs> GetEvents() { throw null; }
- }
-}
diff --git a/src/Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/Testing/src/Microsoft.AspNetCore.Testing.csproj
index 448351fee56..96336a47a8b 100644
--- a/src/Testing/src/Microsoft.AspNetCore.Testing.csproj
+++ b/src/Testing/src/Microsoft.AspNetCore.Testing.csproj
@@ -9,7 +9,6 @@
<!-- This is actually a library for test projects, not a test project. -->
<IsUnitTestProject>false</IsUnitTestProject>
<IsPackable>true</IsPackable>
- <HasReferenceAssembly>true</HasReferenceAssembly>
<GenerateFrameworkReferenceAssembly>true</GenerateFrameworkReferenceAssembly>
<!-- This package is internal, so we don't generate a package baseline. Always build against the latest dependencies. -->
<UseLatestPackageReferences>true</UseLatestPackageReferences>
diff --git a/src/Testing/test/TestPathUtilitiesTest.cs b/src/Testing/test/TestPathUtilitiesTest.cs
index 024f476f07f..ff3c18e5525 100644
--- a/src/Testing/test/TestPathUtilitiesTest.cs
+++ b/src/Testing/test/TestPathUtilitiesTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Testing
// Entire test pending removal - see https://github.com/dotnet/extensions/issues/1697
#pragma warning disable 0618
- [Fact]
+ [Fact(Skip="https://github.com/dotnet/extensions/issues/1697")]
public void GetSolutionRootDirectory_ResolvesSolutionRoot()
{
// Directory.GetCurrentDirectory() gives:
diff --git a/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj b/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj
index ebaffde463f..7f61a987b34 100644
--- a/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj
+++ b/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj
@@ -15,10 +15,9 @@
</ItemGroup>
<ItemGroup>
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
<Compile Include="$(ToolSharedSourceRoot)CommandLine/**/*.cs" />
-
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
- <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
+ <Compile Include="$(SharedSourceRoot)HostFactoryResolver\*.cs" />
</ItemGroup>
<Target Name="BuildX86" BeforeTargets="Build" Condition=" '$(TargetFramework)' == 'net461' And '$(Platform)' != 'x86' ">
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
index 35e9c96c788..78f7133975c 100644
--- a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
@@ -11,13 +11,13 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
<Compile Include="$(ToolSharedSourceRoot)CommandLine\**\*.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Build" ExcludeAssets="runtime" />
<Reference Include="Microsoft.Build.Locator" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="Microsoft.Win32.Registry" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>
diff --git a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
index b8a4f38c0c5..29f83b86430 100644
--- a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
+++ b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
@@ -13,12 +13,12 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
<Compile Include="$(SharedSourceRoot)CertificateGeneration\**\*.cs" />
<Compile Include="$(ToolSharedSourceRoot)CommandLine\**\*.cs" />
</ItemGroup>
<ItemGroup>
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="System.Security.Cryptography.Cng" />
</ItemGroup>
diff --git a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
index aa31d55d4e7..1ec6fe51ca2 100644
--- a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
+++ b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
@@ -12,6 +12,7 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
<Compile Include="$(ToolSharedSourceRoot)CommandLine/**/*.cs" />
<Compile Include="../../GetDocumentInsider/src/CommandException.cs" />
<Compile Include="../../GetDocumentInsider/src/Commands/CommandBase.cs" Link="Commands/CommandBase.cs" />
@@ -19,7 +20,6 @@
<Compile Include="../../GetDocumentInsider/src/ProgramBase.cs" />
<Compile Include="../../GetDocumentInsider/src/ReporterExtensions.cs" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="Newtonsoft.Json" />
</ItemGroup>
</Project>
diff --git a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
index 6fc54a7a871..1ff940b9f4e 100644
--- a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
+++ b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
@@ -10,11 +10,11 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
<Compile Include="$(ToolSharedSourceRoot)CommandLine\**\*.cs" />
</ItemGroup>
<ItemGroup>
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="Microsoft.Data.SqlClient" />
<!-- Intentional change to remove reference to System.Data.SqlClient. See https://github.com/dotnet/aspnetcore/issues/12445 -->
diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
index 7fce951f0ca..1ef774e1c5e 100644
--- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
+++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
@@ -14,13 +14,13 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
<Compile Include="$(ToolSharedSourceRoot)CommandLine\**\*.cs" />
<None Include="assets\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json" />
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
</ItemGroup>
diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.csproj b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
index 3c209122117..ee7fc09d150 100644
--- a/src/Tools/dotnet-watch/src/dotnet-watch.csproj
+++ b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
@@ -13,13 +13,10 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
<Compile Include="$(SharedSourceRoot)Process\ProcessExtensions.cs" />
<Compile Include="$(ToolSharedSourceRoot)CommandLine\**\*.cs" />
<None Include="assets\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
- </ItemGroup>
-
</Project>
diff --git a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
index 364f4d3d866..c4fbf99fa6d 100644
--- a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
+++ b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
@@ -9,6 +9,7 @@
<PackageTags>aspnetcore</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
+ <IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
<ItemGroup>
--
GitLab