diff --git a/SignList.xml b/SignList.xml
new file mode 100644
index 0000000000..bfaaf08e21
--- /dev/null
+++ b/SignList.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build.cake b/build.cake
index 4f2e80d24a..e7dd724018 100644
--- a/build.cake
+++ b/build.cake
@@ -544,6 +544,8 @@ Task ("nuget")
// special case for all the native assets
if (PACK_ALL_PLATFORMS)
{
+ EnsureDirectoryExists ($"{OUTPUT_SPECIAL_NUGETS_PATH}");
+ DeleteFiles ($"{OUTPUT_SPECIAL_NUGETS_PATH}/*.nupkg");
var specials = new Dictionary {
{ "_NativeAssets", "native" },
{ "_NuGets", "nugets" },
@@ -561,15 +563,15 @@ Task ("nuget")
if (!string.IsNullOrEmpty (PREVIEW_LABEL) && PREVIEW_LABEL.StartsWith ("pr.")) {
version.Value = "0.0.0-" + PREVIEW_LABEL;
xdoc.Save (nuspec);
- PackageNuGet (nuspec, OUTPUT_NUGETS_PATH, true);
+ PackageNuGet (nuspec, OUTPUT_SPECIAL_NUGETS_PATH, true);
} else {
version.Value = "0.0.0-commit." + GIT_SHA;
xdoc.Save (nuspec);
- PackageNuGet (nuspec, OUTPUT_NUGETS_PATH, true);
+ PackageNuGet (nuspec, OUTPUT_SPECIAL_NUGETS_PATH, true);
version.Value = "0.0.0-branch." + GIT_BRANCH_NAME.Replace ("/", ".");
xdoc.Save (nuspec);
- PackageNuGet (nuspec, OUTPUT_NUGETS_PATH, true);
+ PackageNuGet (nuspec, OUTPUT_SPECIAL_NUGETS_PATH, true);
}
DeleteFiles ($"./output/{pair.Value}/*.nuspec");
diff --git a/cake/msbuild.cake b/cake/msbuild.cake
index e43d3652b5..bb4a4633b8 100644
--- a/cake/msbuild.cake
+++ b/cake/msbuild.cake
@@ -1,5 +1,6 @@
DirectoryPath PACKAGE_CACHE_PATH = MakeAbsolute(ROOT_PATH.Combine("externals/package_cache"));
DirectoryPath OUTPUT_NUGETS_PATH = MakeAbsolute(ROOT_PATH.Combine("output/nugets"));
+DirectoryPath OUTPUT_SPECIAL_NUGETS_PATH = MakeAbsolute(ROOT_PATH.Combine("output/special-nugets"));
void RunMSBuild(
FilePath solution,
diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 1d0644ba3b..d761482027 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -41,6 +41,7 @@ resources:
type: github
name: xamarin/yaml-templates
endpoint: xamarin
+ ref: refs/heads/main
stages:
- stage: prepare
@@ -406,6 +407,16 @@ stages:
inputs:
artifactName: nuget
pathToPublish: 'output/nugets'
+ - task: PublishBuildArtifacts@1
+ displayName: Publish the special nuget artifacts
+ inputs:
+ artifactName: nuget_special
+ pathToPublish: 'output/special-nugets'
+ - task: PublishBuildArtifacts@1
+ displayName: Publish the SignList.xml into nuget artifacts
+ inputs:
+ artifactName: nuget
+ pathToPublish: 'SignList.xml'
- stage: api_diff
displayName: API Diff
@@ -444,9 +455,7 @@ stages:
dependsOn: package
condition: eq(variables['System.TeamProject'], 'devdiv')
jobs:
- - template: sign-artifacts/jobs/v1.yml@xamarin-templates
- parameters:
- additionalConditions: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+ - template: sign-artifacts/jobs/v2.yml@xamarin-templates
- stage: tests
displayName: Tests
@@ -649,7 +658,7 @@ stages:
provProfileSecureFile: 'SkiaSharp iOS Provisioning.mobileprovision'
- task: InstallAppleProvisioningProfile@1
inputs:
- provProfileSecureFile: 'SkiaSharp Mac Provisioning.mobileprovision'
+ provProfileSecureFile: 'SkiaSharp Mac Provisioning.provisionprofile'
- task: InstallAppleProvisioningProfile@1
inputs:
provProfileSecureFile: 'SkiaSharp tvOS Provisioning.mobileprovision'