From 73b86252d598fe5b862ad9ef83d6ce8ca94ad420 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 6 Feb 2018 19:55:15 +0000 Subject: [PATCH 01/27] Updating submodule(s) IISIntegration => e133377d724ab985010079b5bb0ac06164cb2b53 [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index 5465216be9..e133377d72 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 5465216be950680c8b655f52eb662914b292b550 +Subproject commit e133377d724ab985010079b5bb0ac06164cb2b53 From 0b890f1a551e81f95f55de976ff5c3bb80177080 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 7 Feb 2018 14:33:38 -0800 Subject: [PATCH 02/27] Updating submodule(s) Templating => 5ed4e6e3f7951811e779e27990bad05dcb8ae568 [auto-updated: submodules] --- modules/Templating | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Templating b/modules/Templating index fe3e420e0e..5ed4e6e3f7 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit fe3e420e0e7127909d8da5be641f9c4bbc7bb0ec +Subproject commit 5ed4e6e3f7951811e779e27990bad05dcb8ae568 From 72255f5338e41e0db5704732c2840cc74633e994 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 7 Feb 2018 15:19:40 -0800 Subject: [PATCH 03/27] Fix property name in universe (#857) --- build/AzureIntegration.targets | 3 ++- build/Templating.targets | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index f2d7461c70..57021226df 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -6,8 +6,9 @@ + AspNetUniverseBuildOffline=true; RepositoryRoot=$(AzureIntegrationProjectRoot); - DotNetRestoreSourcesPropsPath=$(GeneratedRestoreSourcesPropsPath); + DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); BuildNumber=$(BuildNumber); Configuration=$(Configuration); diff --git a/build/Templating.targets b/build/Templating.targets index 8ef7591a43..78b7963990 100644 --- a/build/Templating.targets +++ b/build/Templating.targets @@ -26,7 +26,7 @@ <_BuildTemplateProjProperties> $(TemplateProjProperties); SkipAspNetCoreRuntimeInstall=true; - DotNetRestoreSourcesPropsPath=$(GeneratedRestoreSourcesPropsPath); + DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); SkipTests=true; From 508d7ab9e182d7dc218d297cd100a78e90af52bf Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 8 Feb 2018 09:19:27 -0800 Subject: [PATCH 04/27] Prepare output paths (#860) --- build/AzureIntegration.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index 57021226df..8df9536eb7 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -3,7 +3,7 @@ $(MSBuildThisFileDirectory)..\modules\AzureIntegration\ - + AspNetUniverseBuildOffline=true; From 331e46c6324c0af4196c5c013f1b7c99e186f39e Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Thu, 8 Feb 2018 10:34:04 -0800 Subject: [PATCH 05/27] Removes the token server packages from preview1 --- build/artifacts.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build/artifacts.props b/build/artifacts.props index 9fd0624246..7e7aee437b 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -72,7 +72,7 @@ - + @@ -89,14 +89,14 @@ - - - - - - - - + + + + + + + + From 6f814ed536c0f926c69b3e0a0f17566eadd71f88 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 8 Feb 2018 11:35:33 -0800 Subject: [PATCH 06/27] Fix typo in assigning publish category to prodcon packages (#861) --- build/Publish.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 37a6a8ff2b..95ce6cd4c4 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -188,12 +188,12 @@ + Condition="'%(PackagesToPublish.Category)' == 'ship'" /> + Condition="'%(PackagesToPublish.Category)' != 'ship'" /> Date: Thu, 8 Feb 2018 11:39:09 -0800 Subject: [PATCH 07/27] Create all directories and make it by default (#862) --- build/repo.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/repo.targets b/build/repo.targets index bd7246818c..4928a6e824 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -26,7 +26,7 @@ - + @@ -88,7 +88,7 @@ - + <_LineupPackages Include="@(ExternalDependency)" /> <_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " /> From 615263125c9bea52d3596d9a0f976752fd1408fa Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 8 Feb 2018 13:25:44 -0800 Subject: [PATCH 08/27] Updating submodule(s) AzureIntegration => e384f7ec291dc88e9cea6b4b6b6c01fa29077c04 Templating => 06f1340f2ae56d3287471c346a0f735a715a1cc6 [auto-updated: submodules] --- modules/AzureIntegration | 2 +- modules/Templating | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 32659f2f00..e384f7ec29 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 32659f2f00ee79b7379102f0f85e25f17ae0be22 +Subproject commit e384f7ec291dc88e9cea6b4b6b6c01fa29077c04 diff --git a/modules/Templating b/modules/Templating index 5ed4e6e3f7..06f1340f2a 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 5ed4e6e3f7951811e779e27990bad05dcb8ae568 +Subproject commit 06f1340f2ae56d3287471c346a0f735a715a1cc6 From bac8a56d707b390b7e142a91f90f6bfa1912838b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 8 Feb 2018 16:46:09 -0800 Subject: [PATCH 09/27] Updating BuildTools from 2.1.0-preview1-1013 to 2.1.0-preview1-1014 [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 b790abdc1b..522e252ed8 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-1013 -commithash:3546d8149fb5a0f0b6d0be234ce893f87f967345 +version:2.1.0-preview1-1014 +commithash:96efa15d8db80b05fa7d1d82adf939ed3dbf2820 From 9f68d4b92ec6d0cfa9414decd0b6f391a05167c1 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 9 Feb 2018 08:26:08 -0800 Subject: [PATCH 10/27] Restore external dependencies in SiteExtension build (#868) --- build/AzureIntegration.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index 8df9536eb7..7cf8a507fb 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -3,7 +3,7 @@ $(MSBuildThisFileDirectory)..\modules\AzureIntegration\ - + AspNetUniverseBuildOffline=true; From 0d79c657b725ab2f5c62cbafeca2f47e1d1d0376 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 9 Feb 2018 08:43:51 -0800 Subject: [PATCH 11/27] Updating submodule(s) KestrelHttpServer => 0608de37dcda40641d92ba3f52fe27e2d0acd4f3 [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index a5f78264f4..0608de37dc 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit a5f78264f4368afed3ead6d97cf8fb1bb33eb493 +Subproject commit 0608de37dcda40641d92ba3f52fe27e2d0acd4f3 From 28d893fc88a653b6a9d125823cbcf8ceb0979ed7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 9 Feb 2018 10:21:15 -0800 Subject: [PATCH 12/27] Updating submodule(s) DotNetTools => a64672d6e9b1ddcf394b8ae0259a2b1086d2b96c Razor => 1a77aecf68ed709e0537dcf46f1e42a52899be16 Testing => 8d548554fafc035a11a57e8190c36faaec0c6914 [auto-updated: submodules] --- modules/DotNetTools | 2 +- modules/Razor | 2 +- modules/Testing | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/DotNetTools b/modules/DotNetTools index 52c688c4cd..a64672d6e9 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 52c688c4cdc8bc5065c0ea05865664a47c0dc371 +Subproject commit a64672d6e9b1ddcf394b8ae0259a2b1086d2b96c diff --git a/modules/Razor b/modules/Razor index d452ff44b3..1a77aecf68 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit d452ff44b310bdea7902a2bf31567b9975a67f32 +Subproject commit 1a77aecf68ed709e0537dcf46f1e42a52899be16 diff --git a/modules/Testing b/modules/Testing index c65513746d..8d548554fa 160000 --- a/modules/Testing +++ b/modules/Testing @@ -1 +1 @@ -Subproject commit c65513746d0dcfbc017489cb9ef5ddbb72bb7a98 +Subproject commit 8d548554fafc035a11a57e8190c36faaec0c6914 From 21da438c1bac3642b6435b54174c2ae89c471a4c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 9 Feb 2018 11:20:15 -0800 Subject: [PATCH 13/27] Update dependencies to prodcon build 20180208-05-1367307 (#867) * Updates packages to 20180208-05-1367307 prodcon output * Updates corefxlab packages to 0.1.0-preview1-180208-1 * Add script to automate updates from prodcon build manifest --- build/dependencies.props | 187 +++++++++--------- build/external-dependencies.props | 26 +-- .../tasks/ProjectModel/ProjectInfoFactory.cs | 1 + scripts/UpdateDependencies.ps1 | 68 +++++++ scripts/common.psm1 | 64 +++++- 5 files changed, 229 insertions(+), 117 deletions(-) create mode 100644 scripts/UpdateDependencies.ps1 diff --git a/build/dependencies.props b/build/dependencies.props index f8f55a2a7a..7331b6a27a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -21,11 +21,11 @@ 2.3.2 1.1.3 1.1.0-preview - 15.3.409 - 15.3.409 - 15.3.409 - 15.3.409 - 15.3.409 + 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 2.6.1 2.6.1 2.6.1 @@ -36,22 +36,23 @@ 2.6.1 2.6.1 2.6.1 - 4.5.0-preview1-26126-05 - 2.1.0-preview2-25711-01 + 4.5.0-preview1-26208-08 + 2.1.0-preview1-26208-06 1.0.0-rc3-003121 - 2.1.0-preview2-25711-01 + 2.1.0-preview1-26208-06 1.1.0 3.14.2 5.2.0-preview2-41113220915 1.0.5 1.1.2 2.0.0 - 2.1.0-preview1-26126-02 + + 2.1.0-preview1-26208-06 2.6.0-beta2-62211-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-05 + 2.1.0-preview1-26208-06 + 2.1.0-preview1-26208-06 + 2.1.0-preview1-26208-06 + 2.1.0-preview1-26208-08 1.0.1 15.3.0 3.0.1 @@ -77,44 +78,43 @@ 15.6.161-preview 7.0.0 1.4.0 - 4.5.0-preview1-26126-05 + 4.5.0-preview1-26208-08 1.3.7 1.0.1 4.7.49 0.9.0-beta2 1.6.1 - 2.0.1 - 2.0.0 + 2.0.1 1.0.1 10.0.1 - 4.3.0 + 4.7.0-preview1-4939 12.2.1100 2.2.0-alpha-002 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 - 2.1.0-preview1-26126-02 + 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 1.4.0 3.2.0 1.1.8 @@ -123,64 +123,61 @@ 1.2.4 1.1.92 1.0.0 - 4.5.0-preview1-26126-05 - 0.1.0-preview1-180129-1 - 4.5.0-preview1-26126-05 - 1.5.0-preview1-26126-05 - 0.1.0-preview1-180129-1 - 4.5.0-preview1-26126-05 - 1.2.0-preview1-26126-05 - 1.2.0-preview1-26126-05 - 1.2.0-preview1-26126-05 - 1.2.0-preview1-26126-05 - 1.2.0-preview1-26126-05 - 1.2.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 + 4.5.0-preview1-26208-08 + 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 3.1.1 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 0.1.0-preview1-180129-1 - 0.1.0-preview1-180129-1 - 0.1.0-preview1-180129-1 - 0.1.0-preview1-180129-1 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 + 4.5.0-preview1-26208-08 + 4.5.0-preview1-26208-08 + 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 6.1.7601.17515 - 4.5.0-preview1-26126-05 + 4.5.0-preview1-26208-08 4.3.2 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 + 4.5.0-preview1-26208-08 + 4.5.0-preview1-26208-08 + 4.5.0-preview1-26208-08 3.1.1 - 4.5.0-preview1-26126-05 + 4.5.0-preview1-26208-08 4.3.0 - 1.6.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 + 1.6.0-preview1-26208-08 + 4.5.0-preview1-26208-08 + 4.5.0-preview1-26208-08 4.3.0 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 0.1.0-preview1-180129-1 - 0.1.0-preview1-180129-1 - 0.1.0-preview1-180129-1 - 0.1.0-preview1-180129-1 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.9.0-preview1-26126-05 - 4.5.0-preview1-26126-05 - 4.5.0-preview1-26126-05 + 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 + 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 9.0.1 2.7.0-beta3-62512-06 2.7.0-beta3-62512-06 @@ -209,7 +206,7 @@ - + $(MicrosoftNETCoreAppPackageVersion) diff --git a/build/external-dependencies.props b/build/external-dependencies.props index dd6cb16618..027d382edb 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -18,7 +18,7 @@ - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json + 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 @@ -104,6 +104,12 @@ + + + + + + @@ -111,9 +117,6 @@ - - - @@ -233,11 +236,6 @@ - - - - - KRB2004 @@ -317,15 +315,10 @@ KRB2004 NETStandard16PackageVersion - + KRB2004 - NETStandard20PackageVersion - - - - KRB2004 - NETStandard201PackageVersion + NETStandardLibrary20PackageVersion @@ -338,7 +331,6 @@ VisualStudio_NewtonsoftJsonPackageVersion - diff --git a/build/tasks/ProjectModel/ProjectInfoFactory.cs b/build/tasks/ProjectModel/ProjectInfoFactory.cs index 5c739f1784..2acf90be1c 100644 --- a/build/tasks/ProjectModel/ProjectInfoFactory.cs +++ b/build/tasks/ProjectModel/ProjectInfoFactory.cs @@ -88,6 +88,7 @@ namespace RepoTasks.ProjectModel var globalProps = new Dictionary() { ["DesignTimeBuild"] = "true", + ["ExcludeRestorePackageImports"] = "true", }; var project = new Project(xml, diff --git a/scripts/UpdateDependencies.ps1 b/scripts/UpdateDependencies.ps1 new file mode 100644 index 0000000000..92b9737a6f --- /dev/null +++ b/scripts/UpdateDependencies.ps1 @@ -0,0 +1,68 @@ +#!/usr/bin/env pwsh -c +<# +.PARAMETER BuildXml + The URL or file path to a build.xml file that defines package versions to be used +#> +[CmdletBinding()] +param( + [Parameter(Mandatory = $true)] + $BuildXml +) + +$ErrorActionPreference = 'Stop' +Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" +Set-StrictMode -Version 1 + +$depsPath = Resolve-Path "$PSScriptRoot/../build/dependencies.props" +[xml] $dependencies = LoadXml $depsPath + +if ($BuildXml -like 'http*') { + $url = $BuildXml + New-Item -Type Directory "$PSScriptRoot/../obj/" -ErrorAction Ignore + $BuildXml = "$PSScriptRoot/../obj/build.xml" + Write-Verbose "Downloading from $url to $BuildXml" + Invoke-WebRequest -OutFile $BuildXml $url +} + +[xml] $remoteDeps = LoadXml $BuildXml +$count = 0 + +$variables = @{} + +foreach ($package in $remoteDeps.SelectNodes('//Package')) { + $packageId = $package.Id + $packageVersion = $package.Version + $varName = PackageIdVarName $packageId + Write-Verbose "Found {id: $packageId, version: $packageVersion, varName: $varName }" + + if ($variables[$varName]) { + $variables[$varName] += $packageVersion + } else { + $variables[$varName] = @($packageVersion) + } +} + +foreach ($varName in ($variables.Keys | sort)) { + $packageVersions = $variables[$varName] + if ($packageVersions.Length -gt 1){ + Write-Warning "Skipped $varName. Multiple version found. { $($packageVersions -join ', ') }." + continue + } + + $packageVersion = $packageVersions | Select-Object -First 1 + + $depVarNode = $dependencies.SelectSingleNode("//PropertyGroup/$varName") + if ($depVarNode -and $depVarNode.InnerText -ne $packageVersion) { + $depVarNode.InnerText = $packageVersion + $count++ + Write-Host -f DarkGray " Updating $varName to $packageVersion" + } +} + +if ($count -gt 0) { + Write-Host -f Cyan "Updating $count version variables in $depsPath" + SaveXml $dependencies $depsPath +} +else { + Write-Host -f Green "No changes found" +} diff --git a/scripts/common.psm1 b/scripts/common.psm1 index 51952b3431..d1d493eaf0 100644 --- a/scripts/common.psm1 +++ b/scripts/common.psm1 @@ -21,25 +21,38 @@ function Invoke-Block([scriptblock]$cmd) { function Get-Submodules { param( [Parameter(Mandatory = $true)] - [string]$RepoRoot + [string]$RepoRoot, + [switch]$Shipping ) - Invoke-Block { & git submodule update --init } | Out-Null - $moduleConfigFile = Join-Path $RepoRoot ".gitmodules" $submodules = @() - Get-ChildItem "$RepoRoot/modules/*" -Directory | % { + [xml] $submoduleConfig = Get-Content "$RepoRoot/build/submodules.props" + $repos = $submoduleConfig.Project.ItemGroup.Repository | % { $_.Include } + + Get-ChildItem "$RepoRoot/modules/*" -Directory ` + | ? { (-not $Shipping) -or $($repos -contains $($_.Name)) -or $_.Name -eq 'Templating' } ` + | % { Push-Location $_ | Out-Null Write-Verbose "Attempting to get submodule info for $_" + + if (Test-Path 'version.props') { + [xml] $versionXml = Get-Content 'version.props' + $versionPrefix = $versionXml.Project.PropertyGroup.VersionPrefix + } else { + $versionPrefix = '' + } + try { - $data = @{ + $data = [PSCustomObject] @{ path = $_ module = $_.Name commit = $(git rev-parse HEAD) newCommit = $null changed = $false branch = $(git config -f $moduleConfigFile --get submodule.modules/$($_.Name).branch ) + versionPrefix = $versionPrefix } $submodules += $data @@ -51,3 +64,44 @@ function Get-Submodules { return $submodules } + +function SaveXml([xml]$xml, [string]$path) { + Write-Verbose "Saving to $path" + $ErrorActionPreference = 'stop' + + $settings = New-Object System.XML.XmlWriterSettings + $settings.OmitXmlDeclaration = $true + $settings.Encoding = New-Object System.Text.UTF8Encoding( $true ) + $writer = [System.XML.XMLTextWriter]::Create($path, $settings) + $xml.Save($writer) + $writer.Close() +} + +function LoadXml([string]$path) { + Write-Verbose "Reading from $path" + + $ErrorActionPreference = 'stop' + $obj = new-object xml + $obj.PreserveWhitespace = $true + $obj.Load($path) + return $obj +} + +function PackageIdVarName([string]$packageId) { + $canonicalVarName = '' + $upperCaseNext = $true + for ($i = 0; $i -lt $packageId.Length; $i++) { + $ch = $packageId[$i] + if (-not [System.Char]::IsLetterOrDigit(($ch))) { + $upperCaseNext = $true + continue + } + if ($upperCaseNext) { + $ch = [System.Char]::ToUpperInvariant($ch) + $upperCaseNext = $false + } + $canonicalVarName += $ch + } + $canonicalVarName += "PackageVersion" + return $canonicalVarName +} From a5cba06ef85657d24a7bb5d70da42f824d616a31 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 9 Feb 2018 11:51:35 -0800 Subject: [PATCH 14/27] Rename generic rpm installers --- README.md | 2 +- build/SharedFxInstaller.targets | 2 +- build/repo.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 750125f734..05989dec8a 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-m [linux-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-linux-x64.tar.gz [osx-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-osx-x64.tar.gz [debian-x64-deb]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-x64.deb -[redhat-x64-rpm]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-rhel.7-x64.rpm +[redhat-x64-rpm]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-x64.rpm Platform | Latest (dev branch) ----------------------|--------------------- diff --git a/build/SharedFxInstaller.targets b/build/SharedFxInstaller.targets index 4e57e789a7..f65716b19a 100644 --- a/build/SharedFxInstaller.targets +++ b/build/SharedFxInstaller.targets @@ -159,7 +159,7 @@ $(RpmCommonArguments);RpmLicense=$(LicenseType) $(RpmCommonArguments);RpmInstallerPrefix=$(SharedFxInstallerName);SharedFxArchive=$(SharedFxIntermediateArchiveFilePrefix)-linux-x64.tar.gz $(RpmCommonArguments);RpmMSummary=$(SharedFxSummary);RpmDescription=$(SharedFxDescription) - RpmFileSuffix=rhel.7-x64.rpm;RpmInstallRoot=$(InstallRoot) + RpmFileSuffix=x64.rpm;RpmInstallRoot=$(InstallRoot) RpmFileSuffix=rh.rhel.7-x64.rpm;RpmInstallRoot=$(RHInstallRoot) $(RpmCommonArguments);$(RpmCommonGenericArguments);RpmArguments=$(RpmGenericSharedFxArguments) diff --git a/build/repo.props b/build/repo.props index 3f4d8c4a5c..487edc4276 100644 --- a/build/repo.props +++ b/build/repo.props @@ -37,7 +37,7 @@ - + From 460bff97f2d21545cbff4f7c307101b3f74d20f2 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 30 Jan 2018 15:13:47 -0800 Subject: [PATCH 15/27] Update README.md with links to release/2.1 installers [ci skip] --- README.md | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 05989dec8a..857fdfa90e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Commonly referenced packages: [metapackage-nuget-badge]: http://img.shields.io/nuget/v/Microsoft.AspNetCore.svg?style=flat-square&label=nuget Package | NuGet.org -----------------------------------|------------------- +:---------------------------------|:--------------------------------------------------------- Microsoft.AspNetCore.All | [![][all-metapackage-nuget-badge]][all-metapackage-nuget] Microsoft.AspNetCore | [![][metapackage-nuget-badge]][metapackage-nuget] @@ -43,17 +43,13 @@ Commonly referenced packages: [metapackage-myget-badge]: http://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.AspNetCore.svg?style=flat-square&label=myget Package | MyGet -----------------------------------|------------------- +:---------------------------------|:--------------------------------------------------------- Microsoft.AspNetCore.All | [![][all-metapackage-myget-badge]][all-metapackage-myget] Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-myget] ### ASP.NET Core Shared Framework -[win-x64-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-win-x64-version-badge.svg -[win-x86-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-win-x86-version-badge.svg -[linux-x64-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-linux-x64-version-badge.svg -[osx-x64-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-osx-x64-version-badge.svg - +[badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-win-x64-version-badge.svg [win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-win-x64.zip [win-x64-exe]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-win-x64.exe [win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-win-x86.zip @@ -63,14 +59,24 @@ Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-m [debian-x64-deb]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-x64.deb [redhat-x64-rpm]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-x64.rpm -Platform | Latest (dev branch) -----------------------|--------------------- -Windows (x64) | ![][win-x64-badge]
[Installer (exe)][win-x64-exe]
[Archive (zip)][win-x64-zip] -Windows (x86) | ![][win-x86-badge]
[Installer (exe)][win-x86-exe]
[Archive (zip)][win-x86-zip] -macOS (x64) | ![][osx-x64-badge]
[Archive (tar.gz)][osx-x64-tar] -Linux (x64) | ![][linux-x64-badge]
[Archive (tar.gz)][linux-x64-tar] -Debian/Ubuntu (x64) | ![][linux-x64-badge]
[Installer (deb)][debian-x64-deb] -RedHat/Fedora (x64) | ![][linux-x64-badge]
[Installer (rpm)][redhat-x64-rpm] +[badge-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-win-x64-version-badge.svg +[win-x64-zip-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.zip +[win-x64-exe-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.exe +[win-x86-zip-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-win-x86.zip +[win-x86-exe-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-win-x86.exe +[linux-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-linux-x64.tar.gz +[osx-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-osx-x64.tar.gz +[debian-x64-deb-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-x64.deb +[redhat-x64-rpm-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-rhel.7-x64.rpm + +Platform | Latest (dev branch)
![][badge-master] | release/2.1
![][badge-rel-21] +:---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- +Windows (x64) | [Installer (exe)][win-x64-exe]
[Archive (zip)][win-x64-zip] | [Installer (exe)][win-x64-exe-rel-21]
[Archive (zip)][win-x64-zip-rel-21] +Windows (x86) | [Installer (exe)][win-x86-exe]
[Archive (zip)][win-x86-zip] | [Installer (exe)][win-x86-exe-rel-21]
[Archive (zip)][win-x86-zip-rel-21] +macOS (x64) | [Archive (tar.gz)][osx-x64-tar] | [Archive (tar.gz)][osx-x64-tar-rel-21] +Linux (x64) | [Archive (tar.gz)][linux-x64-tar] | [Archive (tar.gz)][linux-x64-tar-rel-21] +Debian/Ubuntu (x64) | [Installer (deb)][debian-x64-deb] | [Installer (deb)][debian-x64-deb-rel-21] +RedHat/Fedora (x64) | [Installer (rpm)][redhat-x64-rpm] | [Installer (rpm)][redhat-x64-rpm-rel-21] ## Building from source From 8d5fa7da7da6957892710a47a275926af9d0eb73 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 9 Feb 2018 12:21:09 -0800 Subject: [PATCH 16/27] Update readme with generic rpm installer name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 857fdfa90e..38803645b5 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-m [linux-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-linux-x64.tar.gz [osx-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-osx-x64.tar.gz [debian-x64-deb-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-x64.deb -[redhat-x64-rpm-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-rhel.7-x64.rpm +[redhat-x64-rpm-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-x64.rpm Platform | Latest (dev branch)
![][badge-master] | release/2.1
![][badge-rel-21] :---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- From b7a82678b50b08e091871eab144c555d31b8611a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 9 Feb 2018 22:26:12 +0000 Subject: [PATCH 17/27] Updating submodule(s) Templating => 67cf534bdab91f59d2d9d732242201c67990b23d [auto-updated: submodules] --- modules/Templating | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Templating b/modules/Templating index 06f1340f2a..67cf534bda 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 06f1340f2ae56d3287471c346a0f735a715a1cc6 +Subproject commit 67cf534bdab91f59d2d9d732242201c67990b23d From a7676ddaf432eb332387f03888e792b4c0d77917 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 9 Feb 2018 15:11:38 -0800 Subject: [PATCH 18/27] Include SignalR packages in .App/.All --- build/artifacts.props | 32 +++++++++++++++++--------------- build/repo.targets | 3 --- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/build/artifacts.props b/build/artifacts.props index 7e7aee437b..db124c8b46 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -71,7 +71,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -150,21 +150,23 @@ - - - - - - - - + + + + + + + - + + + + + + - - @@ -238,8 +240,8 @@ - - + + diff --git a/build/repo.targets b/build/repo.targets index 4928a6e824..12fd349d86 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -191,9 +191,6 @@ - - From 533f368ac59dedaad8ece5738aab409305a00666 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 9 Feb 2018 15:53:00 -0800 Subject: [PATCH 19/27] Remove AzureAppServices.Hosting startup from .App and remove AzureKeyVault.HostingStartup from .All --- build/artifacts.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/artifacts.props b/build/artifacts.props index db124c8b46..095315691f 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -48,8 +48,8 @@ - - + + From 585c9b6884ea5a1087fb3196b03b2307e2ac6341 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sat, 10 Feb 2018 00:27:56 +0000 Subject: [PATCH 20/27] Updating submodule(s) EntityFrameworkCore => 8965f0b91cf89e36abca8636d58420cbd26c22fd Templating => e81e124586e8f6257cf155128a159e17d5673189 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/Templating | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 5aae6e33b2..8965f0b91c 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 5aae6e33b2978897a51f76675e3565582366283e +Subproject commit 8965f0b91cf89e36abca8636d58420cbd26c22fd diff --git a/modules/Templating b/modules/Templating index 67cf534bda..e81e124586 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 67cf534bdab91f59d2d9d732242201c67990b23d +Subproject commit e81e124586e8f6257cf155128a159e17d5673189 From a3f52a819a6a5e175baf4686d02fab0ca80d4262 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 12 Feb 2018 11:24:36 -0800 Subject: [PATCH 21/27] Updating submodule(s) AzureIntegration => 183f4764920d180f2db7bef7fafbce1426dfbce5 [auto-updated: submodules] --- modules/AzureIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/AzureIntegration b/modules/AzureIntegration index e384f7ec29..183f476492 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit e384f7ec291dc88e9cea6b4b6b6c01fa29077c04 +Subproject commit 183f4764920d180f2db7bef7fafbce1426dfbce5 From 299bdc118c4418c0dafa232b176feeed6fd44fa9 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 12 Feb 2018 11:24:44 -0800 Subject: [PATCH 22/27] Updating BuildTools from 2.1.0-preview1-1014 to 2.1.0-preview1-1015 [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 522e252ed8..0939dd836b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-1014 -commithash:96efa15d8db80b05fa7d1d82adf939ed3dbf2820 +version:2.1.0-preview1-1015 +commithash:49ab99ab084250ae35773443f387fd7722c9e60c From f5dc3f71f26cc92b8656ed0598d0223744e507ce Mon Sep 17 00:00:00 2001 From: = Date: Tue, 30 Jan 2018 16:22:57 -0800 Subject: [PATCH 23/27] Build RID specific .All and .App symbols packages --- build/Publish.targets | 7 -- build/SharedFx.props | 1 + build/SharedFx.targets | 94 +++++++++++++++++-- build/repo.props | 4 - .../SharedFrameworkSymbols.nuspec | 21 +++++ 5 files changed, 107 insertions(+), 20 deletions(-) create mode 100644 build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec diff --git a/build/Publish.targets b/build/Publish.targets index 95ce6cd4c4..08b5abecf7 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -63,17 +63,10 @@ nuGetPackagesArchive-$(PackageVersion).lzma aspnetcore-runtime-$(PackageVersion) aspnetcore-runtime-latest - aspnetcore-runtime-symbols-$(PackageVersion) aspnetcore-runtime-internal-$(PackageVersion) - - - $(BlobBasePath)$(SymbolsArchiveBaseFileName)-%(RuntimeSymbolsArchive.Identity)%(RuntimeSymbolsArchive.FileExt) - ShipInstaller=dotnetcli - - diff --git a/build/SharedFx.props b/build/SharedFx.props index 2f35fd7778..4a3267e20d 100644 --- a/build/SharedFx.props +++ b/build/SharedFx.props @@ -11,6 +11,7 @@ <_DebToolDir>$(MSBuildThisFileDirectory)tools\dotnet-deb-tool-consumer\ <_SharedFxSourceDir>$(RepositoryRoot).deps\Signed\SharedFx\ <_InstallerSourceDir>$(RepositoryRoot).deps\Installers\ + <_SymbolsSourceDir>$(RepositoryRoot).deps\Symbols\ <_DockerRootDir>/opt/code/ <_InstallersOutputDir>$(ArtifactsDir)installers\ diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 3c1502a019..589cc66b4d 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -284,9 +284,18 @@ + + %(RootDir)%(Directory)%(Filename).pdb + + + %(RootDir)%(Directory)%(Filename).pdb + + <_AssembliesToCrossgen Include="$(SharedFxIntermediateOutputPath)**\*.dll" /> + + @@ -303,6 +312,14 @@ + + + + + + + + - + + + runtime.$(SharedFxRID).$(SymbolsNuspecIdSuffix) + + - - + <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map" /> + + %(RecursiveDir)%(Filename)%(Extension) + - - + + + + + PackageFiles="@(SymbolFiles)" + BasePath="$(SymbolsWorkDir)" /> + + + + + $(_WorkRoot)Symbols\Microsoft.AspNetCore.App\ + $(_WorkRoot)Symbols\Microsoft.AspNetCore.All\ + + + + + + + + + + + + + + + + + SymbolsWorkDir=$(AppSharedFxSymbolsDirectory) + $(AppSymbolsArguments);SymbolsNuspecIdSuffix=Microsoft.AspNetCore.App.symbols + $(AppSymbolsArguments);Description=Symbol packages for Microsoft.AspNetCore.App shared framework + SymbolsWorkDir=$(AllSharedFxSymbolsDirectory) + $(AllSymbolsArguments);SymbolsNuspecIdSuffix=Microsoft.AspNetCore.All.symbols + $(AllSymbolsArguments);Description=Symbol packages for Microsoft.AspNetCore.All shared framework + + + + + diff --git a/build/repo.props b/build/repo.props index 487edc4276..0406c41539 100644 --- a/build/repo.props +++ b/build/repo.props @@ -26,10 +26,6 @@ - - - - diff --git a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec new file mode 100644 index 0000000000..fed64a5849 --- /dev/null +++ b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec @@ -0,0 +1,21 @@ + + + + $ID$ + $VERSION$ + $DESCRIPTION$ + Microsoft + Microsoft + Copyright © Microsoft Corporation + https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt + https://go.microsoft.com/fwlink/?LinkID=288859 + https://asp.net + true + true + aspnetcore + + + + + + From 354269a4ddf52abe924927e09c6b7b7ce8125540 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 12 Feb 2018 16:47:13 -0800 Subject: [PATCH 24/27] Revert "Build RID specific .All and .App symbols packages" This reverts commit f5dc3f71f26cc92b8656ed0598d0223744e507ce. --- build/Publish.targets | 7 ++ build/SharedFx.props | 1 - build/SharedFx.targets | 94 ++----------------- build/repo.props | 4 + .../SharedFrameworkSymbols.nuspec | 21 ----- 5 files changed, 20 insertions(+), 107 deletions(-) delete mode 100644 build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec diff --git a/build/Publish.targets b/build/Publish.targets index 08b5abecf7..95ce6cd4c4 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -63,10 +63,17 @@ nuGetPackagesArchive-$(PackageVersion).lzma aspnetcore-runtime-$(PackageVersion) aspnetcore-runtime-latest + aspnetcore-runtime-symbols-$(PackageVersion) aspnetcore-runtime-internal-$(PackageVersion) + + + $(BlobBasePath)$(SymbolsArchiveBaseFileName)-%(RuntimeSymbolsArchive.Identity)%(RuntimeSymbolsArchive.FileExt) + ShipInstaller=dotnetcli + + diff --git a/build/SharedFx.props b/build/SharedFx.props index 4a3267e20d..2f35fd7778 100644 --- a/build/SharedFx.props +++ b/build/SharedFx.props @@ -11,7 +11,6 @@ <_DebToolDir>$(MSBuildThisFileDirectory)tools\dotnet-deb-tool-consumer\ <_SharedFxSourceDir>$(RepositoryRoot).deps\Signed\SharedFx\ <_InstallerSourceDir>$(RepositoryRoot).deps\Installers\ - <_SymbolsSourceDir>$(RepositoryRoot).deps\Symbols\ <_DockerRootDir>/opt/code/ <_InstallersOutputDir>$(ArtifactsDir)installers\ diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 589cc66b4d..3c1502a019 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -284,18 +284,9 @@ - - %(RootDir)%(Directory)%(Filename).pdb - - - %(RootDir)%(Directory)%(Filename).pdb - - <_AssembliesToCrossgen Include="$(SharedFxIntermediateOutputPath)**\*.dll" /> - - @@ -312,14 +303,6 @@ - - - - - - - - - - - runtime.$(SharedFxRID).$(SymbolsNuspecIdSuffix) - - - - <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map" /> - - %(RecursiveDir)%(Filename)%(Extension) - - - - - - - - - - - - - $(_WorkRoot)Symbols\Microsoft.AspNetCore.App\ - $(_WorkRoot)Symbols\Microsoft.AspNetCore.All\ - - + - - + - - - - - - - - - SymbolsWorkDir=$(AppSharedFxSymbolsDirectory) - $(AppSymbolsArguments);SymbolsNuspecIdSuffix=Microsoft.AspNetCore.App.symbols - $(AppSymbolsArguments);Description=Symbol packages for Microsoft.AspNetCore.App shared framework - SymbolsWorkDir=$(AllSharedFxSymbolsDirectory) - $(AllSymbolsArguments);SymbolsNuspecIdSuffix=Microsoft.AspNetCore.All.symbols - $(AllSymbolsArguments);Description=Symbol packages for Microsoft.AspNetCore.All shared framework - - - - + + - diff --git a/build/repo.props b/build/repo.props index 0406c41539..487edc4276 100644 --- a/build/repo.props +++ b/build/repo.props @@ -26,6 +26,10 @@ + + + + diff --git a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec deleted file mode 100644 index fed64a5849..0000000000 --- a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - $ID$ - $VERSION$ - $DESCRIPTION$ - Microsoft - Microsoft - Copyright © Microsoft Corporation - https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt - https://go.microsoft.com/fwlink/?LinkID=288859 - https://asp.net - true - true - aspnetcore - - - - - - From a8dc9ca37df2545a935fbdd63f61369a66a3af1e Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 12 Feb 2018 16:48:56 -0800 Subject: [PATCH 25/27] Build RID specific .All and .App symbols packages --- build/Publish.targets | 7 -- build/SharedFx.props | 1 + build/SharedFx.targets | 94 +++++++++++++++++-- build/repo.props | 4 - .../SharedFrameworkSymbols.nuspec | 21 +++++ 5 files changed, 107 insertions(+), 20 deletions(-) create mode 100644 build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec diff --git a/build/Publish.targets b/build/Publish.targets index 95ce6cd4c4..08b5abecf7 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -63,17 +63,10 @@ nuGetPackagesArchive-$(PackageVersion).lzma aspnetcore-runtime-$(PackageVersion) aspnetcore-runtime-latest - aspnetcore-runtime-symbols-$(PackageVersion) aspnetcore-runtime-internal-$(PackageVersion) - - - $(BlobBasePath)$(SymbolsArchiveBaseFileName)-%(RuntimeSymbolsArchive.Identity)%(RuntimeSymbolsArchive.FileExt) - ShipInstaller=dotnetcli - - diff --git a/build/SharedFx.props b/build/SharedFx.props index 2f35fd7778..4a3267e20d 100644 --- a/build/SharedFx.props +++ b/build/SharedFx.props @@ -11,6 +11,7 @@ <_DebToolDir>$(MSBuildThisFileDirectory)tools\dotnet-deb-tool-consumer\ <_SharedFxSourceDir>$(RepositoryRoot).deps\Signed\SharedFx\ <_InstallerSourceDir>$(RepositoryRoot).deps\Installers\ + <_SymbolsSourceDir>$(RepositoryRoot).deps\Symbols\ <_DockerRootDir>/opt/code/ <_InstallersOutputDir>$(ArtifactsDir)installers\ diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 3c1502a019..589cc66b4d 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -284,9 +284,18 @@ + + %(RootDir)%(Directory)%(Filename).pdb + + + %(RootDir)%(Directory)%(Filename).pdb + + <_AssembliesToCrossgen Include="$(SharedFxIntermediateOutputPath)**\*.dll" /> + + @@ -303,6 +312,14 @@ + + + + + + + + - + + + runtime.$(SharedFxRID).$(SymbolsNuspecIdSuffix) + + - - + <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map" /> + + %(RecursiveDir)%(Filename)%(Extension) + - - + + + + + PackageFiles="@(SymbolFiles)" + BasePath="$(SymbolsWorkDir)" /> + + + + + $(_WorkRoot)Symbols\Microsoft.AspNetCore.App\ + $(_WorkRoot)Symbols\Microsoft.AspNetCore.All\ + + + + + + + + + + + + + + + + + SymbolsWorkDir=$(AppSharedFxSymbolsDirectory) + $(AppSymbolsArguments);SymbolsNuspecIdSuffix=Microsoft.AspNetCore.App.symbols + $(AppSymbolsArguments);Description=Symbol packages for Microsoft.AspNetCore.App shared framework + SymbolsWorkDir=$(AllSharedFxSymbolsDirectory) + $(AllSymbolsArguments);SymbolsNuspecIdSuffix=Microsoft.AspNetCore.All.symbols + $(AllSymbolsArguments);Description=Symbol packages for Microsoft.AspNetCore.All shared framework + + + + + diff --git a/build/repo.props b/build/repo.props index 487edc4276..0406c41539 100644 --- a/build/repo.props +++ b/build/repo.props @@ -26,10 +26,6 @@ - - - - diff --git a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec new file mode 100644 index 0000000000..fed64a5849 --- /dev/null +++ b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec @@ -0,0 +1,21 @@ + + + + $ID$ + $VERSION$ + $DESCRIPTION$ + Microsoft + Microsoft + Copyright © Microsoft Corporation + https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt + https://go.microsoft.com/fwlink/?LinkID=288859 + https://asp.net + true + true + aspnetcore + + + + + + From 23c1fed2e40a7d8257e3fe5f90c91075abc8c408 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 12 Feb 2018 19:55:19 -0800 Subject: [PATCH 26/27] Resolve portable pdbs from symbols packages --- build/SharedFx.props | 2 +- build/SharedFx.targets | 70 +++++++++++++++---- build/tasks/RepoTasks.tasks | 1 + build/tasks/ResolveSymbolsRecursivePath.cs | 29 ++++++++ .../SharedFrameworkSymbols.nuspec | 3 +- 5 files changed, 90 insertions(+), 15 deletions(-) create mode 100644 build/tasks/ResolveSymbolsRecursivePath.cs diff --git a/build/SharedFx.props b/build/SharedFx.props index 4a3267e20d..2c49353da7 100644 --- a/build/SharedFx.props +++ b/build/SharedFx.props @@ -11,7 +11,7 @@ <_DebToolDir>$(MSBuildThisFileDirectory)tools\dotnet-deb-tool-consumer\ <_SharedFxSourceDir>$(RepositoryRoot).deps\Signed\SharedFx\ <_InstallerSourceDir>$(RepositoryRoot).deps\Installers\ - <_SymbolsSourceDir>$(RepositoryRoot).deps\Symbols\ + <_SymbolsSourceDir>$(RepositoryRoot).deps\symbols\ <_DockerRootDir>/opt/code/ <_InstallersOutputDir>$(ArtifactsDir)installers\ diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 589cc66b4d..affdaa4878 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -284,16 +284,25 @@ - + <_AppRuntimeAssemblies Include="@(AppPublishAssemblies)" Condition="'%(AssetType)' == 'runtime'"> + %(PackageName).%(PackageVersion).symbols.nupkg %(RootDir)%(Directory)%(Filename).pdb - - + + <_AllRuntimeAssemblies Include="@(AllPublishAssemblies)" Exclude="@(_AppRuntimeAssemblies)" Condition="'%(AssetType)' == 'runtime'"> + %(PackageName).%(PackageVersion).symbols.nupkg %(RootDir)%(Directory)%(Filename).pdb - - + + <_AssembliesToCrossgen Include="$(SharedFxIntermediateOutputPath)**\*.dll" /> + + + + + + + @@ -373,7 +382,7 @@ - <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map" /> + <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map;$(SymbolsWorkDir)**\*.dll" /> %(RecursiveDir)%(Filename)%(Extension) @@ -396,17 +405,40 @@ + $(SharedFxCrossGenDirectory)shared\Microsoft.AspNetCore.App\$(PackageVersion)\ + $(SharedFxCrossGenDirectory)shared\Microsoft.AspNetCore.All\$(PackageVersion)\ $(_WorkRoot)Symbols\Microsoft.AspNetCore.App\ $(_WorkRoot)Symbols\Microsoft.AspNetCore.All\ - - - + + + + - + + + + + + + + + @@ -440,10 +480,14 @@ - + --> diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks index 389a0f71f2..e291aa5b66 100644 --- a/build/tasks/RepoTasks.tasks +++ b/build/tasks/RepoTasks.tasks @@ -21,6 +21,7 @@ + diff --git a/build/tasks/ResolveSymbolsRecursivePath.cs b/build/tasks/ResolveSymbolsRecursivePath.cs new file mode 100644 index 0000000000..21dd795fcd --- /dev/null +++ b/build/tasks/ResolveSymbolsRecursivePath.cs @@ -0,0 +1,29 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using RepoTasks.Utilities; + +namespace RepoTasks +{ + public class ResolveSymbolsRecursivePath : Task + { + [Required] + [Output] + public ITaskItem[] Symbols { get; set; } + + public override bool Execute() + { + foreach (var symbol in Symbols) + { + var fullPath = symbol.GetMetadata("PortablePDB"); + symbol.SetMetadata("SymbolsRecursivePath", fullPath.Substring(fullPath.IndexOf($"{Path.DirectorySeparatorChar}lib{Path.DirectorySeparatorChar}"))); + } + + return true; + } + } +} diff --git a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec index fed64a5849..18c0b0e657 100644 --- a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec +++ b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec @@ -15,7 +15,8 @@ aspnetcore - + + From 127b374b19eddaef067d0182fe15fe91af8a293c Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 13 Feb 2018 12:29:15 -0800 Subject: [PATCH 27/27] Undo typo --- build/SharedFx.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/SharedFx.targets b/build/SharedFx.targets index affdaa4878..326558dcb3 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -480,14 +480,14 @@ - + OverwriteReadOnlyFiles="True" />