Skip to content

Commit

Permalink
Use v2 Signing (#1568)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattleibow authored Dec 27, 2020
1 parent 124a665 commit e8869d1
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 7 deletions.
23 changes: 23 additions & 0 deletions SignList.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup>
<!-- managed -->
<FirstParty Include="SkiaSharp*.dll" />
<FirstParty Include="HarfBuzzSharp*.dll" />
<!-- native -->
<FirstParty Include="libSkiaSharp.dll" />
<FirstParty Include="libHarfBuzzSharp.dll" />
<!-- ANGLE -->
<FirstParty Include="libEGL.dll" />
<FirstParty Include="libGLESv2.dll" />
</ItemGroup>

<ItemGroup>
<!-- <ThirdParty Include="Newtonsoft.Json.dll" /> -->
</ItemGroup>

<ItemGroup>
<!-- <Skip Include="System.*.dll" /> -->
</ItemGroup>

</Project>
8 changes: 5 additions & 3 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, string> {
{ "_NativeAssets", "native" },
{ "_NuGets", "nugets" },
Expand All @@ -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");
Expand Down
1 change: 1 addition & 0 deletions cake/msbuild.cake
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
17 changes: 13 additions & 4 deletions scripts/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ resources:
type: github
name: xamarin/yaml-templates
endpoint: xamarin
ref: refs/heads/main

stages:
- stage: prepare
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit e8869d1

Please sign in to comment.