diff --git a/Directory.Build.targets b/Directory.Build.targets
index 53b3f6e1da..9ea039e661 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,7 +1,8 @@
- $(MicrosoftNETCoreApp20PackageVersion)
- $(MicrosoftNETCoreApp21PackageVersion)
+ $(MicrosoftNETCoreApp22PackageVersion)
$(NETStandardLibrary20PackageVersion)
+
+ 99.9
diff --git a/build/dependencies.props b/build/dependencies.props
index 4d3581d498..c72ee219da 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,40 +3,39 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 0.6.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.2.0-preview1-34184
- 2.0.0
- 2.1.0-rc1
- 2.2.0-preview1-34184
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 0.6.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-34194
+ 2.2.0-preview1-26509-06
+ 2.2.0-preview1-34194
15.6.1
2.0.3
4.6.0-preview1-26508-04
diff --git a/build/repo.props b/build/repo.props
index 78b0ce5879..81d20dd22c 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -8,7 +8,6 @@
-
-
+
diff --git a/samples/MusicStore/MusicStore.csproj b/samples/MusicStore/MusicStore.csproj
index aad674d3f4..93fce56d94 100644
--- a/samples/MusicStore/MusicStore.csproj
+++ b/samples/MusicStore/MusicStore.csproj
@@ -2,7 +2,7 @@
Music store application on ASP.NET Core
- netcoreapp2.1;netcoreapp2.0;net461
+ netcoreapp2.2;net461
$(DefineConstants);DEMO
true
win7-x86;win7-x64;linux-x64;osx-x64
diff --git a/test/MusicStore.E2ETests/Common/Helpers.cs b/test/MusicStore.E2ETests/Common/Helpers.cs
index d73d2d08f9..a367aefbfc 100644
--- a/test/MusicStore.E2ETests/Common/Helpers.cs
+++ b/test/MusicStore.E2ETests/Common/Helpers.cs
@@ -48,13 +48,7 @@ namespace E2ETests
}
else if (flavor == RuntimeFlavor.CoreClr)
{
-#if NETCOREAPP2_0
- return "netcoreapp2.0";
-#elif NETCOREAPP2_1
- return "netcoreapp2.1";
-#else
-#error Target Frameworks need to be updated
-#endif
+ return "netcoreapp2.2";
}
throw new ArgumentException($"Unknown runtime flavor '{flavor}.");
diff --git a/test/MusicStore.E2ETests/DotnetRunTests_X64.cs b/test/MusicStore.E2ETests/DotnetRunTests_X64.cs
index 6608de3d5e..062b0ac287 100644
--- a/test/MusicStore.E2ETests/DotnetRunTests_X64.cs
+++ b/test/MusicStore.E2ETests/DotnetRunTests_X64.cs
@@ -24,7 +24,7 @@ namespace E2ETests
{
return RunTests(ServerType.Kestrel, RuntimeFlavor.CoreClr, ApplicationType.Portable);
}
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
+
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task DotnetRunTests_X64_Kestrel_Clr()
@@ -32,7 +32,7 @@ namespace E2ETests
// CLR must be published as standalone to perform rid specific deployment
return RunTests(ServerType.Kestrel, RuntimeFlavor.Clr, ApplicationType.Standalone);
}
-#endif
+
private Task RunTests(ServerType serverType, RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
=> _testRunner.RunTests(serverType, runtimeFlavor, applicationType, RuntimeArchitecture.x64);
}
diff --git a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
index 8d60d53eac..92ffe95c16 100644
--- a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.1;netcoreapp2.0
+ netcoreapp2.2
MusicStore.E2ETests
true
true
diff --git a/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
index fa5a7460a8..8213019bff 100644
--- a/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
+++ b/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
@@ -44,7 +44,6 @@ namespace E2ETests
return NtlmAuthenticationTest(ServerType.IISExpress, RuntimeFlavor.CoreClr, ApplicationType.Standalone);
}
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
[ConditionalFact]
public Task NtlmAuthenticationTest_WebListener_CLR()
{
@@ -56,7 +55,6 @@ namespace E2ETests
{
return NtlmAuthenticationTest(ServerType.IISExpress, RuntimeFlavor.Clr, ApplicationType.Standalone);
}
-#endif
private async Task NtlmAuthenticationTest(ServerType serverType, RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
{
diff --git a/test/MusicStore.E2ETests/OpenIdConnectTests.cs b/test/MusicStore.E2ETests/OpenIdConnectTests.cs
index 41ce61fd4f..82bf49d6a4 100644
--- a/test/MusicStore.E2ETests/OpenIdConnectTests.cs
+++ b/test/MusicStore.E2ETests/OpenIdConnectTests.cs
@@ -28,14 +28,14 @@ namespace E2ETests
{
return OpenIdConnectTestSuite(ServerType.Kestrel, RuntimeFlavor.CoreClr, ApplicationType.Standalone);
}
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
+
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task OpenIdConnect_Kestrel_CLR()
{
return OpenIdConnectTestSuite(ServerType.Kestrel, RuntimeFlavor.Clr, ApplicationType.Portable);
}
-#endif
+
private async Task OpenIdConnectTestSuite(ServerType serverType, RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
{
var architecture = RuntimeArchitecture.x64;
diff --git a/test/MusicStore.E2ETests/PublishAndRunTests_X64.cs b/test/MusicStore.E2ETests/PublishAndRunTests_X64.cs
index c596033034..76161cb6f9 100644
--- a/test/MusicStore.E2ETests/PublishAndRunTests_X64.cs
+++ b/test/MusicStore.E2ETests/PublishAndRunTests_X64.cs
@@ -29,7 +29,7 @@ namespace E2ETests
{
return RunTests(ServerType.WebListener, RuntimeFlavor.CoreClr, ApplicationType.Standalone);
}
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
+
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task PublishAndRunTests_X64_WebListener_Clr()
@@ -37,7 +37,7 @@ namespace E2ETests
// CLR must be published as standalone to perform rid specific deployment
return RunTests(ServerType.WebListener, RuntimeFlavor.Clr, ApplicationType.Standalone);
}
-#endif
+
[Fact]
public Task PublishAndRunTests_X64_Kestrel_CoreClr_Portable()
{
@@ -49,7 +49,7 @@ namespace E2ETests
{
return RunTests(ServerType.Kestrel, RuntimeFlavor.CoreClr, ApplicationType.Standalone);
}
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
+
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task PublishAndRunTests_X64_Kestrel_Clr()
@@ -57,7 +57,7 @@ namespace E2ETests
// CLR must be published as standalone to perform rid specific deployment
return RunTests(ServerType.Kestrel, RuntimeFlavor.Clr, ApplicationType.Standalone);
}
-#endif
+
private Task RunTests(ServerType serverType, RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
=> _testRunner.RunTests(serverType, runtimeFlavor, applicationType, RuntimeArchitecture.x64);
}
diff --git a/test/MusicStore.E2ETests/PublishAndRunTests_X86.cs b/test/MusicStore.E2ETests/PublishAndRunTests_X86.cs
index 7c8c5e20f7..88bd49c980 100644
--- a/test/MusicStore.E2ETests/PublishAndRunTests_X86.cs
+++ b/test/MusicStore.E2ETests/PublishAndRunTests_X86.cs
@@ -1,4 +1,3 @@
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.IntegrationTesting;
using Microsoft.AspNetCore.Testing.xunit;
@@ -37,4 +36,3 @@ namespace E2ETests
=> _testRunner.RunTests(serverType, runtimeFlavor, applicationType, RuntimeArchitecture.x86);
}
}
-#endif
\ No newline at end of file
diff --git a/test/MusicStore.E2ETests/SmokeTests_X64.cs b/test/MusicStore.E2ETests/SmokeTests_X64.cs
index d57962e9f1..64d0b5b538 100644
--- a/test/MusicStore.E2ETests/SmokeTests_X64.cs
+++ b/test/MusicStore.E2ETests/SmokeTests_X64.cs
@@ -15,14 +15,14 @@ namespace E2ETests
{
_smokeTestRunner = new SmokeTestRunner(output);
}
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
+
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task SmokeTests_X64_WebListener_Clr()
{
return _smokeTestRunner.SmokeTestSuite(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable);
}
-#endif
+
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task SmokeTests_X64_WebListener_CoreClr_Portable()
@@ -36,14 +36,14 @@ namespace E2ETests
{
return _smokeTestRunner.SmokeTestSuite(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone);
}
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
+
[ConditionalFact(Skip = "https://github.com/aspnet/websdk/pull/322")]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task SmokeTests_X64_IISExpress_Clr()
{
return _smokeTestRunner.SmokeTestSuite(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable);
}
-#endif
+
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task SmokeTests_X64_IISExpress_CoreClr_Portable()
@@ -57,14 +57,14 @@ namespace E2ETests
{
return _smokeTestRunner.SmokeTestSuite(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone);
}
-#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
+
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public Task SmokeTests_X64_Kestrel_Clr()
{
return _smokeTestRunner.SmokeTestSuite(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable);
}
-#endif
+
[Fact]
public Task SmokeTests_X64_Kestrel_CoreClr_Portable()
{
diff --git a/test/MusicStore.Test/MusicStore.Test.csproj b/test/MusicStore.Test/MusicStore.Test.csproj
index ca4c333468..88d02b1a8e 100644
--- a/test/MusicStore.Test/MusicStore.Test.csproj
+++ b/test/MusicStore.Test/MusicStore.Test.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.1
+ netcoreapp2.2