Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert last commit and fix <NoWarn>

Browse Source
This commit is contained in:
Caelan Sayler
2022-05-14 11:26:49 +01:00
parent 1d1af9d8ce
commit 30628c83bb
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@@ -54,11 +54,11 @@ jobs:
dotnet-version: 6.0.*
- name: Build SquirrelMac
run: |
dotnet publish -v minimal --self-contained -c Release -r osx.10.12-x64 ./src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj -o ./publish -p:NoWarn=NETSDK1179
dotnet publish -v minimal --self-contained -c Release -r osx.10.12-x64 ./src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj -o ./publish
ls -la ./publish
- name: Build UpdateMac
run: |
dotnet publish -v minimal --self-contained -c Release -r osx.10.12-x64 ./src/Update.OSX/Update.OSX.csproj -o ./publish -p:NoWarn=NETSDK1179
dotnet publish -v minimal --self-contained -c Release -r osx.10.12-x64 ./src/Update.OSX/Update.OSX.csproj -o ./publish
ls -la ./publish
- name: Upload MacOS Artifacts
uses: actions/upload-artifact@v3

4
build.ps1
View File

@@ -26,8 +26,8 @@ foreach ($Folder in $Folders) {
# Build single-exe packaged projects
# New-Item -Path "$Out" -Name "win-x86" -ItemType "directory"
$BinOut = $Out
dotnet publish -v minimal -c Release -r win-x64 --self-contained=true "$PSScriptRoot\src\Squirrel.CommandLine.Windows\Squirrel.CommandLine.Windows.csproj" -o "$Out" -p:NoWarn=NETSDK1179
dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScriptRoot\src\Update.Windows\Update.Windows.csproj" -o "$BinOut" -p:NoWarn=NETSDK1179
dotnet publish -v minimal -c Release -r win-x64 --self-contained=true "$PSScriptRoot\src\Squirrel.CommandLine.Windows\Squirrel.CommandLine.Windows.csproj" -o "$Out"
dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScriptRoot\src\Update.Windows\Update.Windows.csproj" -o "$BinOut"
# Copy over all files we need
Copy-Item -Path "$PSScriptRoot\vendor\7zip\*" -Destination "$BinOut" -Recurse

2
src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj
View File

@@ -13,7 +13,7 @@
<PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap>
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
<NoWarn>CA2007</NoWarn>
<NoWarn>$(NoWarn);CA2007;NETSDK1179</NoWarn>
</PropertyGroup>
<ItemGroup>

2
src/Squirrel.CommandLine.Windows/Squirrel.CommandLine.Windows.csproj
View File

@@ -17,7 +17,7 @@
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
<NoWarn>CA2007</NoWarn>
<NoWarn>$(NoWarn);CA2007;NETSDK1179</NoWarn>
</PropertyGroup>
<ItemGroup>

2
src/Squirrel.CommandLine/Squirrel.CommandLine.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>CA2007</NoWarn>
<NoWarn>$(NoWarn);CA2007</NoWarn>
</PropertyGroup>
<ItemGroup>

1
src/Update.OSX/Update.OSX.csproj
View File

@@ -13,6 +13,7 @@
<PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap>
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
<NoWarn>$(NoWarn);CA2007;NETSDK1179</NoWarn>
</PropertyGroup>
<ItemGroup>

2
src/Update.Windows/Update.Windows.csproj
View File

@@ -16,7 +16,7 @@
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
<NoWarn>CA2007</NoWarn>
<NoWarn>$(NoWarn);CA2007;NETSDK1179</NoWarn>
</PropertyGroup>
<ItemGroup>