Fix build scripts

clowd · Aug 12, 2021 · c824f2f · c824f2f
1 parent 544f955
commit c824f2f
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 145 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build.cmd b/build.cmd
@@ -0,0 +1 @@
+powershell -ExecutionPolicy Bypass -File ./build.ps1
diff --git a/build.ps1 b/build.ps1
@@ -0,0 +1,35 @@
+# Stop the script if an error occurs
+$ErrorActionPreference = "Stop"
+$In = ".\build\Release\"
+$Out = ".\build\publish\"
+$Folders = @("./build", "./packages", "./test/bin", "./test/obj")
+
+# Ensure a clean state by removing build/package folders
+foreach ($Folder in $Folders) {
+    if (Test-Path $Folder) {
+        Remove-Item -path $Folder -Recurse -Force
+    }
+}
+
+# Build Squirrel C++ and library files
+msbuild /restore /p:Configuration=Release
+
+# Build single-exe packaged projects
+dotnet publish -c Release src\Update\Update.csproj -o $Out
+dotnet publish -c Release src\SyncReleases\SyncReleases.csproj -o $Out
+
+# Copy over all files we need
+# Copy-Item "$In\net45\Update.exe" -Destination "$Out\Squirrel.exe"
+# Copy-Item "$In\net45\update.com" -Destination "$Out\Squirrel.com"
+# Copy-Item "$In\net45\Update.pdb" -Destination "$Out\Squirrel.pdb"
+Copy-Item "$In\Win32\Setup.exe" -Destination $Out
+Copy-Item "$In\Win32\Setup.pdb" -Destination $Out
+# Copy-Item "$In\net45\Update-Mono.exe" -Destination "$Out\Squirrel-Mono.exe"
+# Copy-Item "$In\net45\Update-Mono.pdb" -Destination "$Out\Squirrel-Mono.pdb"
+Copy-Item "$In\Win32\StubExecutable.exe" -Destination $Out
+# Copy-Item "$In\net45\SyncReleases.exe" -Destination $Out
+# Copy-Item "$In\net45\SyncReleases.pdb" -Destination $Out
+Copy-Item "$In\Win32\WriteZipToSetup.exe" -Destination $Out
+Copy-Item "$In\Win32\WriteZipToSetup.pdb" -Destination $Out
+
+Write-Output "Successfully copied files to './build/publish'"
diff --git a/package-electron-winstaller.ps1 b/package-electron-winstaller.ps1
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -10,7 +10,7 @@
     <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
 
     <LangVersion>9.0</LangVersion>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 
     <Company>GitHub</Company>

diff --git a/test/Squirrel.Tests.csproj b/test/Squirrel.Tests.csproj
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <Description>Squirrel.Tests</Description>
     <Title>Squirrel.Tests</Title>
     <IsPackable>false</IsPackable>
     <IsTest>true</IsTest>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\src\Squirrel\Squirrel.csproj" />
-    <ProjectReference Include="..\vendor\nuget\src\Core\Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="xunit" Version="2.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.0.0" PrivateAssets="All" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\src\Squirrel\Squirrel.csproj" />
+  </ItemGroup>
+
 </Project>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		powershell -ExecutionPolicy Bypass -File ./build.ps1