Skip to content

Commit 0b6cae8

Browse files
committed
Cleanup ESRP sign properties.
1 parent c6323b6 commit 0b6cae8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

build/sign.proj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="All" InitialTargets="CheckSigningToolsPath" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0" DefaultTargets="All" InitialTargets="CheckSigningPaths" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Root>$(MSBuildThisFileDirectory)..\</Root>
55
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
66
<Artifacts>$(Root)artifacts\</Artifacts>
77
<OutputDir>$(Artifacts)$(Configuration)\</OutputDir>
8-
<!-- CISignRepo is an environment variable that points to ci-signing repo clone -->
9-
<CISignRepoPath>$(CISignRepo)</CISignRepoPath>
10-
<PowerShellCommand Condition=" '$(PowerShellCommand)' == '' ">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
11-
<PowerShellCommandPrefix>&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command</PowerShellCommandPrefix>
8+
<PowerShell>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShell>
129
</PropertyGroup>
1310

14-
<Target Name="CheckSigningToolsPath">
11+
<Target Name="CheckSigningPaths">
12+
<Error Text="SigningToolsPath is not assigned a file path!" Condition="'$(SigningToolsPath)' == ''" />
13+
<Error Text="The SigningToolsPath directory does not exist!" Condition="!Exists($(SigningToolsPath))" />
1514
<Error Text="CISignRepoPath is not assigned a file path!" Condition="'$(CISignRepoPath)' == ''" />
1615
<Error Text="The CISignRepoPath directory does not exist!" Condition="!Exists($(CISignRepoPath))" />
1716
</Target>
@@ -41,9 +40,10 @@
4140
CopyBackSignedFilesToOriginalLocation="true"
4241
UnsignedFileList="@(UnsignedFiles)"
4342
SignLogDirPath="$(OutputDir)Signing.log" />
44-
<Exec Command="$(PowerShellCommandPrefix) &quot;Get-ChildItem -Path $(OutputDir) -Recurse -Include 'Signed','Unsigned' | Remove-Item -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;"
45-
ContinueOnError="WarnAndContinue"
46-
IgnoreExitCode="true" />
43+
<PropertyGroup>
44+
<RemoveSignedUnsignedFolders>Get-ChildItem -Path $(OutputDir) -Recurse -Include 'Signed','Unsigned' | Remove-Item -Recurse -Force -Confirm:$false -ErrorAction Ignore</RemoveSignedUnsignedFolders>
45+
</PropertyGroup>
46+
<Exec Command="$(PowerShell) -NonInteractive -NoLogo -NoProfile -Command &quot;$(RemoveSignedUnsignedFolders)&quot;" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
4747
</Target>
4848

4949
<Target Name="BeforeAll">

0 commit comments

Comments
 (0)