Minor formatting cleanup.

This commit is contained in:
Michael Yanni 2024-01-23 14:47:28 -08:00
parent 7309797e0a
commit 046c1599b7
3 changed files with 12 additions and 16 deletions

View file

@ -1,12 +1,10 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_SuppressSdkImports>false</_SuppressSdkImports> <_SuppressSdkImports>false</_SuppressSdkImports>
</PropertyGroup> </PropertyGroup>
<Target Name="PopulateGenerateChecksumItems" <Target Name="PopulateGenerateChecksumItems" AfterTargets="Build" BeforeTargets="GenerateChecksums">
AfterTargets="Build"
BeforeTargets="GenerateChecksums" >
<ItemGroup> <ItemGroup>
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.msi" /> <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.msi" />
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.exe" /> <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.exe" />
@ -14,11 +12,12 @@
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.tar.gz" /> <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.tar.gz" />
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.deb" /> <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.deb" />
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.rpm" /> <InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.rpm" />
<GenerateChecksumItems Include="%(InstallerFiles.Identity)" > <GenerateChecksumItems Include="%(InstallerFiles.Identity)">
<DestinationPath>%(FullPath).sha512</DestinationPath> <DestinationPath>%(FullPath).sha512</DestinationPath>
</GenerateChecksumItems> </GenerateChecksumItems>
</ItemGroup> </ItemGroup>
</Target> </Target>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" /> <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
</Project> </Project>

View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. --> <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<PublishingVersion>3</PublishingVersion> <PublishingVersion>3</PublishingVersion>
</PropertyGroup> </PropertyGroup>
@ -90,18 +91,15 @@
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productCommit-*.txt.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false'" /> <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productCommit-*.txt.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false'" />
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productVersion.txt.sha512" Condition=" '$(OS)' != 'Windows_NT' or '$(Architecture)' != 'x64'" /> <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productVersion.txt.sha512" Condition=" '$(OS)' != 'Windows_NT' or '$(Architecture)' != 'x64'" />
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt.sha512" Condition=" '$(OS)' != 'Windows_NT' or '$(Architecture)' != 'x64'" /> <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt.sha512" Condition=" '$(OS)' != 'Windows_NT' or '$(Architecture)' != 'x64'" />
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.zip.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' "/> <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.zip.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' " />
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.tar.gz.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' "/> <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.tar.gz.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' " />
</ItemGroup> </ItemGroup>
<Target Name="PublishSdkAssetsAndChecksums" <Target Name="PublishSdkAssetsAndChecksums"
BeforeTargets="Publish" BeforeTargets="Publish"
Condition="$(DotNetPublishUsingPipelines)"> Condition="$(DotNetPublishUsingPipelines)">
<ReadLinesFromFile File="$(ArtifactsTmpDir)FullNugetVersion.version"> <ReadLinesFromFile File="$(ArtifactsTmpDir)FullNugetVersion.version">
<Output <Output TaskParameter="Lines" PropertyName="FullNugetVersion" />
TaskParameter="Lines"
PropertyName="FullNugetVersion"/>
</ReadLinesFromFile> </ReadLinesFromFile>
<ItemGroup> <ItemGroup>
@ -155,4 +153,5 @@
IsStableBuild="$(IsStableBuild)" IsStableBuild="$(IsStableBuild)"
PublishingVersion="3" /> PublishingVersion="3" />
</Target> </Target>
</Project> </Project>

View file

@ -5,6 +5,7 @@
custom publishing target. And should not be picked up by arcade's default publishing logic. --> custom publishing target. And should not be picked up by arcade's default publishing logic. -->
<ItemsToSignPostBuild Remove="*.wixpack.zip" /> <ItemsToSignPostBuild Remove="*.wixpack.zip" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(PostBuildSign)' != 'true'"> <ItemGroup Condition="'$(PostBuildSign)' != 'true'">
<ItemsToSign Remove="@(ItemsToSign)" /> <ItemsToSign Remove="@(ItemsToSign)" />
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.exe" /> <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.exe" />
@ -17,10 +18,7 @@
<ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">3PartySHA2</ExternalCertificateId> <ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">3PartySHA2</ExternalCertificateId>
<InternalCertificateId Condition="'$(InternalCertificateId)' == ''">MicrosoftDotNet500</InternalCertificateId> <InternalCertificateId Condition="'$(InternalCertificateId)' == ''">MicrosoftDotNet500</InternalCertificateId>
<!-- <!-- Signing of shipping artifacts (layout, msi, bundle) are handled separately. It is therefore expected that <ItemsToSign> could be an empty set. -->
Signing of shipping artifacts (layout, msi, bundle) are handled separately.
It is therefore expected that <ItemsToSign> could be an empty set.
-->
<AllowEmptySignList>true</AllowEmptySignList> <AllowEmptySignList>true</AllowEmptySignList>
<AllowEmptySignPostBuildList>true</AllowEmptySignPostBuildList> <AllowEmptySignPostBuildList>true</AllowEmptySignPostBuildList>