From c992f0d5d2997da835dd7e5f8630e56cffc537f3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 17 Jan 2019 09:40:10 -0800 Subject: [PATCH 1/3] Fix NU1604 error during prodcon builds (#6806) --- eng/Dependencies.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Dependencies.props b/eng/Dependencies.props index ee2b7f281d..8d72e7e495 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -21,9 +21,8 @@ and are generated based on the last package release. - + - From 829cd7271e2cb81da2360519e2b5f1819f3b5204 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 17 Jan 2019 10:42:58 -0800 Subject: [PATCH 2/3] Fix signing for 2.2 site extensions (#6777) --- .azure/pipelines/site-extensions.yml | 2 +- build/SharedFx.targets | 27 +++---------------- build/artifacts.props | 2 +- build/repo.props | 4 +-- build/repo.targets | 4 +-- eng/targets/RuntimeIdentifiers.props | 2 ++ global.json | 2 +- korebuild-lock.txt | 4 +-- .../LoggingBranch/LoggingBranch.csproj | 21 ++++++++++++--- 9 files changed, 32 insertions(+), 36 deletions(-) diff --git a/.azure/pipelines/site-extensions.yml b/.azure/pipelines/site-extensions.yml index b85ab847ad..3d1359e56a 100644 --- a/.azure/pipelines/site-extensions.yml +++ b/.azure/pipelines/site-extensions.yml @@ -29,7 +29,7 @@ phases: inputs: signType: $(_SignType) zipSources: false - - script: src/SiteExtensions/build.cmd -ci + - script: src/SiteExtensions/LoggingAggregate/build.cmd -ci displayName: Run src/SiteExtensions/LoggingAggregate/build.cmd - task: PublishBuildArtifacts@1 displayName: Upload artifacts diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 37b62681e8..65deb3cef2 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -2,7 +2,7 @@ $(RepositoryRoot)src\Framework\Framework.UnitTests\Framework.UnitTests.csproj $([MSBuild]::NormalizePath($(UnitTestFxProject))) - $(CodeSignDependsOn);GetSharedFxFilesToSign + $(CodeSignDependsOn);GetSharedFxFilesToSign; _BuildSharedFxProjects;TestSharedFx $(BuildSharedFxDependsOn);CodeSign $(IntermediateDir)ar\$(SharedFxRid)\ @@ -16,6 +16,8 @@ + + @@ -30,6 +32,7 @@ + @@ -41,28 +44,6 @@ - - - - AspNetUniverseBuildOffline=true; - DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); - DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); - BuildNumber=$(BuildNumber); - Configuration=$(Configuration); - IsFinalBuild=$(IsFinalBuild); - - - - - - - - - - - - - diff --git a/build/artifacts.props b/build/artifacts.props index a903fad96d..8082198cce 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -44,7 +44,7 @@ - + diff --git a/build/repo.props b/build/repo.props index 54d416d2cf..b04650faa6 100644 --- a/build/repo.props +++ b/build/repo.props @@ -18,8 +18,8 @@ $(RepositoryRoot)eng\signcheck.exclusions.txt $(RepositoryRoot)src\Shared\ $(SharedFxRid.Substring($([MSBuild]::Add($(SharedFxRid.LastIndexOf('-')), 1)))) - true - false + true + false diff --git a/build/repo.targets b/build/repo.targets index 481313975f..afc2935d4e 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -21,7 +21,7 @@ $(CompileDependsOn);BuildProjects;PackSharedSources $(CompileDependsOn);PackProjects;BuildRepositories;BuildSharedFx $(PackageDependsOn);PackProjects - $(PackageDependsOn);BuildSiteExtension;CheckExpectedPackagesExist + $(PackageDependsOn);CheckExpectedPackagesExist $(PackageDependsOn);CodeSign $(TestDependsOn);TestProjects $(TestDependsOn);_TestRepositories @@ -72,7 +72,7 @@ - + $(BuildProperties);MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); diff --git a/eng/targets/RuntimeIdentifiers.props b/eng/targets/RuntimeIdentifiers.props index 3faa05e4ee..4f42514bbe 100644 --- a/eng/targets/RuntimeIdentifiers.props +++ b/eng/targets/RuntimeIdentifiers.props @@ -6,6 +6,8 @@ osx-x64 linux-x64 + $(SharedFxRid.Substring($([MSBuild]::Add($(SharedFxRid.LastIndexOf('-')), 1)))) + win-x64 osx-x64 diff --git a/global.json b/global.json index 1eaa038e9d..f2958a2808 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.102" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.1-build-20190110.1" + "Internal.AspNetCore.Sdk": "2.2.1-build-20190117.2" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 03d616e580..3ac9e66dcc 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.1-build-20190110.1 -commithash:f4ebd797fd15484869312b139fdd7e3a115d23bb +version:2.2.1-build-20190117.2 +commithash:66f8343ddf482908dd82005dd2154c9e2776e2a1 diff --git a/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj b/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj index b7fb1bf5c8..d7cd144ab5 100644 --- a/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj +++ b/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj @@ -8,9 +8,10 @@ false aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection content - Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion) + Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion).$(SharedFxArchitecture) $(PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + net461 false AzureSiteExtension @@ -23,11 +24,23 @@ - - + + + + + Pack + false + true + + + + Pack + false + true + From a2151cb89a1cb180d6d7d0781ccc47e8eacbc98b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 17 Jan 2019 11:04:07 -0800 Subject: [PATCH 3/3] Do not include prodcon build ID in version metadata This causes problems for npm pack in a prodcon build. We don't need this version metadata, so let's remove it altogether. --- version.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/version.props b/version.props index 4169779f11..5f2037a511 100644 --- a/version.props +++ b/version.props @@ -40,9 +40,6 @@ $(ExperimentalVersionPrefix) $(ExperimentalVersionPrefix)-$(VersionSuffix) - pb-$(DotNetProductBuildId) - $(VersionSuffix)+$(VersionMetadata) - release/$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)