From d9c2f744fa0b09968f1fb4721dbdf6875ae42d8e Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 1 Apr 2020 14:45:39 -0700 Subject: [PATCH 1/4] Attempt to auto-publish vs.redist packages to orchestrated feed (#20211) * Attempt to auto-publish vs.redist packages to orchestrated feed * Use non-stable packageVersion for vs.redist * Fix typo * Update build/Publish.targets - should trigger a build that's more likely to succeed * Print what we're trying to publish * More debug prints * Set RedistPackageId in publishing.targets * Reference variable correctly * Remove unnecessary messages * Respond to feedback Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com> --- build/Publish.targets | 11 ++++++++++- .../Windows/GenerateNugetPackageWithMsi.ps1 | 5 +++-- .../Windows/SharedFramework/SharedFramework.wixproj | 6 +++++- .../SharedFramework/SharedFrameworkPackage.nuspec | 4 ++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 9c73f75d1525..444c1a606f20 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -66,6 +66,8 @@ aspnetcore-runtime-latest aspnetcore-runtime-internal-$(PackageVersion) dotnet-hosting-$(PackageVersion)-win.exe + + VS.Redist.Common.AspNetCore.SharedFramework @@ -174,6 +176,10 @@ + + + + <_MissingArtifactFile Include="@(FilesToPublish)" Condition="!Exists(%(FilesToPublish.Identity))" /> <_MissingArtifactFile Include="@(NpmPackageToPublish)" Condition="!Exists(%(NpmPackageToPublish.Identity))" /> @@ -276,6 +282,10 @@ ManifestArtifactData="NonShipping=true" Condition="'%(PackageToPublish.Category)' != 'ship'" /> + + @@ -287,7 +297,6 @@ Condition=" '%(FilesToPublish.IsDuplicateUpload)' != 'true' " /> - $(SharedFrameworkNamespaceGuid) $(RepositoryRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec $(RepositoryRoot)artifacts/bin/$(Configuration)/installers/ + VS.Redist.Common.AspNetCore.SharedFramework + + $(VersionPrefix)-$(VersionSuffix) @@ -64,7 +67,8 @@ '$(PackageVersion)' ^ '$(RepositoryRoot)' ^ '$(AspNetCoreMajorVersion)' ^ - '$(AspNetCoreMinorVersion)'" /> + '$(AspNetCoreMinorVersion)' ^ + '$(SharedFrameworkRedistPackageId)'" /> diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec index b5b8c43d9e97..d1c14713670c 100644 --- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec +++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec @@ -1,9 +1,9 @@ - VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ + $ID$.$ARCH$.$MAJOR$.$MINOR$ 1.0.0 - VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ + $ID$.$ARCH$.$MAJOR$.$MINOR$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm From 03d446d5a5ced289f2294395baf652bba8f609d9 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 1 Apr 2020 15:31:53 -0700 Subject: [PATCH 2/4] Fix bad merge --- .../Windows/SharedFramework/SharedFrameworkPackage.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec index feee4403063c..49ea59a3a8e6 100644 --- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec +++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec @@ -1,9 +1,9 @@ - $ID$.$ARCH$.$MAJOR$.$MINOR$ + VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ 1.0.0 - $ID$.$ARCH$.$MAJOR$.$MINOR$ + VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ Microsoft Microsoft $PackageLicenseExpression$ From 2d6827a678a9bbe71a6dfa88c626d8c003db06a6 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 1 Apr 2020 16:25:37 -0700 Subject: [PATCH 3/4] Always generate checksums as last part of publish job (#20367) * Always generate checksums as last part of publish job * Initialize props correctly * Fix wildcard * Import Arcade SDK * Add NoWarn MSB4011 * Make import conditional on GenerateChecksums * Select specific files to checksum * Respond to feedback * AfterTargets -> BeforeTargets --- .azure/pipelines/ci.yml | 1 + Directory.Build.props | 1 - eng/AfterSigning.targets | 33 +++++++++++++++++++ eng/Publishing.props | 6 ++-- .../Microsoft.AspNetCore.App.Runtime.csproj | 6 ---- src/Installers/Windows/Wix.targets | 8 +---- 6 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 eng/AfterSigning.targets diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 6ba45c92bb89..11025eb5a8b8 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -67,6 +67,7 @@ variables: # The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs. - name: _PublishArgs value: /p:Publish=true + /p:GenerateChecksums=true /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) /p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) diff --git a/Directory.Build.props b/Directory.Build.props index 4b9357c0e7c2..56feda43edd3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -170,7 +170,6 @@ .tar.gz .zip - .sha512 diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets new file mode 100644 index 000000000000..4bbb0dcf0380 --- /dev/null +++ b/eng/AfterSigning.targets @@ -0,0 +1,33 @@ + + + + + + + $(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1)))) + + $(ArtifactsDir)\installers\ + + + + + + + + + + + + + %(FullPath).sha512 + + + + + + + + diff --git a/eng/Publishing.props b/eng/Publishing.props index 74434eeea5dc..60ad28ac6613 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -1,7 +1,7 @@ - + - $(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1)))) + $(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1)))) $(PublishDependsOnTargets);_PublishInstallersAndChecksums @@ -49,12 +49,10 @@ - true diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index d3427bb7b9ad..d6a90fc286d2 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -154,12 +154,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(InstallersOutputPath)$(RedistArchiveOutputFileName) - - - $(RedistArchiveOutputPath)$(ChecksumExtension) - - - diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 2e4b8dca03c5..de6636d51d49 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -64,7 +64,7 @@ + BeforeTargets="Build"> <_cabs Include="$(TargetDir)**/*.cab" /> @@ -72,10 +72,4 @@ - - - $(InstallersOutputPath)$(PackageFileName)$(ChecksumExtension) - - - From 0681c36925a281e1646bb33b74a76e2c26e98fc5 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 1 Apr 2020 16:32:19 -0700 Subject: [PATCH 4/4] Nit: update azdo job name for macOS (#20330) --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 11025eb5a8b8..c43bb0966ebe 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -558,7 +558,7 @@ stages: parameters: condition: ne(variables['SkipTests'], 'true') jobName: MacOS_Test - jobDisplayName: "Test: macOS 10.13" + jobDisplayName: "Test: macOS 10.14" agentOs: macOS isTestingJob: true buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)