diff --git a/Directory.Build.targets b/Directory.Build.targets
index 4616d30121..5ffc934c20 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -82,7 +82,6 @@
$(ProductVersion)
2.0.0
- Runtime/$(SharedFrameworkNugetVersion)/
Runtime/$(SharedFrameworkNugetVersion)/
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e769ed5a43..7bc46893ea 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -135,21 +135,21 @@
-
+
https://github.com/dotnet/arcade
- 0e9ffd6464aff37aef2dc41dc2162d258f266e32
+ f4823f5c2c1f95e85bb595f533b17afc71924dd6
-
+
https://github.com/dotnet/arcade
- 0e9ffd6464aff37aef2dc41dc2162d258f266e32
+ f4823f5c2c1f95e85bb595f533b17afc71924dd6
-
+
https://github.com/dotnet/arcade
- 0e9ffd6464aff37aef2dc41dc2162d258f266e32
+ f4823f5c2c1f95e85bb595f533b17afc71924dd6
-
+
https://github.com/dotnet/arcade
- 0e9ffd6464aff37aef2dc41dc2162d258f266e32
+ f4823f5c2c1f95e85bb595f533b17afc71924dd6
https://github.com/dotnet/sourcelink
diff --git a/eng/Versions.props b/eng/Versions.props
index 5458de579b..e85ebf5bdf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,9 +24,9 @@
- 2.2.0-beta.19474.3
- 1.0.0-beta.19474.3
- 1.0.0-beta.19474.3
+ 2.2.0-beta.19502.6
+ 1.0.0-beta.19502.6
+ 1.0.0-beta.19502.6
1.0.0-beta2-19367-01
diff --git a/eng/stages/publish.yml b/eng/stages/publish.yml
index 25575ff4e5..c3f4f8ded3 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:
dependsOn:
- - ${{ 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/global.json b/global.json
index 0ae3965f11..9f2d51cc78 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
"dotnet": "3.0.100"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19502.6"
}
}
diff --git a/publish/prepare-artifacts.proj b/publish/prepare-artifacts.proj
index 4d66ad7652..10a7e54c23 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/core-setup/$(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 ed3b2d67d4..0000000000
--- a/publish/publish-blobs.proj
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-