From e75d9e13b7a088c65e7812605cf826c9495d222c 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               | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
index eeec6461..4e450168 100644
--- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
+++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>dotnet-core-uninstall</AssemblyName>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x86;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;osx-x64;osx-arm64</RuntimeIdentifiers>
     <SignAssembly>true</SignAssembly>
     <TargetFramework>net8.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
@@ -37,4 +37,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 a358b61e697ec95c1a07d7ed3d76111d2aba173d 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 4e450168..a819b65c 100644
--- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
+++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
@@ -43,14 +43,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 7e315c9bcb5ef8580a7c1289abffa1262d282116 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 a819b65c..4e31118e 100644
--- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
+++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
@@ -47,10 +47,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 9256923e7067d7c66b222466e08878b8a381a8c1 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 4e31118e..f439bbce 100644
--- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
+++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
@@ -40,7 +40,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">