diff --git a/Directory.Build.targets b/Directory.Build.targets
index 506c1e4e1f..3367fc79e4 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,9 +1,7 @@
- $(MicrosoftNETCoreApp20PackageVersion)
- $(MicrosoftNETCoreApp21PackageVersion)
- $(MicrosoftNETCoreApp22PackageVersion)
+ $(MicrosoftNETCoreApp30PackageVersion)
$(NETStandardLibrary20PackageVersion)
99.9
diff --git a/build/dependencies.props b/build/dependencies.props
index 8ad805b8d7..54576a4dad 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,42 +3,41 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 3.0.0-alpha1-10549
- 2.0.9
- 2.1.3
- 2.2.0-preview2-26905-02
- 3.0.0-alpha1-10549
+ 3.0.0-alpha1-10670
+ 2.2.0-rtm-10670
+ 2.2.0-rtm-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 2.2.0-rtm-10670
+ 2.2.0-rtm-10670
+ 0.7.0-a-alpha1-3-0-tfm-17161
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10657
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-alpha1-10670
+ 3.0.0-preview1-26907-05
+ 3.0.0-alpha1-10670
15.6.1
2.0.3
4.6.0-preview1-26907-04
diff --git a/build/repo.props b/build/repo.props
index 5e78326f66..8b2cf368dc 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -8,11 +8,7 @@
-
-
-
-
-
-
+
+
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index d66a13bdc7..9d9364e5cd 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:3.0.0-alpha1-20180919.1
-commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4
+version:3.0.0-alpha1-20181029.3
+commithash:150b63f49b1bd8a718de239a9fc53f73bc2a8d47
diff --git a/samples/MusicStore/MusicStore.csproj b/samples/MusicStore/MusicStore.csproj
index bb601a817f..beaee9e258 100644
--- a/samples/MusicStore/MusicStore.csproj
+++ b/samples/MusicStore/MusicStore.csproj
@@ -2,12 +2,11 @@
Music store application on ASP.NET Core
- netcoreapp2.2;netcoreapp2.1;netcoreapp2.0;net461
+ netcoreapp3.0
$(DefineConstants);DEMO
true
win7-x86;win7-x64;linux-x64;osx-x64
Debug;Release;RuntimeStore
- full
@@ -20,7 +19,7 @@
-
+
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index c46c1c57f1..6bb1f5a660 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,13 +1,6 @@
-
- netcoreapp2.1
- $(DeveloperBuildTestTfms)
- netcoreapp2.1;netcoreapp2.0
- $(StandardTestTfms);net461
-
-
diff --git a/test/MusicStore.E2ETests/DotnetRunTests.cs b/test/MusicStore.E2ETests/DotnetRunTests.cs
index 6117313a3f..a8456e3f5d 100644
--- a/test/MusicStore.E2ETests/DotnetRunTests.cs
+++ b/test/MusicStore.E2ETests/DotnetRunTests.cs
@@ -17,7 +17,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.Kestrel)
- .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461);
+ .WithTfms(Tfm.NetCoreApp30);
[ConditionalTheory]
[MemberData(nameof(TestVariants))]
diff --git a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
index 144cff0587..c83c26c14a 100644
--- a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@@ -1,11 +1,13 @@
- netcoreapp2.2
+ netcoreapp3.0
MusicStore.E2ETests
true
true
$(WarningsNotAsErrors);xUnit1004
+
+ $(NoWarn);NU1605
@@ -17,6 +19,7 @@
+
diff --git a/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
index 32a9c653c1..59d668d09e 100644
--- a/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
+++ b/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
@@ -18,7 +18,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys)
- .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
+ .WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
.WithAllArchitectures();
diff --git a/test/MusicStore.E2ETests/OpenIdConnectTests.cs b/test/MusicStore.E2ETests/OpenIdConnectTests.cs
index 75349481f7..dd47eb8740 100644
--- a/test/MusicStore.E2ETests/OpenIdConnectTests.cs
+++ b/test/MusicStore.E2ETests/OpenIdConnectTests.cs
@@ -15,7 +15,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel)
- .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461);
+ .WithTfms(Tfm.NetCoreApp30);
[ConditionalTheory]
[MemberData(nameof(TestVariants))]
diff --git a/test/MusicStore.E2ETests/PublishAndRunTests.cs b/test/MusicStore.E2ETests/PublishAndRunTests.cs
index 9113197099..1625293f6f 100644
--- a/test/MusicStore.E2ETests/PublishAndRunTests.cs
+++ b/test/MusicStore.E2ETests/PublishAndRunTests.cs
@@ -16,7 +16,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
- .WithTfms(Tfm.NetCoreApp22)
+ .WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
.WithAllAncmVersions()
.WithAllHostingModels()
@@ -25,12 +25,12 @@ namespace E2ETests
// ANCM In-process cannot run on netcoreapp2.1 and below
public static TestMatrix TestVariantsWithoutInproc
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
- .WithTfms(Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
+ .WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
.WithAllAncmVersions()
.WithHostingModels(HostingModel.OutOfProcess)
.WithAllArchitectures();
-
+
[ConditionalTheory]
[MemberData(nameof(TestVariants))]
[MemberData(nameof(TestVariantsWithoutInproc))]
diff --git a/test/MusicStore.E2ETests/SmokeTests.cs b/test/MusicStore.E2ETests/SmokeTests.cs
index ffebaf5351..565a5de89c 100644
--- a/test/MusicStore.E2ETests/SmokeTests.cs
+++ b/test/MusicStore.E2ETests/SmokeTests.cs
@@ -17,7 +17,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
- .WithTfms(Tfm.NetCoreApp22)
+ .WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
.WithAllAncmVersions()
.WithAllHostingModels();
@@ -25,7 +25,7 @@ namespace E2ETests
// ANCM In-process cannot run on netcoreapp2.1 and below
public static TestMatrix TestVariantsWithoutInproc
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
- .WithTfms(Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
+ .WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
.WithAllAncmVersions()
.WithHostingModels(HostingModel.OutOfProcess)
diff --git a/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs b/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
index 496aee6446..f1db389ec3 100644
--- a/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
+++ b/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
@@ -244,7 +244,7 @@ namespace E2ETests
_remoteDeploymentConfig.AccountName,
_remoteDeploymentConfig.AccountPassword)
{
- TargetFramework = Tfm.NetCoreApp22,
+ TargetFramework = Tfm.NetCoreApp30,
ApplicationBaseUriHint = applicationBaseUrl,
ApplicationType = applicationType
};
diff --git a/test/MusicStore.E2ETests/StoreSmokeTests.cs b/test/MusicStore.E2ETests/StoreSmokeTests.cs
index 4371d3db93..4001d502be 100644
--- a/test/MusicStore.E2ETests/StoreSmokeTests.cs
+++ b/test/MusicStore.E2ETests/StoreSmokeTests.cs
@@ -34,7 +34,7 @@ namespace E2ETests
EnvironmentName = "SocialTesting",
PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,
- TargetFramework = Tfm.NetCoreApp20, // There's only a Store on 2.0
+ TargetFramework = Tfm.NetCoreApp30,
UserAdditionalCleanup = parameters =>
{
DbUtils.DropDatabase(musicStoreDbName, logger);
@@ -92,4 +92,4 @@ namespace E2ETests
return directoryStructure.ToString();
}
}
-}
\ No newline at end of file
+}
diff --git a/test/MusicStore.Test/MusicStore.Test.csproj b/test/MusicStore.Test/MusicStore.Test.csproj
index 88d02b1a8e..5e4eabf23c 100644
--- a/test/MusicStore.Test/MusicStore.Test.csproj
+++ b/test/MusicStore.Test/MusicStore.Test.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0