From ab109e8920f141f9c68b58bdf5142189c84fbcae Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 28 Mar 2025 09:03:16 -0700
Subject: [PATCH 1/2] Fix condition for if installers are shipping

---
 eng/Signing.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Signing.props b/eng/Signing.props
index 9b981c9c8abc..fe6510a44615 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -97,8 +97,8 @@
 
     <Artifact Include="@(_InstallersToPublish)" Kind="Blob">
       <!-- Working around msbuild not being able to negate the result of Contains() outside of targets -->
-      <IsShipping Condition="$([System.String]::Copy('%(Filename)').ToLowerInvariant().Contains('internal')) == 'True'">false</IsShipping>
-      <IsShipping Condition="$([System.String]::Copy('%(Filename)').ToLowerInvariant().Contains('internal')) != 'True'">true</IsShipping>
+      <IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping')) != 'true'">false</IsShipping>
+      <IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping')) == 'true'">true</IsShipping>
     </Artifact>
   </ItemGroup>
 

From 7dde040ec9b3893ce68cf4fae8236582d3afe6d3 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 28 Mar 2025 09:09:26 -0700
Subject: [PATCH 2/2] Update Signing.props

---
 eng/Signing.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Signing.props b/eng/Signing.props
index fe6510a44615..58221e0fcd3b 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -96,9 +96,9 @@
     </_InstallersToPublish>
 
     <Artifact Include="@(_InstallersToPublish)" Kind="Blob">
-      <!-- Working around msbuild not being able to negate the result of Contains() outside of targets -->
-      <IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping')) != 'true'">false</IsShipping>
-      <IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping')) == 'true'">true</IsShipping>
+      <IsShipping>true</IsShipping>
+      <IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('NonShipping'))">false</IsShipping>
+      <IsShipping Condition="$([System.String]::Copy('%(Filename)').ToLowerInvariant().Contains('wixpack.zip'))">false</IsShipping>
     </Artifact>
   </ItemGroup>