From faa071b3e49071e52d8bb41e8eea35e41b21a786 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 18 Oct 2018 11:32:44 -0700 Subject: [PATCH 1/6] Updating BuildTools from 2.1.3-rtm-15825 to 2.1.3-rtm-15826 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a58ab85bb0..33d66b4820 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15825 -commithash:ddaf03d40226070e49a7524509583c48ed83c3d3 +version:2.1.3-rtm-15826 +commithash:384ad131c1e782dab5e660e5c15f66e8f2135942 From 31849575f12fc7ac883126adb6f68ac430a9f7c4 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 18 Oct 2018 13:48:06 -0700 Subject: [PATCH 2/6] Upgrade to .NET Core 2.1.6-servicing-27017-02 --- build/dependencies.props | 4 ++-- build/repo.props | 22 +--------------------- build/runtimes.props | 24 ++++++++++++++++++++++++ src/DataProtection/build/repo.props | 2 ++ 4 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 build/runtimes.props diff --git a/build/dependencies.props b/build/dependencies.props index 965160864c..7de10ef40d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,8 +2,8 @@ - 2.1.5 - 2.1.5 + 2.1.6-servicing-27017-02 + 2.1.6-servicing-27017-02 diff --git a/build/repo.props b/build/repo.props index 3c7b1970a2..ec2fe7ab7f 100644 --- a/build/repo.props +++ b/build/repo.props @@ -42,27 +42,6 @@ - - - - - - - - - - - - @@ -74,6 +53,7 @@ true + diff --git a/build/runtimes.props b/build/runtimes.props new file mode 100644 index 0000000000..c6f84cb0da --- /dev/null +++ b/build/runtimes.props @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/src/DataProtection/build/repo.props b/src/DataProtection/build/repo.props index 59ae0807d3..37ae8832dc 100644 --- a/src/DataProtection/build/repo.props +++ b/src/DataProtection/build/repo.props @@ -1,4 +1,6 @@ + + true From bd32f67bd35dd37bed4b1bd80cda5a462af32e44 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 18 Oct 2018 16:38:51 -0700 Subject: [PATCH 3/6] Updating BuildTools from 2.1.3-rtm-15826 to 2.1.3-rtm-15827 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 33d66b4820..17a2e1de5d 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15826 -commithash:384ad131c1e782dab5e660e5c15f66e8f2135942 +version:2.1.3-rtm-15827 +commithash:2f64cfc0c04407c0a9c2113f8348ce3ed95182b6 From 2f17d235e52651a9ebd43352d16adf33f7971925 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 18 Oct 2018 17:46:48 -0700 Subject: [PATCH 4/6] Updating submodule(s) DotNetTools => 572aadf149fad6f19691e922926c11bdb2a74fb1 EntityFrameworkCore => 0d0c57482e6fc59e06b9ec6e18cd3bf0fe79eeee IISIntegration => b92c82e97f19f77c95752340066a64a337551e6d KestrelHttpServer => 1d3090f056f0e17b02750bea3bbadf14aecf20a1 Mvc => 27e75e7a5180c2ca0f4da9d2ef08740ded27cd0b Routing => 29b50c7b64593557214e915b67dd67ae50388dd5 SignalR => d3aaf1f5425e9358e6573f2faacaa2ccebd30c2f [auto-updated: submodules] --- modules/DotNetTools | 2 +- modules/EntityFrameworkCore | 2 +- modules/IISIntegration | 2 +- modules/KestrelHttpServer | 2 +- modules/Mvc | 2 +- modules/Routing | 2 +- modules/SignalR | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/DotNetTools b/modules/DotNetTools index e75dc56327..572aadf149 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit e75dc563279c3ec622e4dd9dc3ad22fabbc111e7 +Subproject commit 572aadf149fad6f19691e922926c11bdb2a74fb1 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index c8e49968c7..0d0c57482e 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit c8e49968c7aa60a8e0f32da3ecedad5e7ffa3b59 +Subproject commit 0d0c57482e6fc59e06b9ec6e18cd3bf0fe79eeee diff --git a/modules/IISIntegration b/modules/IISIntegration index 8f99140f30..b92c82e97f 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 8f99140f308fa2cef5f49360694fb924f87d2cfb +Subproject commit b92c82e97f19f77c95752340066a64a337551e6d diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 97acb95715..1d3090f056 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 97acb95715f894de638974d4cc32dcc7f30e1ebf +Subproject commit 1d3090f056f0e17b02750bea3bbadf14aecf20a1 diff --git a/modules/Mvc b/modules/Mvc index 10a94aa7bb..27e75e7a51 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 10a94aa7bb44d8537d869484e7b748d1de4156c1 +Subproject commit 27e75e7a5180c2ca0f4da9d2ef08740ded27cd0b diff --git a/modules/Routing b/modules/Routing index e8b2c9337e..29b50c7b64 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit e8b2c9337e6a7768c9af849052719c2d35c7062c +Subproject commit 29b50c7b64593557214e915b67dd67ae50388dd5 diff --git a/modules/SignalR b/modules/SignalR index b0f7fbbe99..d3aaf1f542 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit b0f7fbbe9920ec789a18328a5f96df3706d57356 +Subproject commit d3aaf1f5425e9358e6573f2faacaa2ccebd30c2f From 817ea3126c1f17c16cccbc1049b9d5d96b30370a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 18 Oct 2018 17:46:57 -0700 Subject: [PATCH 5/6] Updating BuildTools from 2.2.0-preview2-20181017.3 to 2.2.0-preview2-20181018.5 [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 98779cd223..8ca44f1776 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.100-preview2-009404" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181017.3" + "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181018.5" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index d634a9d140..cbed37146e 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181017.3 -commithash:eebe76094b789cc4c641a1120a75195d58bf087c +version:2.2.0-preview2-20181018.5 +commithash:4f3ae63e6bf4d66496c9973218551ec58a71fe55 From 7f349097080d1f18cdc2121e427f426dad32a11c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 19 Oct 2018 10:22:37 -0700 Subject: [PATCH 6/6] Include EFCore in real code signing --- build/RepositoryBuild.targets | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index ce72b5543e..a1c8a35bd4 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -74,18 +74,12 @@ true $(RepositoryBuildArguments) -ci - $(RepositoryBuildArguments) --dotnet-home '$(DOTNET_HOME)' - $(RepositoryBuildArguments) -DotNetHome '$(DOTNET_HOME)' + $(RepositoryBuildArguments) -DotNetHome '$(DOTNET_HOME)' $(RepositoryBuildArguments) /p:AspNetUniverseBuildOffline=true $(RepositoryBuildArguments) /p:DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath) $(RepositoryBuildArguments) /p:DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath) - - $(RepositoryBuildArguments) /p:SignType=$(SignType) $(RepositoryBuildArguments) /p:BuildNumber=$(BuildNumber) $(RepositoryBuildArguments) /p:Configuration=$(Configuration) $(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild)