From f54882e5bf1d0b329b706f4859f9a78360a054a0 Mon Sep 17 00:00:00 2001 From: Gustave Monce Date: Mon, 16 Sep 2024 22:16:31 +0200 Subject: [PATCH] Enable Linux and Darwin targets --- .github/workflows/ci.yml | 14 +++++++++++++- Ffu2Vhdx.sln | 28 ++++++++++++++++++---------- Ffu2Vhdx/Ffu2Vhdx.csproj | 4 ++-- Img2Ffu | 2 +- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c58736f..ac7f7c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: runs-on: windows-latest strategy: matrix: - target: [win-x86,win-x64,win-arm64] + target: [win-x86,win-x64,win-arm64,linux-x64,linux-arm64,osx-x64,osx-arm64] include: - target: win-x86 platform: win @@ -23,6 +23,18 @@ jobs: - target: win-arm64 platform: win architecture: arm64 + - target: linux-x64 + platform: linux + architecture: x64 + - target: linux-arm64 + platform: linux + architecture: arm64 + - target: osx-x64 + platform: osx + architecture: x64 + - target: osx-arm64 + platform: osx + architecture: arm64 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/Ffu2Vhdx.sln b/Ffu2Vhdx.sln index e7f4ed8..83d0ee8 100644 --- a/Ffu2Vhdx.sln +++ b/Ffu2Vhdx.sln @@ -6,22 +6,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ffu2Vhdx", "Ffu2Vhdx\Ffu2Vh EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Img2Ffu.Library", "Img2Ffu\Img2Ffu.Library\Img2Ffu.Library.csproj", "{97E58534-9D04-4E73-9243-50AA143A1DA6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Img2Ffu.Library.Compression.Windows", "Img2Ffu\Img2Ffu.Library.Compression.Windows\Img2Ffu.Library.Compression.Windows.csproj", "{E57ED5D6-6943-49E5-B302-8421263F6D99}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|ARM32 = Debug|ARM32 Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|ARM32 = Release|ARM32 Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Debug|Any CPU.Build.0 = Debug|Any CPU {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Debug|ARM32.ActiveCfg = Debug|ARM32 {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Debug|ARM32.Build.0 = Debug|ARM32 {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -30,8 +28,6 @@ Global {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Debug|x64.Build.0 = Debug|x64 {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Debug|x86.ActiveCfg = Debug|x86 {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Debug|x86.Build.0 = Debug|x86 - {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Release|Any CPU.Build.0 = Release|Any CPU {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Release|ARM32.ActiveCfg = Release|ARM32 {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Release|ARM32.Build.0 = Release|ARM32 {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Release|ARM64.ActiveCfg = Release|ARM64 @@ -40,8 +36,6 @@ Global {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Release|x64.Build.0 = Release|x64 {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Release|x86.ActiveCfg = Release|x86 {6BB88918-A58C-4510-A99F-AA22C7D5BD55}.Release|x86.Build.0 = Release|x86 - {97E58534-9D04-4E73-9243-50AA143A1DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97E58534-9D04-4E73-9243-50AA143A1DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {97E58534-9D04-4E73-9243-50AA143A1DA6}.Debug|ARM32.ActiveCfg = Debug|ARM32 {97E58534-9D04-4E73-9243-50AA143A1DA6}.Debug|ARM32.Build.0 = Debug|ARM32 {97E58534-9D04-4E73-9243-50AA143A1DA6}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -50,8 +44,6 @@ Global {97E58534-9D04-4E73-9243-50AA143A1DA6}.Debug|x64.Build.0 = Debug|x64 {97E58534-9D04-4E73-9243-50AA143A1DA6}.Debug|x86.ActiveCfg = Debug|x86 {97E58534-9D04-4E73-9243-50AA143A1DA6}.Debug|x86.Build.0 = Debug|x86 - {97E58534-9D04-4E73-9243-50AA143A1DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97E58534-9D04-4E73-9243-50AA143A1DA6}.Release|Any CPU.Build.0 = Release|Any CPU {97E58534-9D04-4E73-9243-50AA143A1DA6}.Release|ARM32.ActiveCfg = Release|ARM32 {97E58534-9D04-4E73-9243-50AA143A1DA6}.Release|ARM32.Build.0 = Release|ARM32 {97E58534-9D04-4E73-9243-50AA143A1DA6}.Release|ARM64.ActiveCfg = Release|ARM64 @@ -60,6 +52,22 @@ Global {97E58534-9D04-4E73-9243-50AA143A1DA6}.Release|x64.Build.0 = Release|x64 {97E58534-9D04-4E73-9243-50AA143A1DA6}.Release|x86.ActiveCfg = Release|x86 {97E58534-9D04-4E73-9243-50AA143A1DA6}.Release|x86.Build.0 = Release|x86 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Debug|ARM32.ActiveCfg = Debug|ARM32 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Debug|ARM32.Build.0 = Debug|ARM32 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Debug|ARM64.Build.0 = Debug|ARM64 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Debug|x64.ActiveCfg = Debug|x64 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Debug|x64.Build.0 = Debug|x64 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Debug|x86.ActiveCfg = Debug|x86 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Debug|x86.Build.0 = Debug|x86 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Release|ARM32.ActiveCfg = Release|ARM32 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Release|ARM32.Build.0 = Release|ARM32 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Release|ARM64.ActiveCfg = Release|ARM64 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Release|ARM64.Build.0 = Release|ARM64 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Release|x64.ActiveCfg = Release|x64 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Release|x64.Build.0 = Release|x64 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Release|x86.ActiveCfg = Release|x86 + {E57ED5D6-6943-49E5-B302-8421263F6D99}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Ffu2Vhdx/Ffu2Vhdx.csproj b/Ffu2Vhdx/Ffu2Vhdx.csproj index c45f4ec..f666679 100644 --- a/Ffu2Vhdx/Ffu2Vhdx.csproj +++ b/Ffu2Vhdx/Ffu2Vhdx.csproj @@ -2,10 +2,10 @@ Exe - net8.0-windows + net8.0 enable enable - x64;AnyCPU;ARM32;ARM64;x86 + x86;x64;ARM32;ARM64 diff --git a/Img2Ffu b/Img2Ffu index 8605759..d484ec2 160000 --- a/Img2Ffu +++ b/Img2Ffu @@ -1 +1 @@ -Subproject commit 8605759de49b84b104b40df0213fcab4b8ddee3d +Subproject commit d484ec2624c72e268421c8de647fcb0e7e4c5b08