From d94e51da9fb5585b7f5e9f34adbc39230f7262d8 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Tue, 2 Apr 2024 15:46:55 -0700
Subject: [PATCH] Addressing PR feedback. Trying the signing for
 Valleysoft.DockerCredsProvider.dll again.

---
 Directory.Build.props | 2 +-
 eng/Build.props       | 2 +-
 eng/Signing.props     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f9a4a51f6..f185d7241 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -17,7 +17,7 @@
       However, if you wanted to build the finalizer project directly, the Architecture will use the logic above to be set properly, and thus maintain the correct OutputPath.
       Note: The redist project does use Architecture. The Arcade SDK does not use either BuildArchitecture or Architecture.
     -->
-    <Platform Condition="$(SetPlatformFromArchitecture) == 'true' And ('$(Platform)' == '' Or $(Platform) == 'AnyCPU')">$(Architecture)</Platform>
+    <Platform Condition="'$(SetPlatformFromArchitecture)' == 'true' And ('$(Platform)' == '' Or '$(Platform)' == 'AnyCPU')">$(Architecture)</Platform>
   </PropertyGroup>
 
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
diff --git a/eng/Build.props b/eng/Build.props
index 1c9068cc8..4f6005ef0 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -12,7 +12,7 @@
         <!-- Regular build -->
         <ItemGroup>
           <ProjectToBuild Include="$(RepoRoot)Microsoft.DotNet.Cli.sln" />
-          <ProjectToBuild Condition="'$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x86' Or '$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64' Or '$(Architecture)' == 'arm')"
+          <ProjectToBuild Condition="'$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x86' Or '$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64')"
                           Include="$(RepoRoot)src\finalizer\finalizer-build.csproj" />
         </ItemGroup>
       </Otherwise>
diff --git a/eng/Signing.props b/eng/Signing.props
index 4167da39b..b51afc0aa 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -31,12 +31,12 @@
     <FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="StreamJsonRpc.dll" CertificateName="$(ExternalCertificateId)" />
+    <FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
 
     <!-- Files in the layout that should not be signed -->
     <FileSignInfo Include="apphost.exe" CertificateName="None" />
     <FileSignInfo Include="comhost.dll" CertificateName="None" />
     <FileSignInfo Include="singlefilehost.exe" CertificateName="None" />
-    <FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="None" />
 
     <!-- These are 3rd party nupkgs and should not be signed with an MS cert -->
     <FileSignInfo Include="nunit3.dotnetnew.template.$(NUnit3Templates21PackageVersion).nupkg" CertificateName="None" />