diff --git a/Directory.Build.targets b/Directory.Build.targets index 53b3f6e..78626b7 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,7 +1,10 @@ - + $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) + $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) + + 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index 1a64c44..7aad838 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,27 +1,28 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17047 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 0.6.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-17048 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 0.6.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 15.6.82 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 2.0.0 2.2.0-preview1-26424-04 - 2.2.0-preview1-34135 + 2.2.0-preview1-26502-01 + 2.2.0-preview1-34140 15.6.1 2.0.3 2.3.1 diff --git a/build/repo.props b/build/repo.props index 78b0ce5..17a98ac 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,4 +1,4 @@ - + @@ -10,5 +10,6 @@ + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a16d4b9..2573a03 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17047 -commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c +version:2.2.0-preview1-17048 +commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8 diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 7ec143f..bf1f662 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,10 +1,10 @@ - + - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 + $(StandardTestTfms);net461 diff --git a/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs b/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs index d429b08..8deadfc 100644 --- a/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs +++ b/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs @@ -8,10 +8,8 @@ namespace FunctionalTests public class CoreCLRApplicationTestFixture : ApplicationTestFixture { private const string TargetFramework = -#if NETCOREAPP2_0 - "netcoreapp2.0"; -#elif NETCOREAPP2_1 - "netcoreapp2.1"; +#if NETCOREAPP2_2 + "netcoreapp2.2"; #else #error Target frameworks need to be updated #endif diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj index 93409ef..c0f7d7b 100644 --- a/test/FunctionalTests/FunctionalTests.csproj +++ b/test/FunctionalTests/FunctionalTests.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -14,7 +14,7 @@ - + diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props index 4f2b2a5..4c4c409 100644 --- a/testapps/Directory.Build.props +++ b/testapps/Directory.Build.props @@ -2,9 +2,9 @@ - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestAppTfms) - netcoreapp2.1;netcoreapp2.0 + netcoreapp2.2;netcoreapp2.0 $(StandardTestAppTfms);net461