diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecba5cc8..9ae36546 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/build.ps1 b/build.ps1 index cd42ed7a..0ce25d84 100644 --- a/build.ps1 +++ b/build.ps1 @@ -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 diff --git a/src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj b/src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj index affda16f..332bd8d3 100644 --- a/src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj +++ b/src/Squirrel.CommandLine.OSX/Squirrel.CommandLine.OSX.csproj @@ -13,7 +13,7 @@ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./ true true - CA2007 + $(NoWarn);CA2007;NETSDK1179 diff --git a/src/Squirrel.CommandLine.Windows/Squirrel.CommandLine.Windows.csproj b/src/Squirrel.CommandLine.Windows/Squirrel.CommandLine.Windows.csproj index a58d67be..003a217d 100644 --- a/src/Squirrel.CommandLine.Windows/Squirrel.CommandLine.Windows.csproj +++ b/src/Squirrel.CommandLine.Windows/Squirrel.CommandLine.Windows.csproj @@ -17,7 +17,7 @@ true true true - CA2007 + $(NoWarn);CA2007;NETSDK1179 diff --git a/src/Squirrel.CommandLine/Squirrel.CommandLine.csproj b/src/Squirrel.CommandLine/Squirrel.CommandLine.csproj index 154f1df8..b37fdeb4 100644 --- a/src/Squirrel.CommandLine/Squirrel.CommandLine.csproj +++ b/src/Squirrel.CommandLine/Squirrel.CommandLine.csproj @@ -3,7 +3,7 @@ net6.0 true - CA2007 + $(NoWarn);CA2007 diff --git a/src/Update.OSX/Update.OSX.csproj b/src/Update.OSX/Update.OSX.csproj index 0ed1da33..45e5b9e8 100644 --- a/src/Update.OSX/Update.OSX.csproj +++ b/src/Update.OSX/Update.OSX.csproj @@ -13,6 +13,7 @@ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./ true true + $(NoWarn);CA2007;NETSDK1179 diff --git a/src/Update.Windows/Update.Windows.csproj b/src/Update.Windows/Update.Windows.csproj index bab85902..f72b2fbc 100644 --- a/src/Update.Windows/Update.Windows.csproj +++ b/src/Update.Windows/Update.Windows.csproj @@ -16,7 +16,7 @@ true true true - CA2007 + $(NoWarn);CA2007;NETSDK1179