Skip to content

Fix arcade signing #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edvilme merged 2 commits into from
Feb 11, 2025
Merged

Fix arcade signing #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c89301
This pull request includes baselines **with an expiration date of 180…
Feb 7, 2025
85f5414
Remove unused signing target
edvilme Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .config/1espt/PipelineAutobaseliningConfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.

pipelines:
525:
retail:
source:
credscan:
lastModifiedDate: 2024-04-05
eslint:
lastModifiedDate: 2024-04-05
psscriptanalyzer:
lastModifiedDate: 2024-04-05
armory:
lastModifiedDate: 2024-04-05
policheck:
lastModifiedDate: 2024-09-17
binary:
credscan:
lastModifiedDate: 2024-04-05
binskim:
lastModifiedDate: 2025-01-25
spotbugs:
lastModifiedDate: 2024-04-05
155 changes: 155 additions & 0 deletions .config/guardian/.gdnbaselines
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
{
"properties": {
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
},
"version": "1.0.0",
"baselines": {
"default": {
"name": "default",
"createdDate": "2024-04-05 17:53:53Z",
"lastUpdatedDate": "2024-04-05 17:53:53Z"
}
},
"results": {
"789cf67c8d4cd2fdd206bfba5058f673deec8f09557f1ecbcb9753e02a6f81ab": {
"signature": "789cf67c8d4cd2fdd206bfba5058f673deec8f09557f1ecbcb9753e02a6f81ab",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/nuget.config",
"line": 9,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0060",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"d53e0926c71c90172942edd165284e747846e11a2bee3ca8fd8f32575b224593": {
"signature": "d53e0926c71c90172942edd165284e747846e11a2bee3ca8fd8f32575b224593",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dlabnugetcert.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"e170f3a23081e920943abc701a4e54324b4eff5e17ed7a51646395dbe94f59c1": {
"signature": "e170f3a23081e920943abc701a4e54324b4eff5e17ed7a51646395dbe94f59c1",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dynamicsha1.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"c511df2a1a3a5294c36c9805c10256d91671f8d33ac076318fc469e6e5775e5d": {
"signature": "c511df2a1a3a5294c36c9805c10256d91671f8d33ac076318fc469e6e5775e5d",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dynamicsha2.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"9df8e8b00de1638f97776824f2713a352462001308d07c0bd764f6f4dde90c14": {
"signature": "9df8e8b00de1638f97776824f2713a352462001308d07c0bd764f6f4dde90c14",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/testdlab.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"5120fcb93cf4277f3cbae37ae1a6d800d31c413c726e6e0269240184039a941e": {
"signature": "5120fcb93cf4277f3cbae37ae1a6d800d31c413c726e6e0269240184039a941e",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/testdlabsha2.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"cebbc96c2a6f1edc3afcb167aa55fd6a9f89b62af067057d9582ea217dd2a75a": {
"signature": "cebbc96c2a6f1edc3afcb167aa55fd6a9f89b62af067057d9582ea217dd2a75a",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/vsmsappx.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"f4ffffdcce609b0409d6c3fec1d0eaadbb63f6088303ababf340993b84ebe2b4": {
"signature": "f4ffffdcce609b0409d6c3fec1d0eaadbb63f6088303ababf340993b84ebe2b4",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/WinBlue.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"3441729f19f1d38832fe6e5cc5823f19db219c0e15349fe4f74f1f54d0d22bde": {
"signature": "3441729f19f1d38832fe6e5cc5823f19db219c0e15349fe4f74f1f54d0d22bde",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/WP223.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
},
"f6b2f8d6491d6f464bf00e2dbc9129558473ed1f541a017eda0f926e2e2f10d1": {
"signature": "f6b2f8d6491d6f464bf00e2dbc9129558473ed1f541a017eda0f926e2e2f10d1",
"alternativeSignatures": [],
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/MobileTools/7Sign/tcb.pfx",
"line": 1,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-04-05 17:53:53Z",
"expirationDate": "2024-09-22 17:57:29Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
}
}
}
19 changes: 13 additions & 6 deletions eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
<Project>
<PropertyGroup>
<!--
Signing of shipping artifacts (layout, msi, bundle) are handled separately.
It is therefore expected that above removal can yield an empty set.
-->
<AllowEmptySignList>true</AllowEmptySignList>
<UseDotNetCertificate>true</UseDotNetCertificate>
</PropertyGroup>

<ItemGroup>
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
</ItemGroup>

<ItemGroup Condition="'$(RID)' == 'win-x86'">
<ItemsToSign Include="$(ArtifactsDir)layout\**\dotnet-core-uninstall.dll;
$(ArtifactsDir)layout\**\dotnet-core-uninstall.resources.dll;
$(ArtifactsDir)layout\**\dotnet-core-uninstall.exe;
$(ArtifactsDir)packages\**\dotnet-core-uninstall*.msi" />
</ItemGroup>

<ItemGroup Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'">
<ItemsToSign Include="$(ArtifactsBinDir)/layout/dotnet-core-uninstall/dotnet-core-uninstall" />
<ItemsToSign Include="$(ArtifactsDir)layout/dotnet-core-uninstall/dotnet-core-uninstall" />
</ItemGroup>
</Project>
9 changes: 3 additions & 6 deletions src/redist/redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@
<ItemGroup>
<ProjectReference Include="..\dotnet-core-uninstall\dotnet-core-uninstall.csproj" />
</ItemGroup>

<Import Condition="'$(RID)' == 'win-x86'" Project="targets\Versions.targets" />
<Import Condition="'$(RID)' == 'win-x86'" Project="targets\BuildCoreSdkTasks.targets" />
<Import Condition="'$(RID)' == 'win-x86'" Project="targets\GetRuntimeInformation.targets" />
<Import Project="targets\GenerateLayout.targets" />
<Import Condition="'$(RID)' == 'win-x86'" Project="targets\FileExtensions.targets" />
<Import Condition="'$(RID)' == 'win-x86'" Project="targets\GenerateMSIs.targets" />
<Import Condition="'$(RID)' == 'win-x86'" Project="targets\Signing.targets" />

@edvilme edvilme Feb 11, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Signing.targets no longer needed as handled by Arcade now


<Target Condition="'$(RID)' == 'win-x86'" Name="GenerateMSIs" AfterTargets="Build" DependsOnTargets="GenerateLayout;GenerateDotnetCoreUninstallMsi;SignDotnetCoreUninstallMsi">
</Target>
<Target Condition="'$(RID)' == 'win-x86'" Name="GenerateMSIs" AfterTargets="Build" DependsOnTargets="GenerateLayout;GenerateDotnetCoreUninstallMsi" />

</Project>
</Project>
1 change: 0 additions & 1 deletion src/redist/targets/GenerateLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<_PublishSingleFileForRid>true</_PublishSingleFileForRid>
<_PublishSingleFileForRid Condition="'$(RID)' == 'win-x86'">false</_PublishSingleFileForRid>
<_GenerateLayoutDependsOnTargets>CleanLayoutPath;PublishDotnetCoreUninstallProject</_GenerateLayoutDependsOnTargets>
<_GenerateLayoutDependsOnTargets Condition="'$(RID)' == 'win-x86'">CleanLayoutPath;PublishDotnetCoreUninstallProject;SignLayout</_GenerateLayoutDependsOnTargets>

@edvilme edvilme Feb 11, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SignLayout is also handled by Arcade now

@Forgind Forgind Feb 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we lose the condition?

@edvilme edvilme Feb 11, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because it is identical to the previous line, but adds the SignLayout target (which is now unused)

@Forgind Forgind Feb 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point


</PropertyGroup>

Expand Down
121 changes: 0 additions & 121 deletions src/redist/targets/Signing.targets
View file
Open in desktop

This file was deleted.