From 9d794af34dbc12fb59da82c65f315e8d5982e0c8 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 5 Nov 2018 10:12:15 -0800 Subject: [PATCH 1/4] Update to .NET Core 2.2.0-rtm-27105-02 and Extensions 2.2.0-rtm-181105-01 --- build/dependencies.props | 62 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 1a71d9db87..63a1f59573 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,38 +2,38 @@ - 2.2.0-rtm-27023-02 - 2.2.0-rtm-27023-02 - 4.6.0-rtm-27023-03 + 2.2.0-rtm-27105-02 + 2.2.0-rtm-27105-02 + 4.6.0-rtm-27105-02 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 - 2.2.0-rtm-181102-04 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 + 2.2.0-rtm-181105-01 From f454ec3b161b31d2d6fbeb9c38735827f35ce57a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 5 Nov 2018 12:03:59 -0800 Subject: [PATCH 2/4] Updating BuildTools from 2.2.0-preview2-20181101.2 to 2.2.0-preview2-20181104.4 [auto-updated: buildtools] --- global.json | 2 +- korebuild-lock.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 652a69f941..379c5ae154 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.100-rtm-009578" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181101.2" + "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181104.4" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index d25eaa4112..f7508bc60f 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181101.2 -commithash:028ef37154ea949029f005e12955a7b4aee6120a +version:2.2.0-preview2-20181104.4 +commithash:f49ee8062b8ebe5c679eb0e6551a49bd2508a914 From 62b24f930e9f869c803caff23c14e41513df7987 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 5 Nov 2018 14:19:19 -0800 Subject: [PATCH 3/4] Remove the aspnet/FileSystem submodule (#3884) --- .gitmodules | 4 ---- build/artifacts.props | 5 ----- build/buildorder.props | 1 - build/dependencies.props | 5 +++++ build/external-dependencies.props | 7 ++++++- build/submodules.props | 1 - modules/FileSystem | 1 - 7 files changed, 11 insertions(+), 13 deletions(-) delete mode 160000 modules/FileSystem diff --git a/.gitmodules b/.gitmodules index ff126b9711..69ad207d6c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,10 +46,6 @@ path = modules/EntityFrameworkCore url = https://github.com/aspnet/EntityFrameworkCore.git branch = release/2.2 -[submodule "modules/FileSystem"] - path = modules/FileSystem - url = https://github.com/aspnet/FileSystem.git - branch = release/2.2 [submodule "modules/Hosting"] path = modules/Hosting url = https://github.com/aspnet/Hosting.git diff --git a/build/artifacts.props b/build/artifacts.props index 9b1e3558d3..50e4495127 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -208,11 +208,6 @@ - - - - - diff --git a/build/buildorder.props b/build/buildorder.props index 24e61bbb1e..118588c917 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,7 +7,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 63a1f59573..3f4590ce29 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -19,6 +19,11 @@ 2.2.0-rtm-181105-01 2.2.0-rtm-181105-01 2.2.0-rtm-181105-01 + 2.2.0-rtm-35636 + 2.2.0-rtm-35636 + 2.2.0-rtm-35636 + 2.2.0-rtm-35636 + 2.2.0-rtm-35636 2.2.0-rtm-181105-01 2.2.0-rtm-181105-01 2.2.0-rtm-181105-01 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 1469795b04..0973eb5ccc 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -14,7 +14,7 @@ - + @@ -24,6 +24,11 @@ + + + + + diff --git a/build/submodules.props b/build/submodules.props index df85c628d4..bc22327c12 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -48,7 +48,6 @@ - diff --git a/modules/FileSystem b/modules/FileSystem deleted file mode 160000 index da45fac2e6..0000000000 --- a/modules/FileSystem +++ /dev/null @@ -1 +0,0 @@ -Subproject commit da45fac2e6059b9cadf6b5b28313e22df9f51de1 From 5eac0befd09a593de56274842f91841e487105e3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 5 Nov 2018 15:21:03 -0800 Subject: [PATCH 4/4] Include assemblies from aspnet/FileSystem in the list of assemblies to code-signing --- build/CodeSign.props | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/CodeSign.props b/build/CodeSign.props index 6b86be6000..c4e9397c63 100644 --- a/build/CodeSign.props +++ b/build/CodeSign.props @@ -23,6 +23,11 @@ + + + + +