From f326a20019a6a8c119b2d20bcb0108edb25a7cf5 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 29 Dec 2022 21:06:14 -0800 Subject: [PATCH] Runtime identifiers, explicit .NET Framework 4.8 --- BurnOutSharp.ASN1/BurnOutSharp.ASN1.csproj | 3 +- .../BurnOutSharp.Builders.csproj | 3 +- .../BurnOutSharp.Compression.csproj | 3 +- .../BurnOutSharp.Matching.csproj | 3 +- .../BurnOutSharp.Models.csproj | 3 +- .../BurnOutSharp.Utilities.csproj | 3 +- .../BurnOutSharp.Wrappers.csproj | 3 +- BurnOutSharp/BurnOutSharp.csproj | 3 +- BurnOutSharp/FileType/MPQ.cs | 2 +- BurnOutSharp/FileType/MicrosoftCAB.cs | 2 +- LibMSPackSharp | 2 +- Test/Test.csproj | 1 + appveyor.yml | 38 +++++++++++++------ psxt001z/psxt001z.csproj | 3 +- 14 files changed, 48 insertions(+), 24 deletions(-) diff --git a/BurnOutSharp.ASN1/BurnOutSharp.ASN1.csproj b/BurnOutSharp.ASN1/BurnOutSharp.ASN1.csproj index 3d3cba88..3bae85a8 100644 --- a/BurnOutSharp.ASN1/BurnOutSharp.ASN1.csproj +++ b/BurnOutSharp.ASN1/BurnOutSharp.ASN1.csproj @@ -1,7 +1,8 @@  - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 BurnOutSharp.ASN1 BurnOutSharp.ASN1 Matt Nadareski diff --git a/BurnOutSharp.Builders/BurnOutSharp.Builders.csproj b/BurnOutSharp.Builders/BurnOutSharp.Builders.csproj index a7ec458a..661d864b 100644 --- a/BurnOutSharp.Builders/BurnOutSharp.Builders.csproj +++ b/BurnOutSharp.Builders/BurnOutSharp.Builders.csproj @@ -1,7 +1,8 @@  - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 BurnOutSharp.Builder BurnOutSharp.Builder Matt Nadareski diff --git a/BurnOutSharp.Compression/BurnOutSharp.Compression.csproj b/BurnOutSharp.Compression/BurnOutSharp.Compression.csproj index 2631a8ae..aecd9d28 100644 --- a/BurnOutSharp.Compression/BurnOutSharp.Compression.csproj +++ b/BurnOutSharp.Compression/BurnOutSharp.Compression.csproj @@ -1,7 +1,8 @@ - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 BurnOutSharp.Compression BurnOutSharp.Compression Matt Nadareski diff --git a/BurnOutSharp.Matching/BurnOutSharp.Matching.csproj b/BurnOutSharp.Matching/BurnOutSharp.Matching.csproj index ee0751aa..defaecaf 100644 --- a/BurnOutSharp.Matching/BurnOutSharp.Matching.csproj +++ b/BurnOutSharp.Matching/BurnOutSharp.Matching.csproj @@ -1,7 +1,8 @@  - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 BurnOutSharp.Matching BurnOutSharp.Matching Matt Nadareski diff --git a/BurnOutSharp.Models/BurnOutSharp.Models.csproj b/BurnOutSharp.Models/BurnOutSharp.Models.csproj index 270f9ec0..c1e1b4e3 100644 --- a/BurnOutSharp.Models/BurnOutSharp.Models.csproj +++ b/BurnOutSharp.Models/BurnOutSharp.Models.csproj @@ -1,7 +1,8 @@  - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 BurnOutSharp.Models BurnOutSharp.Models Matt Nadareski diff --git a/BurnOutSharp.Utilities/BurnOutSharp.Utilities.csproj b/BurnOutSharp.Utilities/BurnOutSharp.Utilities.csproj index 37a76b27..a9e9654d 100644 --- a/BurnOutSharp.Utilities/BurnOutSharp.Utilities.csproj +++ b/BurnOutSharp.Utilities/BurnOutSharp.Utilities.csproj @@ -1,7 +1,8 @@ - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 BurnOutSharp.Utilities BurnOutSharp.Utilities Matt Nadareski diff --git a/BurnOutSharp.Wrappers/BurnOutSharp.Wrappers.csproj b/BurnOutSharp.Wrappers/BurnOutSharp.Wrappers.csproj index 9799a1e2..8662ef18 100644 --- a/BurnOutSharp.Wrappers/BurnOutSharp.Wrappers.csproj +++ b/BurnOutSharp.Wrappers/BurnOutSharp.Wrappers.csproj @@ -1,7 +1,8 @@  - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 BurnOutSharp.Wrappers BurnOutSharp.Wrappers Matt Nadareski diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj index 2a6bd647..76be1748 100644 --- a/BurnOutSharp/BurnOutSharp.csproj +++ b/BurnOutSharp/BurnOutSharp.csproj @@ -1,7 +1,8 @@  - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 BurnOutSharp BurnOutSharp Port of BurnOut to C#, with additions diff --git a/BurnOutSharp/FileType/MPQ.cs b/BurnOutSharp/FileType/MPQ.cs index 0e059c20..5c805ba7 100644 --- a/BurnOutSharp/FileType/MPQ.cs +++ b/BurnOutSharp/FileType/MPQ.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.IO; using BurnOutSharp.Interfaces; -#if NETSTANDARD2_0 +#if NET48 using StormLibSharp; #endif using static BurnOutSharp.Utilities.Dictionary; diff --git a/BurnOutSharp/FileType/MicrosoftCAB.cs b/BurnOutSharp/FileType/MicrosoftCAB.cs index 1acc4bb2..86c98d0b 100644 --- a/BurnOutSharp/FileType/MicrosoftCAB.cs +++ b/BurnOutSharp/FileType/MicrosoftCAB.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.IO; using BurnOutSharp.Interfaces; -#if NETSTANDARD2_0 +#if NET48 using WixToolset.Dtf.Compression; using WixToolset.Dtf.Compression.Cab; #elif NET6_0_OR_GREATER diff --git a/LibMSPackSharp b/LibMSPackSharp index 373cfe89..c890c09e 160000 --- a/LibMSPackSharp +++ b/LibMSPackSharp @@ -1 +1 @@ -Subproject commit 373cfe895837657abd4b9298801144f636fa026a +Subproject commit c890c09efa538b1c2e1bf8b1a849c0249b72b6da diff --git a/Test/Test.csproj b/Test/Test.csproj index 21f8a8a2..6c00226b 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -2,6 +2,7 @@ net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 false Exe diff --git a/appveyor.yml b/appveyor.yml index 1599597b..13f0e520 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,15 +29,18 @@ before_build: - nuget restore # build step -build: - verbosity: minimal - project: BurnOutSharp.sln - -# post-build step -after_build: -- cd Test\bin\Debug -- 7z a BurnOutSharp_net48.zip net48\* -- 7z a BurnOutSharp_net6.0.zip net6.0\* +build_script: + - cmd: dotnet restore + # .NET Framework 4.8 + - cmd: dotnet build --framework net48 + # .NET 6.0, Windows x86 + - cmd: dotnet publish Test\Test.csproj --framework net6.0 --runtime win-x86 --self-contained true -p:PublishSingleFile=true + # .NET 6.0, Windows x64 + - cmd: dotnet publish Test\Test.csproj --framework net6.0 --runtime win-x64 --self-contained true -p:PublishSingleFile=true + # .NET 6.0, Linux x64 + - cmd: dotnet publish Test\Test.csproj --framework net6.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true + # .NET 6.0, OSX x64 + - cmd: dotnet publish Test\Test.csproj --framework net6.0 --runtime osx-x64 --self-contained true -p:PublishSingleFile=true # success/failure tracking on_success: @@ -49,7 +52,18 @@ on_failure: # artifact linking artifacts: -- path: Test\bin\Debug\BurnOutSharp_net48.zip +- path: Test\bin\Debug\net48 name: BurnOutSharp (.NET Framework 4.8) -- path: Test\bin\Debug\BurnOutSharp_net6.0.zip - name: BurnOutSharp (.NET 6.0) \ No newline at end of file + type: zip +- path: Test\bin\Debug\net6.0\win-x86\publish + name: BurnOutSharp (.NET 6.0, Windows x86) + type: zip +- path: Test\bin\Debug\net6.0\win-x64\publish + name: BurnOutSharp (.NET 6.0, Windows x64) + type: zip +- path: Test\bin\Debug\net6.0\linux-x64\publish + name: BurnOutSharp (.NET 6.0, Linux x64) + type: zip +- path: Test\bin\Debug\net6.0\osx-x64\publish + name: BurnOutSharp (.NET 6.0, OSX x64) + type: zip \ No newline at end of file diff --git a/psxt001z/psxt001z.csproj b/psxt001z/psxt001z.csproj index f7ea4c59..84d523da 100644 --- a/psxt001z/psxt001z.csproj +++ b/psxt001z/psxt001z.csproj @@ -1,7 +1,8 @@  - netstandard2.0;net6.0 + net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 psxt001z psxt001z Matt Nadareski;Dremora