From 25522dc95fed79c81ef1271c9a98d6db23054324 Mon Sep 17 00:00:00 2001
From: Caelan Sayler <git@caesay.com>
Date: Sat, 11 Dec 2021 14:02:07 +0000
Subject: [PATCH] Move publish settings out of csproj and into build script

---
 build.ps1                          | 4 ++--
 src/SquirrelCli/SquirrelCli.csproj | 7 ++-----
 src/Update/Update.csproj           | 6 +-----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 9f47e073..7dfc8352 100644
--- a/build.ps1
+++ b/build.ps1
@@ -19,8 +19,8 @@ foreach ($Folder in $Folders) {
 &"$MSBuildPath" /verbosity:minimal /restore /p:Configuration=Release
 
 # Build single-exe packaged projects
-dotnet publish -v minimal -c Release "$PSScriptRoot\src\Update\Update.csproj" -o "$Out"
-dotnet publish -v minimal -c Release "$PSScriptRoot\src\SquirrelCli\SquirrelCli.csproj" -o "$Out"
+dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScriptRoot\src\Update\Update.csproj" -o "$Out"
+dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScriptRoot\src\SquirrelCli\SquirrelCli.csproj" -o "$Out"
 
 # Copy over all files we need
 # Move-Item "$Out\Update.exe" -Destination "$Out\Squirrel.exe"
diff --git a/src/SquirrelCli/SquirrelCli.csproj b/src/SquirrelCli/SquirrelCli.csproj
index dd585682..c3abe1f0 100644
--- a/src/SquirrelCli/SquirrelCli.csproj
+++ b/src/SquirrelCli/SquirrelCli.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -10,12 +10,9 @@
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
-    
-    <!-- Publish -->
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PublishSingleFile>true</PublishSingleFile>
-    <SelfContained>true</SelfContained>
     <PublishTrimmed>true</PublishTrimmed>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <CompressionInSingleFile>true</CompressionInSingleFile>
   </PropertyGroup>
 
diff --git a/src/Update/Update.csproj b/src/Update/Update.csproj
index 9df4a296..5bef19c6 100644
--- a/src/Update/Update.csproj
+++ b/src/Update/Update.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -11,12 +11,8 @@
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
-
-    <!-- Publish -->
     <PublishSingleFile>true</PublishSingleFile>
-    <SelfContained>true</SelfContained>
     <PublishTrimmed>true</PublishTrimmed>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
   </PropertyGroup>