diff --git a/eng/Build.props b/eng/Build.props index 876c87b6f4..e40aa38bd6 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 2bedb5af61..4fc197153c 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -30,10 +30,8 @@ and are generated based on the last package release. - - @@ -41,7 +39,6 @@ and are generated based on the last package release. - @@ -49,20 +46,13 @@ and are generated based on the last package release. - - - - - - - @@ -71,16 +61,10 @@ and are generated based on the last package release. - - - - - - @@ -92,13 +76,16 @@ and are generated based on the last package release. + + + @@ -117,9 +104,7 @@ and are generated based on the last package release. - - diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 8d1040b157..4518d9b44d 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -144,5 +144,15 @@ + + + + + + + + + + diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props index 5c0c46740e..ec6b304d9e 100644 --- a/eng/SharedFramework.External.props +++ b/eng/SharedFramework.External.props @@ -17,24 +17,18 @@ - - - - - - @@ -43,13 +37,10 @@ - - - diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props index 5f09d593de..87b203638b 100644 --- a/eng/SharedFramework.Local.props +++ b/eng/SharedFramework.Local.props @@ -26,6 +26,15 @@ + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36195e902f..fcebe42564 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,14 +61,6 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab @@ -85,10 +77,6 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab @@ -121,10 +109,6 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab @@ -149,14 +133,6 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab @@ -165,10 +141,6 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab @@ -177,10 +149,6 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab @@ -189,22 +157,10 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab @@ -245,10 +201,6 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab @@ -261,34 +213,14 @@ https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/extensions 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/corefx 5cee7c97d602f294e27c582d4dab81ec388f1d7b @@ -420,10 +352,6 @@ https://github.com/dotnet/arcade f50767f96246063f33a6565d318f3adf9058bace - - https://github.com/dotnet/extensions - 396aff55e0b4628a7a44375e4b72e5d19a6e37ab - https://github.com/dotnet/roslyn 92790e24cc2b9f9e336ed0365d610e106c01df88 diff --git a/eng/Versions.props b/eng/Versions.props index d399cc3304..b56e758a88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,14 +98,10 @@ 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 @@ -114,27 +110,19 @@ 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 @@ -145,17 +133,11 @@ 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20114.1 - 5.0.0-preview.1.20114.1 5.0.0-preview.1.20113.3 5.0.0-preview.1.20113.3 @@ -197,7 +179,9 @@ 0.3.0-alpha.19317.1 4.3.0 4.3.2 + 4.3.0 4.5.3 + 4.5.0 1.10.0 5.2.6 diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 4efbe58e97..67f6a75737 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -119,7 +119,7 @@ - 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 25b791e22a..d5ae182a87 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 @@ - + 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 d18ab7c9e4..5546b0db02 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 @@ - + + diff --git a/src/Components/Components/perf/Microsoft.AspNetCore.Components.Performance.csproj b/src/Components/Components/perf/Microsoft.AspNetCore.Components.Performance.csproj index a893d64abd..f40a0a4098 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 @@ - + + diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj index 8a32a89b9e..259b3240f0 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj @@ -7,13 +7,11 @@ - - diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index 4c0a31a3f6..88989ad03c 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -16,7 +16,8 @@ - + + @@ -34,12 +35,16 @@ + Projects=" + ../../Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj; + ../../../JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj; + ../../../Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj"> + @@ -51,7 +56,6 @@ - diff --git a/src/Components/Server/src/Directory.Build.targets b/src/Components/Server/src/Directory.Build.targets new file mode 100644 index 0000000000..09953b9b6c --- /dev/null +++ b/src/Components/Server/src/Directory.Build.targets @@ -0,0 +1,6 @@ + + + + + diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj index 04475e3540..57b11b159e 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 @@ - $(DefaultNetCoreTargetFramework) Runtime server features for ASP.NET Core Components. @@ -10,6 +9,7 @@ CS0436;$(NoWarn) $(DefineConstants);ENABLE_UNSAFE_MSGPACK;SPAN_BUILTIN;MESSAGEPACK_INTERNAL;COMPONENTS_SERVER false + Microsoft.Extensions.FileProviders.Embedded.Manifest.xml @@ -22,7 +22,8 @@ - + + @@ -39,6 +40,15 @@ $(RepoRoot)src\submodules\MessagePack-CSharp\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\ + + + <_FileProviderTaskAssembly>$(ArtifactsDir)bin\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task\$(Configuration)\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll + + + + @@ -84,5 +94,4 @@ - \ 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 63d0c8b102..0000000000 --- a/src/Configuration.KeyPerFile/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - true - configuration - $(NoWarn);PKG0001 - - diff --git a/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj b/src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj index 7f9c5e7eb1..b8b281716e 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 @@ $(DefaultNetCoreTargetFramework) true true + true + true + configuration + $(NoWarn);PKG0001 diff --git a/src/Configuration.KeyPerFile/test/ConfigurationProviderTestBase.cs b/src/Configuration.KeyPerFile/test/ConfigurationProviderTestBase.cs index 4609ee2560..67cb20c6c3 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 7abceed702..053553b984 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 @@ $(DefaultNetCoreTargetFramework);net472 - - - - diff --git a/src/FileProviders/Directory.Build.props b/src/FileProviders/Directory.Build.props deleted file mode 100644 index 709c47ddbd..0000000000 --- a/src/FileProviders/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - true - files;filesystem - - diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj index 3d5fe3cf54..97d9600f13 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 @@ $(MSBuildProjectName).netcoreapp.nuspec true true + true + true + files;filesystem + true @@ -28,6 +32,7 @@ + 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 6acde4ec1d..08148f6430 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 @@ $CommonMetadataElements$ - - + + - + 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 217efb6cea..4a55fc9230 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 @@ $CommonMetadataElements$ - - + + diff --git a/src/FileProviders/Manifest.MSBuildTask/src/Entry.cs b/src/FileProviders/Manifest.MSBuildTask/src/Entry.cs index 1a7f18bef8..93f4c0d277 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 { /// /// 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 86e99477ff..d21c2f74bb 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 cdc4ffdcb0..ab693848c5 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 @@ true false false + false diff --git a/src/FileProviders/Manifest.MSBuildTask/test/GenerateEmbeddedResourcesManifestTest.cs b/src/FileProviders/Manifest.MSBuildTask/test/GenerateEmbeddedResourcesManifestTest.cs index c7285913af..260d15f7f7 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 6b2c83a875..0a80b7fb76 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 aeb85d3e76..fac2cf9a99 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 diagnostics;healthchecks true true + true diff --git a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj index 35c789a691..9e89a9e06e 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 diagnostics;healthchecks true true + true @@ -20,8 +21,8 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder - - + + 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 1591585b82..d5cf94e2e5 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 @@  - - $(DefaultNetCoreTargetFramework);net472 Microsoft.Extensions.Diagnostics.HealthChecks @@ -21,7 +19,7 @@ - + diff --git a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj index 4c42616118..959abbb160 100644 --- a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj @@ -17,6 +17,5 @@ - diff --git a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj index 0e71bb69c9..e8315ef18b 100644 --- a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj @@ -29,7 +29,8 @@ - + + diff --git a/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj index 7dd0c1a2d2..8da7c42605 100644 --- a/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj +++ b/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj index 0ef4679eb1..d207204520 100644 --- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj +++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj @@ -11,8 +11,9 @@ - + + 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 a3f0a4268f..fc6109502d 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 @@ - 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 c5ab085eef..7759136751 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 - + + + diff --git a/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj b/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj index 6a42bef5fe..7f371de380 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 @@ - + + diff --git a/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj index 308dc68011..4f68c48487 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 @@ - + + diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj index 90ff9fea7c..e8a4a831ba 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj @@ -8,7 +8,6 @@ - diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj index 7c399fe557..56072134d0 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 - + + diff --git a/src/Http/Routing/tools/Swaggatherer/Swaggatherer.csproj b/src/Http/Routing/tools/Swaggatherer/Swaggatherer.csproj index cd256b125c..1d083a55e4 100644 --- a/src/Http/Routing/tools/Swaggatherer/Swaggatherer.csproj +++ b/src/Http/Routing/tools/Swaggatherer/Swaggatherer.csproj @@ -9,7 +9,8 @@ - + + 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 adbd0714f6..a170bf6cc1 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 @@ - + diff --git a/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj b/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj index 08e9b73b5f..f4f35eea00 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 @@ - + + diff --git a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj index a45484e0d3..83acae807f 100644 --- a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj +++ b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj @@ -8,6 +8,7 @@ true true true + true diff --git a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj index 4b88160401..92139f6145 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> localization true true + true diff --git a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj index b6b059ce82..f69b533885 100644 --- a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj +++ b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj @@ -10,6 +10,7 @@ localization true true + true diff --git a/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs b/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs index 4f13611a47..0f033a5227 100644 --- a/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs +++ b/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs @@ -54,7 +54,9 @@ namespace Microsoft.Extensions.Localization /// 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 /// 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 70e7a6de1a..747bafc701 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 @@ - 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 83717156df..2674be405d 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 @@ - + + diff --git a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj b/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj index 1b36bc0211..4aea744d90 100644 --- a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj +++ b/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj @@ -8,6 +8,5 @@ - diff --git a/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj b/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj index fd2eb47d66..5bdff90f90 100644 --- a/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj +++ b/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj index 1cb4a825a6..eb5f581428 100644 --- a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj +++ b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj @@ -13,6 +13,5 @@ - diff --git a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj index 6a82485ad6..3697cbee0f 100644 --- a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj +++ b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj @@ -14,6 +14,7 @@ + @@ -25,7 +26,6 @@ - diff --git a/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj b/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj index a4ec7230f6..5b01d11033 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 @@ - + + diff --git a/src/Middleware/perf/Microbenchmarks/Microsoft.AspNetCore.WebSockets.Microbenchmarks.csproj b/src/Middleware/perf/Microbenchmarks/Microsoft.AspNetCore.WebSockets.Microbenchmarks.csproj index 96a0535de7..81d4c4f643 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 @@ - + + 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 5fc2110b40..15f456fd2f 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 @@ - + + diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj index 8a4bebf546..111d4764ac 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -27,7 +27,6 @@ - @@ -36,6 +35,8 @@ + + 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 86533825ea..aca1b44ad5 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 @@ - 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 4be8e0b016..8362bd5cbe 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 - - + + 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 670de5a7d7..92acf1544f 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 @@ - - - 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 1d1eaa6448..7ffbe3d3f3 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 - - - + + + 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 cb3241a4fa..eebe853513 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 @@ - 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 0df3b51ffa..2c851d263b 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 @@ - + + 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 e2a5cad37a..2c40984a45 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 @@ - + + diff --git a/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj b/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj index 1fbb81a9ca..be298e7ae3 100644 --- a/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj +++ b/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj @@ -1,10 +1,14 @@ - netstandard2.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + + + + 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 0000000000..b3b72bec86 --- /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 Create(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy policy) { throw null; } + } + public partial class DefaultObjectPool : Microsoft.Extensions.ObjectPool.ObjectPool where T : class + { + public DefaultObjectPool(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy policy) { } + public DefaultObjectPool(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy policy, int maximumRetained) { } + public override T Get() { throw null; } + public override void Return(T obj) { } + } + public partial class DefaultPooledObjectPolicy : Microsoft.Extensions.ObjectPool.PooledObjectPolicy 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 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 Create(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy policy) { throw null; } + } + public partial class LeakTrackingObjectPool : Microsoft.Extensions.ObjectPool.ObjectPool where T : class + { + public LeakTrackingObjectPool(Microsoft.Extensions.ObjectPool.ObjectPool inner) { } + public override T Get() { throw null; } + public override void Return(T obj) { } + } + public static partial class ObjectPool + { + public static Microsoft.Extensions.ObjectPool.ObjectPool Create(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy policy = null) where T : class, new() { throw null; } + } + public abstract partial class ObjectPoolProvider + { + protected ObjectPoolProvider() { } + public Microsoft.Extensions.ObjectPool.ObjectPool Create() where T : class, new() { throw null; } + public abstract Microsoft.Extensions.ObjectPool.ObjectPool Create(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy policy) where T : class; + } + public static partial class ObjectPoolProviderExtensions + { + public static Microsoft.Extensions.ObjectPool.ObjectPool CreateStringBuilderPool(this Microsoft.Extensions.ObjectPool.ObjectPoolProvider provider) { throw null; } + public static Microsoft.Extensions.ObjectPool.ObjectPool CreateStringBuilderPool(this Microsoft.Extensions.ObjectPool.ObjectPoolProvider provider, int initialCapacity, int maximumRetainedCapacity) { throw null; } + } + public abstract partial class ObjectPool where T : class + { + protected ObjectPool() { } + public abstract T Get(); + public abstract void Return(T obj); + } + public abstract partial class PooledObjectPolicy : Microsoft.Extensions.ObjectPool.IPooledObjectPolicy + { + protected PooledObjectPolicy() { } + public abstract T Create(); + public abstract bool Return(T obj); + } + public partial class StringBuilderPooledObjectPolicy : Microsoft.Extensions.ObjectPool.PooledObjectPolicy + { + 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 c193ad6e1f..ab3be847ad 100644 --- a/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj +++ b/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj @@ -2,12 +2,13 @@ A simple object pool implementation. - netstandard2.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true pooling true true + true diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 037552d492..9434140496 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -33,7 +33,8 @@ - + + diff --git a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj index 57241da578..e32a58b3d2 100644 --- a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj +++ b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj @@ -6,6 +6,5 @@ - diff --git a/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj index c13602372b..d849db7d5a 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 - + + 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 c6bb271536..65871e5a78 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 @@ - + + 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 290b58c7fe..8678427a8f 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 @@ - - - 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 43f6d4b574..6b0ec1e478 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 @@ - + + + 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 9435906632..2abb302273 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 @@ - + + 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 a88930de54..746230e19c 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 @@ - 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 a95e4ec56a..1645d8fd26 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 @@ + @@ -39,7 +40,6 @@ - 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 df7255d954..07c9d49f68 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 @@ - + + diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj index e77498d951..b4442f73ba 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 @@ + - 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 76051ab181..ff221e1205 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 @@ + @@ -25,6 +26,7 @@ + @@ -36,7 +38,6 @@ - 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 8b474e9124..8827879140 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 @@ - 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 d19e84efe5..4e739f5c37 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 @@ - + + 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 ce47db0ac8..578f42c20b 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 @@ - + + diff --git a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj index 3f892a8cdf..ff02262649 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 @@ - @@ -32,10 +31,13 @@ - + + + + diff --git a/src/SignalR/perf/benchmarkapps/Crankier/Crankier.csproj b/src/SignalR/perf/benchmarkapps/Crankier/Crankier.csproj index 23ae6b0027..001d8138de 100644 --- a/src/SignalR/perf/benchmarkapps/Crankier/Crankier.csproj +++ b/src/SignalR/perf/benchmarkapps/Crankier/Crankier.csproj @@ -9,7 +9,6 @@ - @@ -17,6 +16,8 @@ + + diff --git a/src/SignalR/samples/ClientSample/ClientSample.csproj b/src/SignalR/samples/ClientSample/ClientSample.csproj index 4c8d780015..bdbe30c2be 100644 --- a/src/SignalR/samples/ClientSample/ClientSample.csproj +++ b/src/SignalR/samples/ClientSample/ClientSample.csproj @@ -7,13 +7,13 @@ + - diff --git a/src/Testing/ref/Microsoft.AspNetCore.Testing.csproj b/src/Testing/ref/Microsoft.AspNetCore.Testing.csproj deleted file mode 100644 index 4606a54111..0000000000 --- a/src/Testing/ref/Microsoft.AspNetCore.Testing.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - netstandard2.0;net46 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 17a922a6c7..0000000000 --- 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 testCases, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Abstractions.IMessageSink executionMessageSink, Xunit.Abstractions.ITestFrameworkExecutionOptions executionOptions) : base (default(Xunit.Abstractions.ITestAssembly), default(System.Collections.Generic.IEnumerable), 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 RunTestCollectionAsync(Xunit.Sdk.IMessageBus messageBus, Xunit.Abstractions.ITestCollection testCollection, System.Collections.Generic.IEnumerable testCases, System.Threading.CancellationTokenSource cancellationTokenSource) { throw null; } - } - public partial class AspNetTestCollectionRunner : Xunit.Sdk.XunitTestCollectionRunner - { - public AspNetTestCollectionRunner(System.Collections.Generic.Dictionary assemblyFixtureMappings, Xunit.Abstractions.ITestCollection testCollection, System.Collections.Generic.IEnumerable 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), 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 RunTestClassAsync(Xunit.Abstractions.ITestClass testClass, Xunit.Abstractions.IReflectionTypeInfo @class, System.Collections.Generic.IEnumerable 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 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 ThrowsArgumentAsync(System.Func 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 ThrowsArgumentNullOrEmptyAsync(System.Func testCode, string paramName) { throw null; } - public static System.ArgumentException ThrowsArgumentNullOrEmptyString(System.Action testCode, string paramName) { throw null; } - public static System.Threading.Tasks.Task ThrowsArgumentNullOrEmptyStringAsync(System.Func 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 ThrowsAsync(System.Func testCode, string exceptionMessage) where TException : System.Exception { throw null; } - public static TException Throws(System.Action testCode) where TException : System.Exception { throw null; } - public static TException Throws(System.Action testCode, string exceptionMessage) where TException : System.Exception { throw null; } - public static TException Throws(System.Func 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 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> 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 GetSocket(System.Uri requestUri) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task GetStringAsync(string requestUri, bool validateCertificate = true) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task GetStringAsync(System.Uri requestUri, bool validateCertificate = true) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task PostAsync(string requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task 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 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; } - } - 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 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 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 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 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 17a922a6c7..0000000000 --- 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 testCases, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Abstractions.IMessageSink executionMessageSink, Xunit.Abstractions.ITestFrameworkExecutionOptions executionOptions) : base (default(Xunit.Abstractions.ITestAssembly), default(System.Collections.Generic.IEnumerable), 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 RunTestCollectionAsync(Xunit.Sdk.IMessageBus messageBus, Xunit.Abstractions.ITestCollection testCollection, System.Collections.Generic.IEnumerable testCases, System.Threading.CancellationTokenSource cancellationTokenSource) { throw null; } - } - public partial class AspNetTestCollectionRunner : Xunit.Sdk.XunitTestCollectionRunner - { - public AspNetTestCollectionRunner(System.Collections.Generic.Dictionary assemblyFixtureMappings, Xunit.Abstractions.ITestCollection testCollection, System.Collections.Generic.IEnumerable 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), 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 RunTestClassAsync(Xunit.Abstractions.ITestClass testClass, Xunit.Abstractions.IReflectionTypeInfo @class, System.Collections.Generic.IEnumerable 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 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 ThrowsArgumentAsync(System.Func 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 ThrowsArgumentNullOrEmptyAsync(System.Func testCode, string paramName) { throw null; } - public static System.ArgumentException ThrowsArgumentNullOrEmptyString(System.Action testCode, string paramName) { throw null; } - public static System.Threading.Tasks.Task ThrowsArgumentNullOrEmptyStringAsync(System.Func 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 ThrowsAsync(System.Func testCode, string exceptionMessage) where TException : System.Exception { throw null; } - public static TException Throws(System.Action testCode) where TException : System.Exception { throw null; } - public static TException Throws(System.Action testCode, string exceptionMessage) where TException : System.Exception { throw null; } - public static TException Throws(System.Func 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 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> 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 GetSocket(System.Uri requestUri) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task GetStringAsync(string requestUri, bool validateCertificate = true) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task GetStringAsync(System.Uri requestUri, bool validateCertificate = true) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task PostAsync(string requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task 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 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; } - } - 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 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 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 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 GetEvents() { throw null; } - } -} diff --git a/src/Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/Testing/src/Microsoft.AspNetCore.Testing.csproj index 448351fee5..96336a47a8 100644 --- a/src/Testing/src/Microsoft.AspNetCore.Testing.csproj +++ b/src/Testing/src/Microsoft.AspNetCore.Testing.csproj @@ -9,7 +9,6 @@ false true - true true true diff --git a/src/Testing/test/TestPathUtilitiesTest.cs b/src/Testing/test/TestPathUtilitiesTest.cs index 024f476f07..ff3c18e552 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 ebaffde463..7f61a987b3 100644 --- a/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj +++ b/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj @@ -15,10 +15,9 @@ + - - - + 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 35e9c96c78..78f7133975 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 @@ + - 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 b8a4f38c0c..29f83b8643 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 @@ + - diff --git a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj index aa31d55d4e..1ec6fe51ca 100644 --- a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj +++ b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj @@ -12,6 +12,7 @@ + @@ -19,7 +20,6 @@ - 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 6fc54a7a87..1ff940b9f4 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 @@ + - 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 7fce951f0c..1ef774e1c5 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 @@ + - diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.csproj b/src/Tools/dotnet-watch/src/dotnet-watch.csproj index 3c20912211..ee7fc09d15 100644 --- a/src/Tools/dotnet-watch/src/dotnet-watch.csproj +++ b/src/Tools/dotnet-watch/src/dotnet-watch.csproj @@ -13,13 +13,10 @@ + - - - - diff --git a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj index 364f4d3d86..c4fbf99fa6 100644 --- a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj +++ b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj @@ -9,6 +9,7 @@ aspnetcore true true + true