From 9fff5e5a9613d5f1d2834345bdb26b1ce38a7999 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 24 Oct 2024 09:58:47 -0500
Subject: [PATCH 1/4] initial universal binary target

---
 .../dotnet-core-uninstall.csproj                 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
index fd483523..5e589309 100644
--- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
+++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
@@ -36,4 +36,20 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Target Name="PublishMacOSUniversalBinary">
+    <ItemGroup>
+      <_Rids Include="osx-x64;osx-arm64" />
+      <_RidSpecificBuild Include="$(MSBuildThisFile)" AdditionalProperties="RuntimeIdentifier=%(_Rids.Identity);PublishSingleFile=true;Configuration=Release" />
+    </ItemGroup>
+
+    <MSBuild Projects="@(_RidSpecificBuild)" BuildInParallel="true" Targets="Publish">
+     <Output TaskParameter="TargetOutputs" ItemName="_RidSpecificSingleFile" />
+    </MSBuild>
+    <PropertyGroup>
+      <_LipoOuputPath>$(PublishDir)/osx-universal/$(AssemblyName)</_LipoOuputPath>
+    </PropertyGroup>
+
+    <Exec Command="lipo @(_RidSpecificSingleFile, ' ') -create -output $(_LipoOuputPath)" />
+  </Target>
+
 </Project>

From 03d280ff70d7fa747fb0941f0726b310f80ef20a Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 24 Oct 2024 11:04:34 -0500
Subject: [PATCH 2/4] Make it somewhat usable/testable on non-macOS devices

---
 src/dotnet-core-uninstall/dotnet-core-uninstall.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
index 5e589309..641d9bd3 100644
--- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
+++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
@@ -42,14 +42,14 @@
       <_RidSpecificBuild Include="$(MSBuildThisFile)" AdditionalProperties="RuntimeIdentifier=%(_Rids.Identity);PublishSingleFile=true;Configuration=Release" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_RidSpecificBuild)" BuildInParallel="true" Targets="Publish">
+    <MSBuild Projects="@(_RidSpecificBuild)" BuildInParallel="true" Targets="Publish;PublishItemsOutputGroup">
      <Output TaskParameter="TargetOutputs" ItemName="_RidSpecificSingleFile" />
     </MSBuild>
     <PropertyGroup>
-      <_LipoOuputPath>$(PublishDir)/osx-universal/$(AssemblyName)</_LipoOuputPath>
+      <_LipoOuputPath>$(PublishDir)\osx-universal\$(AssemblyName)</_LipoOuputPath>
     </PropertyGroup>
 
-    <Exec Command="lipo @(_RidSpecificSingleFile, ' ') -create -output $(_LipoOuputPath)" />
+    <Exec Command="lipo @(_RidSpecificSingleFile, ' ') -create -output $(_LipoOuputPath)" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
   </Target>
 
 </Project>

From 977e18fb65e2898fdbd34eead0377dd7c385c054 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Tue, 29 Oct 2024 12:24:45 -0500
Subject: [PATCH 3/4] Fix some typos and ensure output directory exists

---
 src/dotnet-core-uninstall/dotnet-core-uninstall.csproj | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
index 641d9bd3..c14b5af6 100644
--- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
+++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
@@ -46,10 +46,13 @@
      <Output TaskParameter="TargetOutputs" ItemName="_RidSpecificSingleFile" />
     </MSBuild>
     <PropertyGroup>
-      <_LipoOuputPath>$(PublishDir)\osx-universal\$(AssemblyName)</_LipoOuputPath>
+      <_LipoOutputDir>$(PublishDir)\osx-universal\</_LipoOutputDir>
+      <_LipoOutputPath>$(_LipoOutputDir)$(AssemblyName)</_LipoOutputPath>
     </PropertyGroup>
 
-    <Exec Command="lipo @(_RidSpecificSingleFile, ' ') -create -output $(_LipoOuputPath)" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
+    <MakeDir Directories="$(_LipoOutputDir)" />
+
+    <Exec Command="lipo @(_RidSpecificSingleFile, ' ') -create -output $(_LipoOutputPath)" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
   </Target>
 
 </Project>

From e0ea109ca6e1d876305359a7e45954dd42163cbc Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Tue, 29 Oct 2024 12:36:51 -0500
Subject: [PATCH 4/4] Build self contained osx apps

---
 src/dotnet-core-uninstall/dotnet-core-uninstall.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
index c14b5af6..910f75c8 100644
--- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
+++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
@@ -39,7 +39,7 @@
   <Target Name="PublishMacOSUniversalBinary">
     <ItemGroup>
       <_Rids Include="osx-x64;osx-arm64" />
-      <_RidSpecificBuild Include="$(MSBuildThisFile)" AdditionalProperties="RuntimeIdentifier=%(_Rids.Identity);PublishSingleFile=true;Configuration=Release" />
+      <_RidSpecificBuild Include="$(MSBuildThisFile)" AdditionalProperties="RuntimeIdentifier=%(_Rids.Identity);PublishSingleFile=true;Configuration=Release;PublishSelfContained=true;" />
     </ItemGroup>
 
     <MSBuild Projects="@(_RidSpecificBuild)" BuildInParallel="true" Targets="Publish;PublishItemsOutputGroup">