mirror of
https://github.com/velopack/velopack.git
synced 2025-10-25 15:19:22 +00:00
Only build dotnet projects once instead of twice
This commit is contained in:
Caelan Sayler
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
||||
shell: pwsh
|
||||
run: .\build.ps1
|
||||
- name: Test
|
||||
run: dotnet test test\Squirrel.Tests.csproj -l "console;verbosity=detailed"
|
||||
run: dotnet test --no-build test\Squirrel.Tests.csproj -l "console;verbosity=detailed"
|
||||
- name: Upload Artifacts
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
@@ -51,9 +51,10 @@ jobs:
|
||||
- name: Extract Artifacts
|
||||
run: |
|
||||
ls -la .
|
||||
ls -la ./squirrel
|
||||
unzip Clowd.Squirrel*.nupkg -d ./squirrel/
|
||||
unzip csq*.nupkg -d ./csq/
|
||||
ls -la ./squirrel
|
||||
ls -la ./csq
|
||||
- name: Install Apple Certificate
|
||||
env:
|
||||
BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_BUILD_CERTIFICATE_BASE64 }}
|
||||
|
||||
@@ -12,7 +12,6 @@ EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionLevel", "SolutionLevel", "{ED657D2C-F8A0-4012-A64F-7367D41BE4D2}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
.editorconfig = .editorconfig
|
||||
src\Clowd.Squirrel.nuspec = src\Clowd.Squirrel.nuspec
|
||||
src\Directory.Build.props = src\Directory.Build.props
|
||||
vendor\wix\template.wxs = vendor\wix\template.wxs
|
||||
version.json = version.json
|
||||
|
||||
@@ -41,15 +41,15 @@ Remove-Item *.nupkg
|
||||
|
||||
Write-Host "Publishing SingleFile Projects" -ForegroundColor Magenta
|
||||
$ToolsDir = "csq\tools\net6.0\any"
|
||||
dotnet publish -v minimal -c Release -r win-x86 --self-contained "$PSScriptRoot\src\Update.Windows\Update.Windows.csproj" -o "$ToolsDir"
|
||||
dotnet publish -v minimal -c Release -r osx.10.12-x64 --self-contained "$PSScriptRoot\src\Update.OSX\Update.OSX.csproj" -o "$ToolsDir"
|
||||
dotnet publish -v minimal --no-build -c Release --self-contained "$PSScriptRoot\src\Update.Windows\Update.Windows.csproj" -o "$ToolsDir"
|
||||
dotnet publish -v minimal --no-build -c Release --self-contained "$PSScriptRoot\src\Update.OSX\Update.OSX.csproj" -o "$ToolsDir"
|
||||
|
||||
Write-Host "Copying Tools" -ForegroundColor Magenta
|
||||
New-Item -Path "squirrel" -Name "tools" -ItemType "directory"
|
||||
Copy-Item -Path "$ToolsDir\*" -Destination "squirrel\tools" -Recurse
|
||||
|
||||
Write-Host "Re-assembling Packages" -ForegroundColor Magenta
|
||||
seven a "csq.$version.nupkg" -tzip "$PSScriptRoot\build\Release\csq\*"
|
||||
seven a "Clowd.Squirrel.$version.nupkg" -tzip "$PSScriptRoot\build\Release\squirrel\*"
|
||||
seven a "csq.$version.nupkg" -tzip -mx9 "$PSScriptRoot\build\Release\csq\*"
|
||||
seven a "Clowd.Squirrel.$version.nupkg" -tzip -mx9 "$PSScriptRoot\build\Release\squirrel\*"
|
||||
|
||||
Write-Host "Done." -ForegroundColor Magenta
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||
<metadata>
|
||||
<!-- should be set on the command line -->
|
||||
<version>0.0.0</version>
|
||||
|
||||
<id>Clowd.Squirrel</id>
|
||||
<title>Squirrel for Windows</title>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Quick and easy installer and automatic updates for desktop applications</description>
|
||||
<copyright>Copyright © Caelan Sayler 2021</copyright>
|
||||
<authors>Anaïs Betts, Caelan Sayler, GitHub, others</authors>
|
||||
<owners>Caelan Sayler</owners>
|
||||
<license type="expression">MIT</license>
|
||||
<projectUrl>https://github.com/clowd/Clowd.Squirrel</projectUrl>
|
||||
<repository type="git" url="https://github.com/clowd/Clowd.Squirrel.git" />
|
||||
<icon>images\Squirrel-Clowd-Logo.png</icon>
|
||||
<iconUrl>https://user-images.githubusercontent.com/1287295/131249078-9e131e51-0b66-4dc7-8c0a-99cbea6bcf80.png</iconUrl>
|
||||
|
||||
<dependencies>
|
||||
<group targetFramework=".NETFramework4.6.1">
|
||||
<dependency id="NuGet.Versioning" version="6.1.0" />
|
||||
<dependency id="SharpCompress" version="0.31.0" />
|
||||
<dependency id="System.ValueTuple" version="4.5.0" />
|
||||
</group>
|
||||
<group targetFramework="net5.0">
|
||||
<dependency id="NuGet.Versioning" version="6.1.0" />
|
||||
<dependency id="Microsoft.Win32.Registry" version="5.0.0" />
|
||||
<dependency id="SharpCompress" version="0.31.0" />
|
||||
</group>
|
||||
<group targetFramework="net6.0">
|
||||
<dependency id="NuGet.Versioning" version="6.1.0" />
|
||||
<dependency id="SharpCompress" version="0.31.0" />
|
||||
</group>
|
||||
<group targetFramework=".NETStandard2.0">
|
||||
<dependency id="NuGet.Versioning" version="6.1.0" />
|
||||
<dependency id="Microsoft.Win32.Registry" version="5.0.0" />
|
||||
<dependency id="SharpCompress" version="0.31.0" />
|
||||
</group>
|
||||
</dependencies>
|
||||
<frameworkAssemblies>
|
||||
<frameworkAssembly assemblyName="System.Net.Http" targetFramework=".NETFramework4.6.1" />
|
||||
<frameworkAssembly assemblyName="System.Web" targetFramework=".NETFramework4.6.1" />
|
||||
</frameworkAssemblies>
|
||||
|
||||
</metadata>
|
||||
<files>
|
||||
<!-- Include all target frameworks -->
|
||||
<file src="..\build\Release\net461\SquirrelLib.*" target="lib\net461" />
|
||||
<file src="..\build\Release\net5.0\SquirrelLib.*" target="lib\net5.0" />
|
||||
<file src="..\build\Release\net6.0\SquirrelLib.*" target="lib\net6.0" />
|
||||
<file src="..\build\Release\netstandard2.0\SquirrelLib.*" target="lib\netstandard2.0" />
|
||||
|
||||
<!-- Binary tools, icon, and build properties -->
|
||||
<file src="..\build\publish\**" target="tools" />
|
||||
<file src="..\docs\artwork\Squirrel-Clowd-Logo.png" target="images" />
|
||||
<file src="Clowd.Squirrel.props" target="build" />
|
||||
</files>
|
||||
</package>
|
||||
@@ -28,9 +28,7 @@ namespace Squirrel.Update
|
||||
var exeName = Path.GetFileName(SquirrelRuntimeInfo.EntryExePath);
|
||||
var opts = new OptionSet() {
|
||||
"",
|
||||
#pragma warning disable CS0436 // Type conflicts with imported type
|
||||
$"Squirrel Updater (OSX) ({ThisAssembly.AssemblyInformationalVersion}) installs updates for Squirrel applications",
|
||||
#pragma warning restore CS0436 // Type conflicts with imported type
|
||||
$"Squirrel Updater (OSX) ({SquirrelRuntimeInfo.SquirrelDisplayVersion}) installs updates for Squirrel applications",
|
||||
$"Usage: {exeName} command [OPTS]",
|
||||
"",
|
||||
"Commands:",
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<RootNamespace>Squirrel.Update</RootNamespace>
|
||||
<AssemblyName>UpdateMac</AssemblyName>
|
||||
<RuntimeIdentifier>osx.10.12-x64</RuntimeIdentifier>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<PublishTrimmed>true</PublishTrimmed>
|
||||
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
|
||||
|
||||
@@ -36,9 +36,7 @@ namespace Squirrel.Update
|
||||
var exeName = Path.GetFileName(SquirrelRuntimeInfo.EntryExePath);
|
||||
var opts = new OptionSet() {
|
||||
"",
|
||||
#pragma warning disable CS0436 // Type conflicts with imported type
|
||||
$"Squirrel Updater ({ThisAssembly.AssemblyInformationalVersion}) manages packages and installs updates for Squirrel applications",
|
||||
#pragma warning restore CS0436 // Type conflicts with imported type
|
||||
$"Squirrel Updater ({SquirrelRuntimeInfo.SquirrelDisplayVersion}) manages packages and installs updates for Squirrel applications",
|
||||
$"Usage: {exeName} command [OPTS]",
|
||||
"",
|
||||
"Commands:",
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
<OutputType>WinExe</OutputType>
|
||||
<RootNamespace>Squirrel.Update</RootNamespace>
|
||||
<AssemblyName>Update</AssemblyName>
|
||||
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<PublishTrimmed>true</PublishTrimmed>
|
||||
|
||||
Reference in New Issue
Block a user