Remove a bunch of releasify code from Update.exe

clowd · Nov 4, 2021 · 2a21a0e · 2a21a0e
1 parent f091d51
commit 2a21a0e
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 578 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -37,7 +37,7 @@ Copy-Item "$In\Win32\WriteZipToSetup.exe" -Destination "$Out"
 Copy-Item "$In\Win32\WriteZipToSetup.pdb" -Destination "$Out"
 
 Copy-Item -Path "$PSScriptRoot\vendor\7zip\*" -Destination "$Out" -Recurse
-Copy-Item -Path "$PSScriptRoot\vendor\wix\*" -Destination "$Out" -Recurse
+# Copy-Item -Path "$PSScriptRoot\vendor\wix\*" -Destination "$Out" -Recurse
 Copy-Item "$PSScriptRoot\vendor\NuGet.exe" -Destination "$Out"
 Copy-Item "$PSScriptRoot\vendor\rcedit.exe" -Destination "$Out"
 Copy-Item "$PSScriptRoot\vendor\signtool.exe" -Destination "$Out"

diff --git a/src/SquirrelCli/squirrel.ico → squirrel.ico b/src/SquirrelCli/squirrel.ico → squirrel.ico
diff --git a/src/Squirrel/Squirrel.csproj b/src/Squirrel/Squirrel.csproj
@@ -7,8 +7,7 @@
     <Description>Squirrel</Description>
     <Title>Squirrel</Title>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>9</LangVersion>
-    <AssemblyName>Squirrel.Lib</AssemblyName>
+    <AssemblyName>SquirrelLib</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/SquirrelCli/SquirrelCli.csproj b/src/SquirrelCli/SquirrelCli.csproj
@@ -1,22 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
+        <OutputType>Exe</OutputType>
+        <LangVersion>9</LangVersion>
+        <AssemblyName>Squirrel</AssemblyName>
+        <ApplicationIcon>..\..\squirrel.ico</ApplicationIcon>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+
+        <!-- Publish -->
         <PublishSingleFile>true</PublishSingleFile>
         <SelfContained>true</SelfContained>
         <PublishTrimmed>true</PublishTrimmed>
-        <CompressionInSingleFile>true</CompressionInSingleFile>
         <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-        <ApplicationIcon>squirrel.ico</ApplicationIcon>
-        <AssemblyName>Squirrel</AssemblyName>
-        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+        <CompressionInSingleFile>true</CompressionInSingleFile>
     </PropertyGroup>
 
-    <ItemGroup>
-      <Content Include="squirrel.ico" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Octokit" Version="0.50.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

diff --git a/src/Squirrel/Lib/ValidatedOptionSet.cs → src/SquirrelCli/ValidatedOptionSet.cs b/src/Squirrel/Lib/ValidatedOptionSet.cs → src/SquirrelCli/ValidatedOptionSet.cs
diff --git a/src/SquirrelCli/app.manifest b/src/SquirrelCli/app.manifest
diff --git a/src/Update/CopStache.cs b/src/Update/CopStache.cs