diff --git a/Directory.Build.targets b/Directory.Build.targets index c6dd4f565..3f766110c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -47,7 +47,6 @@ $(SharedFrameworkNugetVersion) - WindowsDesktop/$(SharedFrameworkNugetVersion)/ WindowsDesktop/$(SharedFrameworkNugetVersion)/ diff --git a/eng/stages/publish.yml b/eng/stages/publish.yml index bff4a31ad..990f6495d 100644 --- a/eng/stages/publish.yml +++ b/eng/stages/publish.yml @@ -3,25 +3,11 @@ parameters: stages: -# Create extra stage per BAR channel that needs extra publish steps. -- ${{ each dependency in parameters.dependsOnPublishStages }}: - - stage: PublishBlob_${{ dependency.dependsOn }} - displayName: '${{ dependency.channel.name }} Blob Publish' - dependsOn: PrepareForPublish - variables: - - template: /eng/common/templates/post-build/common-variables.yml - jobs: - - template: /eng/jobs/run-publish-project.yml - parameters: - projectName: publish-blobs - dependency: ${{ dependency }} - # Stages-based publishing entry point - template: /eng/common/templates/post-build/post-build.yml parameters: validateDependsOn: - - ${{ each dependency in parameters.dependsOnPublishStages }}: - - PublishBlob_${{ dependency.dependsOn }} + - PrepareForPublish # Symbol validation is not ready yet. https://github.com/dotnet/arcade/issues/2871 enableSymbolValidation: false # SourceLink validation doesn't work in dev builds: tries to pull from GitHub. https://github.com/dotnet/arcade/issues/3604 @@ -29,6 +15,7 @@ stages: # Allow symbol publish to emit expected warnings without failing the build. Include single # quotes inside the string so that it passes through to MSBuild without script interference. symbolPublishingAdditionalParameters: "'-warnAsError:$false'" + publishInstallersAndChecksums: true # Create extra stage per BAR channel that needs extra publish steps. These run after the Arcade # stages because they depend on Arcade's NuGet package publish being complete. diff --git a/publish/prepare-artifacts.proj b/publish/prepare-artifacts.proj index c99b6105f..551cd83ab 100644 --- a/publish/prepare-artifacts.proj +++ b/publish/prepare-artifacts.proj @@ -1,6 +1,24 @@ + + + + true + + + + + + + + + + + + @@ -13,12 +31,17 @@ + SignPackages; + CreateChecksums"> $(ArtifactsObjDir)PreparedFileUpload\ - + + + + + @@ -96,9 +119,13 @@ - - assets/windowsdesktop/$(InstallersRelativePath)%(Filename)%(Extension) + Exclude="@(NupkgToPublishFile);@(SymbolNupkgToPublishFile)"> + $(InstallersRelativePath)%(Filename)%(Extension) + + + + $(InstallersRelativePath)%(Filename)%(Extension) + Checksum diff --git a/publish/publish-blobs.proj b/publish/publish-blobs.proj deleted file mode 100644 index ed3b2d67d..000000000 --- a/publish/publish-blobs.proj +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -