diff --git a/.gitignore b/.gitignore index 08399cccd7..38c1bc46c0 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ node_modules .vscode global.json .idea/ +*.binlog \ No newline at end of file diff --git a/build/dependencies.props b/build/dependencies.props index 34cea5caf5..64b86af553 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,40 +4,40 @@ 0.9.9 - 2.2.0-preview1-34530 - 2.2.0-preview1-17090 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10000 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 15.6.82 15.6.82 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-26618-02 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-preview1-26629-04 + 3.0.0-alpha1-10013 15.6.1 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 2.0.3 0.20.0 3.12.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3e694b2ed8..3f870e51fe 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17090 -commithash:b19e903e946579cd9482089bce7d917e8bacd765 +version:3.0.0-alpha1-10000 +commithash:b7b88d08d55abc8b71de9abf16e26fc713e332cd diff --git a/test/GenerateTestProps.targets b/test/GenerateTestProps.targets index 9d513ebb5a..8e006d2aea 100644 --- a/test/GenerateTestProps.targets +++ b/test/GenerateTestProps.targets @@ -6,13 +6,13 @@ $(PropsProperties);MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion) - 2.1.1 - $(MicrosoftAspNetCoreAllPackageVersion) - $(DefaultPatchVersionForAspNetCoreAll2_1) - $(MicrosoftAspNetCoreAppPackageVersion) + 3.0.0 + $(MicrosoftAspNetCoreAllPackageVersion) + $(DefaultPatchVersionForAspNetCoreAll3_0) + $(MicrosoftAspNetCoreAppPackageVersion) - $(PropsProperties);DefaultPatchVersionForAspNetCoreAll2_1=$(DefaultPatchVersionForAspNetCoreAll2_1) - $(PropsProperties);DefaultPatchVersionForAspNetCoreApp2_1=$(DefaultPatchVersionForAspNetCoreApp2_1) + $(PropsProperties);DefaultPatchVersionForAspNetCoreAll3_0=$(DefaultPatchVersionForAspNetCoreAll3_0) + $(PropsProperties);DefaultPatchVersionForAspNetCoreApp3_0=$(DefaultPatchVersionForAspNetCoreApp3_0) @@ -23,7 +23,7 @@ - BundledAspNetCoreAppTargetFrameworkVersion=3.0 + $(TargetsProperties);BundledAspNetCoreAppTargetFrameworkVersion=3.0 $(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion) diff --git a/test/TemplateTests.props.in b/test/TemplateTests.props.in index cd7240af05..374ffa30c7 100644 --- a/test/TemplateTests.props.in +++ b/test/TemplateTests.props.in @@ -4,7 +4,7 @@ ${RestoreSources} ${RuntimeFrameworkVersion} ${MicrosoftNETSdkRazorPackageVersion} - ${DefaultPatchVersionForAspNetCoreAll2_1} - ${DefaultPatchVersionForAspNetCoreApp2_1} + ${DefaultPatchVersionForAspNetCoreAll3_0} + ${DefaultPatchVersionForAspNetCoreApp3_0} diff --git a/test/TemplateTests.targets.in b/test/TemplateTests.targets.in index ca3c57ba6d..1dfc94d375 100644 --- a/test/TemplateTests.targets.in +++ b/test/TemplateTests.targets.in @@ -39,13 +39,13 @@ Copyright (c) .NET Foundation. All rights reserved. - 2.1.1 - 2.1.1 + 3.0.0 + 3.0.0 - $(DefaultPatchVersionForAspNetCoreAll2_1) + $(DefaultPatchVersionForAspNetCoreAll3_0) @@ -56,7 +56,7 @@ Copyright (c) .NET Foundation. All rights reserved. - $(DefaultPatchVersionForAspNetCoreApp2_1) + $(DefaultPatchVersionForAspNetCoreApp3_0) $(DefaultPatchVersionForAspNetCoreApp2_2) $(DefaultPatchVersionForAspNetCoreApp3_0) @@ -70,7 +70,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + @@ -82,7 +82,7 @@ Copyright (c) .NET Foundation. All rights reserved. - +