From 191769555a40291aff3dbddd0a85c4cbc8c58588 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 14 Feb 2018 15:23:25 -0800 Subject: [PATCH 1/9] Updating submodule(s) AzureIntegration => 81eca88270a90fea441e9816b0ce86d6ac297dfd [auto-updated: submodules] --- modules/AzureIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 730a744dbb..81eca88270 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 730a744dbbcb10ca646d28d0a42fc4dbb63e7b47 +Subproject commit 81eca88270a90fea441e9816b0ce86d6ac297dfd From 76983f8e226c04ab9c510f2ffdf9511ee5dea0d3 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 15 Feb 2018 01:56:30 +0000 Subject: [PATCH 2/9] Updating submodule(s) AzureIntegration => 961ed8992c2413014907a84ca13f8071686d4520 [auto-updated: submodules] --- modules/AzureIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 81eca88270..961ed8992c 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 81eca88270a90fea441e9816b0ce86d6ac297dfd +Subproject commit 961ed8992c2413014907a84ca13f8071686d4520 From d6d20bf1991a0de6fa952b7153676ac601b2f535 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 15 Feb 2018 01:56:39 +0000 Subject: [PATCH 3/9] Updating BuildTools from 2.1.0-preview1-1027 to 2.1.0-preview1-1028 [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 8e2a1d99b5..2f6a6a37c2 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-1027 -commithash:f5c4b3e1c519c8aea832672f2f42531912f7b9fb +version:2.1.0-preview1-1028 +commithash:bb4d0a2b748dcdcc62c5c15427e4c989054ff757 From d3abc1cac4a3b2272f9d59c234eb13ac31627f8f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 15 Feb 2018 19:51:42 +0000 Subject: [PATCH 4/9] Updating submodule(s) BasicMiddleware => ade44786c934c1300dab85aa02efdd99fc0ea81c [auto-updated: submodules] --- modules/BasicMiddleware | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index 237ae410ff..ade44786c9 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit 237ae410ffd57e1976f634b52cdf7e75623814a7 +Subproject commit ade44786c934c1300dab85aa02efdd99fc0ea81c From 334c3bd6c9e0e596a15f6fca9ee1cf3d8bd40d33 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 15 Feb 2018 12:58:57 -0800 Subject: [PATCH 5/9] Use correct directory for packing sharedfx files --- build/SharedFx.targets | 4 +- build/dependencies.props | 166 +++++++++++++++++++-------------------- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 326558dcb3..16f292ffa4 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -482,11 +482,11 @@ diff --git a/build/dependencies.props b/build/dependencies.props index d8ad89cbef..33918741ce 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,107 +3,107 @@ 4.2.1 1.0.5 - 15.7.0-preview-000010-1365343 - 15.7.0-preview-000010-1365343 - 15.7.0-preview-000010-1365343 - 15.7.0-preview-000010-1365343 - 15.7.0-preview-000010-1365343 - 4.5.0-preview1-26208-08 - 2.1.0-preview1-26208-06 + 15.7.0-preview-000011-1378327 + 15.7.0-preview-000011-1378327 + 15.7.0-preview-000011-1378327 + 15.7.0-preview-000011-1378327 + 15.7.0-preview-000011-1378327 + 4.5.0-preview1-26213-02 + 2.1.0-preview1-26213-01 1.0.0-rc3-003121 - 2.1.0-preview1-26208-06 + 2.1.0-preview1-26213-01 1.1.0 1.0.5 1.1.2 2.0.0 - 2.1.0-preview1-26208-06 - 2.6.0-beta2-62211-02 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-08 + 2.1.0-preview1-26213-01 + 2.8.0-beta1-62613-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-02 1.0.1 15.3.0 - 4.5.0-preview1-26208-08 + 4.5.0-preview1-26213-02 2.0.1 - 4.7.0-preview1-4939 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 2.1.0-preview1-26208-06 - 4.5.0-preview1-26208-08 + 4.7.0-preview1-4958 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 2.1.0-preview1-26213-01 + 4.5.0-preview1-26213-02 0.1.0-preview1-180208-1 - 4.5.0-preview1-26208-08 - 1.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 1.2.0-preview1-26208-08 - 1.2.0-preview1-26208-08 - 1.2.0-preview1-26208-08 - 1.2.0-preview1-26208-08 - 1.2.0-preview1-26208-08 - 1.2.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 + 4.5.0-preview1-26213-02 + 1.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 1.2.0-preview1-26213-02 + 1.2.0-preview1-26213-02 + 1.2.0-preview1-26213-02 + 1.2.0-preview1-26213-02 + 1.2.0-preview1-26213-02 + 1.2.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 0.1.0-preview1-180208-1 0.1.0-preview1-180208-1 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 4.3.2 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 1.6.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 1.6.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 4.3.0 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 0.1.0-preview1-180208-1 0.1.0-preview1-180208-1 0.1.0-preview1-180208-1 0.1.0-preview1-180208-1 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.9.0-preview1-26208-08 - 4.5.0-preview1-26208-08 - 4.5.0-preview1-26208-08 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.9.0-preview1-26213-02 + 4.5.0-preview1-26213-02 + 4.5.0-preview1-26213-02 From b9afadedecd53419bb9f11ac73e91ac88ddf9969 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 15 Feb 2018 14:39:52 -0800 Subject: [PATCH 6/9] Remove dependency on custom version of Microsoft.NETCore.Compilers --- build/dependencies.props | 1 - build/external-dependencies.props | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 33918741ce..8d17fbc8d3 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -18,7 +18,6 @@ 2.0.0 2.1.0-preview1-26213-01 - 2.8.0-beta1-62613-01 2.1.0-preview1-26213-01 2.1.0-preview1-26213-01 2.1.0-preview1-26213-01 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 10f5c65cd4..64a274f1d3 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -18,8 +18,9 @@ - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180208-05/final/index.json + https://dotnet.myget.org/F/dotnet-core/api/v3/index.json + @@ -127,8 +128,6 @@ https://dotnet.myget.org/F/roslyn/api/v3/index.json - - From 50641534ad30bb81ee521d4ef8436e8816056eae Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 15 Feb 2018 14:13:59 -0800 Subject: [PATCH 7/9] Publish corefxlab packages to the transport feed --- build/Publish.targets | 9 +++++++++ build/external-dependencies.props | 10 ++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index a358da7a58..f7686e7cd8 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -3,6 +3,7 @@ $(RepositoryRoot).deps\assets\ $(RepositoryRoot).deps\packages\ + $(RepositoryRoot).deps\mirror\ $(RepositoryRoot).deps\symbols\ aspnetcore_base_runtime.version @@ -117,6 +118,7 @@ true + <_Artifact Include="@(ArtifactInfo)" ArtifactPath="$(DependencyPackagesDir)%(ArtifactInfo.PackageId).%(ArtifactInfo.Version).nupkg" @@ -135,6 +137,13 @@ + + + + + $(DependencyMirrorDir)%(ExternalDependency.Identity).%(ExternalDependency.Version).nupkg + + diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 64a274f1d3..84a4eb3d5d 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -117,11 +117,13 @@ https://dotnet.myget.org/f/dotnet-corefxlab/api/v3/index.json - - + - - + + + + + From 80c184fc7261956e41cd8254adbfa0da5d78fdfe Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 16 Feb 2018 00:01:59 +0000 Subject: [PATCH 8/9] Updating submodule(s) AzureIntegration => d35d3925c271b9ecb85ec8bd512663bde0101d46 BasicMiddleware => d7957ed50cb6d58ee11f80731a3eff90c71139f6 Diagnostics => f1e63e0f9e29ceb4af4b4ec4bcc1e7f8a15cc47d Hosting => 66714b5fc0780c40b9e9599f0886ae9c3047d306 Identity => ce7d3c7050f89266663c47f49ab47116905208c1 KestrelHttpServer => d78e7ea80d734b6d0b094245e8c7727d670e13da [auto-updated: submodules] --- modules/AzureIntegration | 2 +- modules/BasicMiddleware | 2 +- modules/Diagnostics | 2 +- modules/Hosting | 2 +- modules/Identity | 2 +- modules/KestrelHttpServer | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 961ed8992c..d35d3925c2 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 961ed8992c2413014907a84ca13f8071686d4520 +Subproject commit d35d3925c271b9ecb85ec8bd512663bde0101d46 diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index ade44786c9..d7957ed50c 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit ade44786c934c1300dab85aa02efdd99fc0ea81c +Subproject commit d7957ed50cb6d58ee11f80731a3eff90c71139f6 diff --git a/modules/Diagnostics b/modules/Diagnostics index 93dbe3635d..f1e63e0f9e 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit 93dbe3635d5405d96e0b44772a788ee7773c9934 +Subproject commit f1e63e0f9e29ceb4af4b4ec4bcc1e7f8a15cc47d diff --git a/modules/Hosting b/modules/Hosting index f8d61a4c52..66714b5fc0 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit f8d61a4c522a9200c22b3141c50d6b4c00d3c393 +Subproject commit 66714b5fc0780c40b9e9599f0886ae9c3047d306 diff --git a/modules/Identity b/modules/Identity index 5c8d419b0c..ce7d3c7050 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 5c8d419b0cdc6e8595a71971767ed86f0d2aec33 +Subproject commit ce7d3c7050f89266663c47f49ab47116905208c1 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 0608de37dc..d78e7ea80d 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 0608de37dcda40641d92ba3f52fe27e2d0acd4f3 +Subproject commit d78e7ea80d734b6d0b094245e8c7727d670e13da From 177e22ef4101da1c5ed4d0ae761dc6e5ac4bce3b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 15 Feb 2018 17:12:39 -0800 Subject: [PATCH 9/9] Publish the Windows Server hosting bundle in prodcon output (#897) --- build/Publish.targets | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/Publish.targets b/build/Publish.targets index f7686e7cd8..fcdbf46a13 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -65,11 +65,18 @@ aspnetcore-runtime-$(PackageVersion) aspnetcore-runtime-latest aspnetcore-runtime-internal-$(PackageVersion) + dotnet-hosting-$(PackageVersion)-win.exe + + + $(BlobBasePath)$(WindowsHostingBundleInstallerFileName) + ShipInstaller=dotnetcli + + $(BlobBasePath)$(PackageArchiveFileName)