diff --git a/src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj index 6373cfdfa7..6b1fecc0bb 100644 --- a/src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -4,7 +4,7 @@ IIS.Performance Microsoft.AspNetCore.Server.IIS.Performance - netcoreapp2.2 + netcoreapp3.0 Exe true true diff --git a/src/IISIntegration/build/repo.targets b/src/IISIntegration/build/repo.targets index 7d668d32b7..9785c82fdf 100644 --- a/src/IISIntegration/build/repo.targets +++ b/src/IISIntegration/build/repo.targets @@ -115,7 +115,7 @@ + Properties="TargetFramework=netcoreapp3.0;Configuration=$(Configuration);RuntimeIdentifier=win7-%(Platforms.Identity);PublishDir=$(StressAppPublishPath)\%(Identity);BuildProjectReferences=false" /> diff --git a/src/IISIntegration/build/testsite.props b/src/IISIntegration/build/testsite.props index 74f205b4cf..9333b3531d 100644 --- a/src/IISIntegration/build/testsite.props +++ b/src/IISIntegration/build/testsite.props @@ -44,26 +44,19 @@ - - + False - + $(MSBuildThisFileDirectory)..\test\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks - $(InjectDepsAssembly) "win7-$(NativePlatform)" "$(AncmInProcessRHPath)" - - $(InjectDepsAssembly).exe - $(InjectDepsAssembly) - - - + $(InjectDepsAssembly).dll dotnet $(InjectDepsAssembly) $(InjectDepsArguments) diff --git a/src/IISIntegration/samples/IISSample/IISSample.csproj b/src/IISIntegration/samples/IISSample/IISSample.csproj index 556945519e..efdf0a9906 100644 --- a/src/IISIntegration/samples/IISSample/IISSample.csproj +++ b/src/IISIntegration/samples/IISSample/IISSample.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2;net461 + netcoreapp3.0 diff --git a/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj b/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj index 5fcf5c96a8..cf234bf644 100644 --- a/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj +++ b/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj @@ -3,7 +3,7 @@ - netcoreapp2.2 + netcoreapp3.0 true diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs index 8a9d37b146..9fa5d7405e 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs @@ -78,17 +78,12 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return ReadAsyncInternal(new Memory(buffer, offset, count), cancellationToken).AsTask(); } -#if NETCOREAPP2_1 public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) { ValidateState(cancellationToken); return ReadAsyncInternal(destination, cancellationToken); } -#elif NETSTANDARD2_0 -#else -#error TFMs need to be updated -#endif private async ValueTask ReadAsyncInternal(Memory buffer, CancellationToken cancellationToken) { diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs index 1a04535448..739b6b16f5 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs @@ -89,17 +89,12 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return _context.WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken); } -#if NETCOREAPP2_1 public override ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) { ValidateState(cancellationToken); - return new ValueTask(_httpResponseControl.WriteAsync(source, cancellationToken)); + return new ValueTask(_context.WriteAsync(source, cancellationToken)); } -#elif NETSTANDARD2_0 -#else -#error TFMs need to be updated -#endif public void StartAcceptingWrites() { diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs index c8b481f948..eb71f933e8 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs @@ -145,15 +145,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return _requestStream.ReadAsync(buffer, offset, count, cancellationToken); } -#if NETCOREAPP2_1 public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) { return _requestStream.ReadAsync(destination, cancellationToken); } -#elif NETSTANDARD2_0 -#else -#error TFMs need to be updated -#endif public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) { @@ -165,15 +160,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return _responseStream.WriteAsync(buffer, offset, count, cancellationToken); } -#if NETCOREAPP2_1 public override ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) { return _responseStream.WriteAsync(source, cancellationToken); } -#elif NETSTANDARD2_0 -#else -#error TFMs need to be updated -#endif public override long Seek(long offset, SeekOrigin origin) { diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs index 18ae443711..e765550b8f 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs @@ -68,13 +68,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => _inner.ReadAsync(buffer, offset, count, cancellationToken); -#if NETCOREAPP2_1 public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) => _inner.ReadAsync(destination, cancellationToken); -#elif NETSTANDARD2_0 -#else -#error TFMs need to be updated -#endif public override int ReadByte() => _inner.ReadByte(); @@ -91,13 +86,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => _inner.WriteAsync(buffer, offset, count, cancellationToken); -#if NETCOREAPP2_1 public override ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) => _inner.WriteAsync(source, cancellationToken); -#elif NETSTANDARD2_0 -#else -#error TFMs need to be updated -#endif public override void WriteByte(byte value) => _inner.WriteByte(value); diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index ac22e5fe84..3cb4d97a51 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netcoreapp3.0 Microsoft.AspNetCore.Server.IIS Provides support for hosting ASP.NET Core in IIS using the AspNetCoreModule. $(NoWarn);CS1591 @@ -9,7 +9,7 @@ aspnetcore;iis true true - netcoreapp2.2 + netcoreapp3.0 True diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index faae91cdbf..67e359cd76 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -2,7 +2,7 @@ ASP.NET Core components for working with the IIS AspNetCoreModule. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true aspnetcore;iis diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 8fe8c66585..3fa6e5db0f 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // Start timer StartTimer(); - // For an unpublished application the dllroot points pre-built dlls like projectdir/bin/debug/net461/ + // For an unpublished application the dllroot points pre-built dlls like projectdir/bin/debug/netcoreapp3.0/ // and contentRoot points to the project directory so you get things like static assets. // For a published app both point to the publish directory. var dllRoot = CheckIfPublishIsRequired(); diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 64577364d0..bd5e1e201b 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netcoreapp3.0 Microsoft.AspNetCore.Server.IntegrationTesting.IIS $(VersionPrefix)-$(VersionSuffix) diff --git a/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs b/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs index d8607db21e..13c3efb76b 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22) + .WithTfms(Tfm.NetCoreApp30) .WithApplicationTypes(ApplicationType.Portable) .WithAllAncmVersions() .WithAllHostingModels(); diff --git a/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs index 43ccc83eff..438ad7dc57 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllAncmVersions() .WithAllHostingModels(); diff --git a/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs b/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs index e2bcf2a8f9..54c8385e7d 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22) + .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllAncmVersions() .WithAllHostingModels(); diff --git a/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs index c2d0277c4c..2359eb90c7 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs @@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal( new byte[] { 0x1F, 0x8B, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x04, 0x0B, 0x63, 0x60, 0xA0, 0x3D, 0x00, 0x00, + 0x04, 0x0A, 0x63, 0x60, 0xA0, 0x3D, 0x00, 0x00, 0xCA, 0xC6, 0x88, 0x99, 0x64, 0x00, 0x00, 0x00 }, await response.Content.ReadAsByteArrayAsync()); } diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs index 6e2d1bc752..f97001b45f 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "0"); } - [ConditionalFact] + [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore/issues/4512")] public async Task ClientDisconnectCallbackStress() { // Fixture initialization fails if inside of the Task.Run, so send an diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs index d51e6feb25..0a1539ff42 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs @@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22) + .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAncmV2InProcess(); diff --git a/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs b/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs index 1e15cde5c2..e93b4f007a 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22) + .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); diff --git a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs index 3b86662717..6c241f822c 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs @@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22) + .WithTfms(Tfm.NetCoreApp30) .WithApplicationTypes(ApplicationType.Portable) .WithAllAncmVersions(); diff --git a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 11219d4406..68cfdbb0d8 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllAncmVersions(); diff --git a/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs index 282ee26109..ba11dece7c 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs @@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests new DeploymentParameters(publisher.ApplicationPath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { HostingModel = hostingModel, - TargetFramework = "netcoreapp2.2", + TargetFramework = Tfm.NetCoreApp30, AncmVersion = AncmVersion.AspNetCoreModuleV2 }, publish); diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index e8cfd8f641..1c035a818c 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - TargetFramework = Tfm.NetCoreApp22, + TargetFramework = Tfm.NetCoreApp30, AncmVersion = AncmVersion.AspNetCoreModuleV2, HostingModel = HostingModel.InProcess, PublishApplicationBeforeDeployment = true, diff --git a/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs index 8431b15801..14dc6275cd 100644 --- a/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs +++ b/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithApplicationTypes(ApplicationType.Portable) .WithAllAncmVersions() .WithAllHostingModels(); diff --git a/src/IISIntegration/test/Common.Tests/Common.Tests.csproj b/src/IISIntegration/test/Common.Tests/Common.Tests.csproj index ede80732ee..a53d327877 100644 --- a/src/IISIntegration/test/Common.Tests/Common.Tests.csproj +++ b/src/IISIntegration/test/Common.Tests/Common.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 false diff --git a/src/IISIntegration/test/Directory.Build.props b/src/IISIntegration/test/Directory.Build.props index edfd666254..4b89a431e7 100644 --- a/src/IISIntegration/test/Directory.Build.props +++ b/src/IISIntegration/test/Directory.Build.props @@ -1,15 +1,6 @@ - - - netcoreapp2.2 - $(DeveloperBuildTestTfms) - $(StandardTestTfms) - $(StandardTestTfms);net461 - - diff --git a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index c819a03ab1..aa012e408a 100644 --- a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 IISBackwardsCompatibility.FunctionalTests True diff --git a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj index 929f6ec6b0..c7c897e2e5 100644 --- a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj +++ b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 IISForwardsCompatibility.FunctionalTests True diff --git a/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 62dec62e60..b42e1ca4b9 100644 --- a/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 IIS.FunctionalTests True diff --git a/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj b/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj index 3fdb2a5363..4d95c0cfb4 100644 --- a/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj +++ b/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.2 + netcoreapp3.0 @@ -11,7 +11,6 @@ - diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs index ac58f73c0e..7324bd7613 100644 --- a/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllAncmVersions() .WithAllHostingModels(); diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 988c2d5943..549d4ae3b4 100644 --- a/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 True diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 3ff46bf304..294498389f 100644 --- a/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllAncmVersions(); [ConditionalTheory] diff --git a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj index 115d768c1b..491dc71963 100644 --- a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj +++ b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/IISIntegration/test/TestTasks/TestTasks.csproj b/src/IISIntegration/test/TestTasks/TestTasks.csproj index 3cf4f265bb..24f48ce246 100644 --- a/src/IISIntegration/test/TestTasks/TestTasks.csproj +++ b/src/IISIntegration/test/TestTasks/TestTasks.csproj @@ -1,8 +1,9 @@ - + Exe - $(StandardTestTfms) + netcoreapp3.0 + win7-x64;win7-x86 diff --git a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index e08c2be69f..abf9d74542 100644 --- a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -3,7 +3,7 @@ - netcoreapp2.2 + netcoreapp3.0 diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj index d007d2daa1..e50a8777e5 100644 --- a/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ b/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -1,9 +1,9 @@ - + - netcoreapp2.2 + netcoreapp3.0 true diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj index 14beb7394e..4f6c2f95be 100644 --- a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -3,7 +3,8 @@ - $(StandardTestTfms) + netcoreapp3.0 + OutOfProcess diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj index 25ae032221..453950b189 100644 --- a/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj +++ b/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj @@ -3,7 +3,7 @@ - $(StandardTestTfms) + netcoreapp3.0 true diff --git a/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs b/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs index b1604e367a..f35b9db813 100644 --- a/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs +++ b/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs @@ -1,7 +1,9 @@ using System; +using System.Collections.Generic; using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder.Internal; using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.IISIntegration.FunctionalTests @@ -10,6 +12,8 @@ namespace Microsoft.AspNetCore.IISIntegration.FunctionalTests { public static void Register(IApplicationBuilder app, object startup) { + var delegates = new Dictionary(); + var type = startup.GetType(); foreach (var method in type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) { @@ -17,22 +21,40 @@ namespace Microsoft.AspNetCore.IISIntegration.FunctionalTests if (method.Name != "Configure" && parameters.Length == 1) { - Action appfunc = null; + RequestDelegate appfunc = null; + if (parameters[0].ParameterType == typeof(IApplicationBuilder)) { - appfunc = innerAppBuilder => method.Invoke(startup, new[] { innerAppBuilder }); + var innerAppBuilder = app.New(); + method.Invoke(startup, new[] { innerAppBuilder }); + appfunc = innerAppBuilder.Build(); } else if (parameters[0].ParameterType == typeof(HttpContext)) { - appfunc = innerAppBuilder => innerAppBuilder.Run(ctx => (Task)method.Invoke(startup, new[] { ctx })); + appfunc = context => (Task)method.Invoke(startup, new[] { context }); } - if (appfunc != null) + if (appfunc == null) { - app.Map("/" + method.Name, appfunc); + continue; } + + delegates.Add("/" + method.Name, appfunc); } } + + app.Run(async context => { + foreach (var requestDelegate in delegates) + { + if (context.Request.Path.StartsWithSegments(requestDelegate.Key, out var matchedPath, out var remainingPath)) + { + var pathBase = context.Request.PathBase; + context.Request.PathBase = pathBase.Add(matchedPath); + context.Request.Path = remainingPath; + await requestDelegate.Value(context); + } + } + }); } } } diff --git a/src/Razor/korebuild-lock.txt b/src/Razor/korebuild-lock.txt new file mode 100644 index 0000000000..0970da4378 --- /dev/null +++ b/src/Razor/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:3.0.0-build-20181120.4 +commithash:84dcc6f0eb5455a3c0305d6d238926defb050889