From 1a1dc1c57fd1f7d9e8f27fbf5fce13a1b0716363 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 13:13:59 -0500 Subject: [PATCH 01/26] Create build.yml started github actions --- .github/workflows/build.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..2664dad76 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,32 @@ +# This workflow will build a .NET project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + +name: build + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore + - name: Test + run: dotnet test --no-build --verbosity normal From 9f03bec837228fa7237ba18bc3e1bc40667c6af3 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 13:24:08 -0500 Subject: [PATCH 02/26] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2664dad76..56f79a3f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: with: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore *\MetaMorpheus.sln - name: Build run: dotnet build --no-restore - name: Test From ef326545df8d814eb1a3c0a2a16672056ceff940 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 13:29:32 -0500 Subject: [PATCH 03/26] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56f79a3f6..2e90f057e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: with: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore *\MetaMorpheus.sln + run: dotnet restore ./MetaMorpheus.sln - name: Build run: dotnet build --no-restore - name: Test From b3f96e47bf0d063e005aa96530ee192d06d2d367 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 13:30:51 -0500 Subject: [PATCH 04/26] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e90f057e..f3f2ef0c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: with: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore ./MetaMorpheus.sln + run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln - name: Build run: dotnet build --no-restore - name: Test From 659178e47dd2b091ad0ac3947f36c4e486191a24 Mon Sep 17 00:00:00 2001 From: nbollis Date: Fri, 16 Aug 2024 13:35:28 -0500 Subject: [PATCH 05/26] enabled windows targeting to gui and guifunctions --- MetaMorpheus/GUI/GUI.csproj | 4 +++- MetaMorpheus/GuiFunctions/GuiFunctions.csproj | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/MetaMorpheus/GUI/GUI.csproj b/MetaMorpheus/GUI/GUI.csproj index 29027f365..f28ae0922 100644 --- a/MetaMorpheus/GUI/GUI.csproj +++ b/MetaMorpheus/GUI/GUI.csproj @@ -16,6 +16,7 @@ full true Icons\MMnice.ico + true @@ -25,8 +26,9 @@ x64 + - + diff --git a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj index 27f6145ae..a45054b18 100644 --- a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj +++ b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj @@ -6,6 +6,7 @@ full true true + true From 52b37f2272920befcfa5cc472d48c1efb5b1615e Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 13:37:33 -0500 Subject: [PATCH 06/26] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3f2ef0c7..6043f8422 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,6 @@ jobs: - name: Restore dependencies run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln - name: Test run: dotnet test --no-build --verbosity normal From 063ba814f12a943a8a47d2282680fcb8341cc8ec Mon Sep 17 00:00:00 2001 From: nbollis Date: Fri, 16 Aug 2024 13:41:44 -0500 Subject: [PATCH 07/26] windows targeting --- MetaMorpheus/Test/Test.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/MetaMorpheus/Test/Test.csproj b/MetaMorpheus/Test/Test.csproj index 154a19918..39d5ec970 100644 --- a/MetaMorpheus/Test/Test.csproj +++ b/MetaMorpheus/Test/Test.csproj @@ -5,6 +5,7 @@ false Debug;Release full + true From 1c09e6032a1cf015acd5c7e8b8ebafcb8479ca25 Mon Sep 17 00:00:00 2001 From: nbollis Date: Fri, 16 Aug 2024 14:22:20 -0500 Subject: [PATCH 08/26] added new configuration --- MetaMorpheus/Bootstrapper/Bootstrapper.wixproj | 1 + MetaMorpheus/CMD/CMD.csproj | 6 +++++- MetaMorpheus/EngineLayer/EngineLayer.csproj | 6 +++++- MetaMorpheus/GUI/GUI.csproj | 6 +++++- MetaMorpheus/GuiFunctions/GuiFunctions.csproj | 2 +- MetaMorpheus/MetaMorpheus.sln | 15 +++++++++++++++ .../MetaMorpheusSetup/MetaMorpheusSetup.wixproj | 7 +++++++ MetaMorpheus/TaskLayer/TaskLayer.csproj | 6 +++++- MetaMorpheus/Test/Test.csproj | 6 +++++- 9 files changed, 49 insertions(+), 6 deletions(-) diff --git a/MetaMorpheus/Bootstrapper/Bootstrapper.wixproj b/MetaMorpheus/Bootstrapper/Bootstrapper.wixproj index 38e08f961..35cb6395a 100644 --- a/MetaMorpheus/Bootstrapper/Bootstrapper.wixproj +++ b/MetaMorpheus/Bootstrapper/Bootstrapper.wixproj @@ -3,6 +3,7 @@ MetaMorpheusInstaller Bundle x64;ARM64 + Debug;Release;UbuntuMac diff --git a/MetaMorpheus/CMD/CMD.csproj b/MetaMorpheus/CMD/CMD.csproj index f278a13ce..b8bf1a0f0 100644 --- a/MetaMorpheus/CMD/CMD.csproj +++ b/MetaMorpheus/CMD/CMD.csproj @@ -4,7 +4,7 @@ Exe net8.0 app1.manifest - Debug;Release + Debug;Release;UbuntuMac full true @@ -14,6 +14,10 @@ x64 + + x64 + + x64 diff --git a/MetaMorpheus/EngineLayer/EngineLayer.csproj b/MetaMorpheus/EngineLayer/EngineLayer.csproj index a8621408a..81f647b7f 100644 --- a/MetaMorpheus/EngineLayer/EngineLayer.csproj +++ b/MetaMorpheus/EngineLayer/EngineLayer.csproj @@ -2,7 +2,7 @@ net8.0 - Debug;Release + Debug;Release;UbuntuMac 1.0.0.0 full true @@ -12,6 +12,10 @@ x64 + + x64 + + x64 diff --git a/MetaMorpheus/GUI/GUI.csproj b/MetaMorpheus/GUI/GUI.csproj index f28ae0922..bd7d0ed4d 100644 --- a/MetaMorpheus/GUI/GUI.csproj +++ b/MetaMorpheus/GUI/GUI.csproj @@ -12,7 +12,7 @@ false MetaMorpheusGUI MetaMorpheusGUI - Debug;Release + Debug;Release;UbuntuMac full true Icons\MMnice.ico @@ -23,6 +23,10 @@ x64 + + x64 + + x64 diff --git a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj index a45054b18..f1bcf50e8 100644 --- a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj +++ b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj @@ -2,7 +2,7 @@ net8.0-windows - Debug;Release + Debug;Release;UbuntuMac full true true diff --git a/MetaMorpheus/MetaMorpheus.sln b/MetaMorpheus/MetaMorpheus.sln index d03b322a1..37826032f 100644 --- a/MetaMorpheus/MetaMorpheus.sln +++ b/MetaMorpheus/MetaMorpheus.sln @@ -26,40 +26,55 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + UbuntuMac|Any CPU = UbuntuMac|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Debug|Any CPU.Build.0 = Debug|Any CPU {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Release|Any CPU.ActiveCfg = Release|Any CPU {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Release|Any CPU.Build.0 = Release|Any CPU + {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU + {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Release|Any CPU.Build.0 = Release|Any CPU + {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU + {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Release|Any CPU.Build.0 = Release|Any CPU + {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU + {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Debug|Any CPU.Build.0 = Debug|Any CPU {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Release|Any CPU.ActiveCfg = Release|Any CPU {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Release|Any CPU.Build.0 = Release|Any CPU + {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU + {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Debug|Any CPU.ActiveCfg = Debug|x64 {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Debug|Any CPU.Build.0 = Debug|x64 {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Release|Any CPU.ActiveCfg = Release|x64 {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Release|Any CPU.Build.0 = Release|x64 + {BE72541A-66A4-4958-9D19-56ACC7D3876B}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|ARM64 {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.Build.0 = Debug|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.ActiveCfg = Release|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.Build.0 = Release|Any CPU + {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU + {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.Build.0 = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Release|Any CPU.ActiveCfg = Release|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Release|Any CPU.Build.0 = Release|Any CPU + {7EE028A9-75A2-450F-A9A7-76559ED15419}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU + {7EE028A9-75A2-450F-A9A7-76559ED15419}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Debug|Any CPU.ActiveCfg = Debug|x64 {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Debug|Any CPU.Build.0 = Debug|x64 {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Release|Any CPU.ActiveCfg = Release|x64 {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Release|Any CPU.Build.0 = Release|x64 + {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|ARM64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj b/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj index 25aef3f26..65faf2357 100644 --- a/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj +++ b/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj @@ -6,6 +6,7 @@ MetaMorpheusSetup bin\$(Configuration)\ x64;ARM64 + Debug;Release;UbuntuMac x64 @@ -14,6 +15,12 @@ + + x64 + Debug + true + + x64 true diff --git a/MetaMorpheus/TaskLayer/TaskLayer.csproj b/MetaMorpheus/TaskLayer/TaskLayer.csproj index ded75a26e..8c17be7b8 100644 --- a/MetaMorpheus/TaskLayer/TaskLayer.csproj +++ b/MetaMorpheus/TaskLayer/TaskLayer.csproj @@ -2,7 +2,7 @@ net8.0 - Debug;Release + Debug;Release;UbuntuMac full true @@ -11,6 +11,10 @@ x64 + + x64 + + x64 diff --git a/MetaMorpheus/Test/Test.csproj b/MetaMorpheus/Test/Test.csproj index 39d5ec970..4bb1ecfbf 100644 --- a/MetaMorpheus/Test/Test.csproj +++ b/MetaMorpheus/Test/Test.csproj @@ -3,7 +3,7 @@ net8.0-windows false - Debug;Release + Debug;Release;UbuntuMac full true @@ -12,6 +12,10 @@ x64 + + x64 + + x64 From 15b643b38d013074f630c7b57d268325d56eb559 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 14:26:06 -0500 Subject: [PATCH 09/26] Update build.yml --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6043f8422..47e2c5f0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] + configuration: [UbuntuMac, Release, UbuntuMac] steps: - uses: actions/checkout@v4 @@ -27,6 +28,6 @@ jobs: - name: Restore dependencies run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln - name: Build - run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln + run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln --configuration ${{ matrix.configuration }} - name: Test - run: dotnet test --no-build --verbosity normal + run: dotnet test ./MetaMorpheus/Test.csproj --no-build --verbosity normal --configuration ${{ matrix.configuration }} From 1899f0e834657b14b3d97167c0220a2a341d9f17 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 14:29:10 -0500 Subject: [PATCH 10/26] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47e2c5f0d..49a913e0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - configuration: [UbuntuMac, Release, UbuntuMac] + configuration: [UbuntuMac, Release, Debug] steps: - uses: actions/checkout@v4 @@ -30,4 +30,4 @@ jobs: - name: Build run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln --configuration ${{ matrix.configuration }} - name: Test - run: dotnet test ./MetaMorpheus/Test.csproj --no-build --verbosity normal --configuration ${{ matrix.configuration }} + run: dotnet test ./MetaMorpheus/Test/Test.csproj --no-build --verbosity normal --configuration ${{ matrix.configuration }} From ad917f687de576475caf67d27aa69fe027bff116 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 15:18:13 -0500 Subject: [PATCH 11/26] Update build.yml --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49a913e0d..4ebdcb5c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - configuration: [UbuntuMac, Release, Debug] + include: + - os: ubuntu-latest + configuration: UbuntuMac + - os: macos-latest + configuration: UbuntuMac + - os: windows-latest + configuration: Release steps: - uses: actions/checkout@v4 From c029bc94233368ef3894168230606849a0d1d175 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 15:31:23 -0500 Subject: [PATCH 12/26] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ebdcb5c0..758ba9dd6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 8.0.204 - name: Restore dependencies run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln - name: Build From 90ca7458c7aa0787721b99748d5bd4b39013755b Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 15:34:35 -0500 Subject: [PATCH 13/26] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 758ba9dd6..6faf7c540 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,4 +36,4 @@ jobs: - name: Build run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln --configuration ${{ matrix.configuration }} - name: Test - run: dotnet test ./MetaMorpheus/Test/Test.csproj --no-build --verbosity normal --configuration ${{ matrix.configuration }} + run: dotnet test ./MetaMorpheus/Test/Test.csproj --verbosity normal --configuration ${{ matrix.configuration }} From 1bd81bf0f62b80af6fe4b7219334e85ddc79aea0 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 15:50:03 -0500 Subject: [PATCH 14/26] Update build.yml --- .github/workflows/build.yml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6faf7c540..222e8a85c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,9 +10,9 @@ on: branches: [ "master" ] jobs: - build: - + build-ubuntumac: runs-on: ${{ matrix.os }} + name: Build ${{ matrix.os }} strategy: fail-fast: false matrix: @@ -24,13 +24,34 @@ jobs: configuration: UbuntuMac - os: windows-latest configuration: Release + - os: windows-latest + configuration: Debug + + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.204 + - name: Restore dependencies + run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln + - name: Build + run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln --configuration ${{ matrix.configuration }} + + test: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [windows-latest] + cofiguration: [Release, Debug] steps: - uses: actions/checkout@v4 - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.204 + dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln - name: Build From f4413d105f0b4b4248ffb96a083f3447a5e960f6 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 15:53:41 -0500 Subject: [PATCH 15/26] Update build.yml --- .github/workflows/build.yml | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 222e8a85c..99f7c4cb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ # This workflow will build a .NET project # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net -name: build +name: Build on: push: @@ -10,9 +10,9 @@ on: branches: [ "master" ] jobs: - build-ubuntumac: + build: runs-on: ${{ matrix.os }} - name: Build ${{ matrix.os }} + name: ${{ matrix.os }} strategy: fail-fast: false matrix: @@ -37,24 +37,3 @@ jobs: run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln - name: Build run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln --configuration ${{ matrix.configuration }} - - test: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [windows-latest] - cofiguration: [Release, Debug] - - steps: - - uses: actions/checkout@v4 - - name: Setup .NET - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.0.x - - name: Restore dependencies - run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln - - name: Build - run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln --configuration ${{ matrix.configuration }} - - name: Test - run: dotnet test ./MetaMorpheus/Test/Test.csproj --verbosity normal --configuration ${{ matrix.configuration }} From be9b088e07c6bb1ebee10b249982036929d4345b Mon Sep 17 00:00:00 2001 From: nbollis Date: Fri, 16 Aug 2024 16:00:03 -0500 Subject: [PATCH 16/26] added test.yml from vs --- .github/workflows/test.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..17acce7a3 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,34 @@ +# This workflow will build a .NET project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + +name: Test + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [windows-latest] + cofiguration: [Release, Debug] + + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + - name: Restore dependencies + run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln + - name: Build + run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln --configuration ${{ matrix.configuration }} + - name: Test + run: dotnet test ./MetaMorpheus/Test/Test.csproj --verbosity normal --configuration ${{ matrix.configuration }} + From 48f13a0936f927632cab3d7375757be809691ab3 Mon Sep 17 00:00:00 2001 From: nbollis Date: Fri, 16 Aug 2024 16:06:31 -0500 Subject: [PATCH 17/26] reverterd commit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99f7c4cb5..fed82f2f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ name: Build on: push: - branches: [ "master" ] + branches: [ "master" ] pull_request: branches: [ "master" ] From e49a316e7b91312d29c06de9a06218f7ea3d6c65 Mon Sep 17 00:00:00 2001 From: nbollis Date: Fri, 16 Aug 2024 16:12:45 -0500 Subject: [PATCH 18/26] updated some csproj files --- MetaMorpheus/Bootstrapper/Bootstrapper.wixproj | 1 - MetaMorpheus/MetaMorpheus.sln | 4 ++-- MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/MetaMorpheus/Bootstrapper/Bootstrapper.wixproj b/MetaMorpheus/Bootstrapper/Bootstrapper.wixproj index 35cb6395a..38e08f961 100644 --- a/MetaMorpheus/Bootstrapper/Bootstrapper.wixproj +++ b/MetaMorpheus/Bootstrapper/Bootstrapper.wixproj @@ -3,7 +3,6 @@ MetaMorpheusInstaller Bundle x64;ARM64 - Debug;Release;UbuntuMac diff --git a/MetaMorpheus/MetaMorpheus.sln b/MetaMorpheus/MetaMorpheus.sln index 37826032f..ce6bea448 100644 --- a/MetaMorpheus/MetaMorpheus.sln +++ b/MetaMorpheus/MetaMorpheus.sln @@ -57,7 +57,7 @@ Global {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Debug|Any CPU.Build.0 = Debug|x64 {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Release|Any CPU.ActiveCfg = Release|x64 {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Release|Any CPU.Build.0 = Release|x64 - {BE72541A-66A4-4958-9D19-56ACC7D3876B}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|ARM64 + {BE72541A-66A4-4958-9D19-56ACC7D3876B}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|x64 {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.Build.0 = Debug|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,7 +74,7 @@ Global {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Debug|Any CPU.Build.0 = Debug|x64 {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Release|Any CPU.ActiveCfg = Release|x64 {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Release|Any CPU.Build.0 = Release|x64 - {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|ARM64 + {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj b/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj index 65faf2357..b445bec91 100644 --- a/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj +++ b/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj @@ -6,7 +6,6 @@ MetaMorpheusSetup bin\$(Configuration)\ x64;ARM64 - Debug;Release;UbuntuMac x64 From cc6d1679f174a61318efd541e4dccb21aa33b60a Mon Sep 17 00:00:00 2001 From: nbollis Date: Fri, 16 Aug 2024 16:16:34 -0500 Subject: [PATCH 19/26] touched up GUI.csproj --- MetaMorpheus/GUI/GUI.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MetaMorpheus/GUI/GUI.csproj b/MetaMorpheus/GUI/GUI.csproj index bd7d0ed4d..53e6582a4 100644 --- a/MetaMorpheus/GUI/GUI.csproj +++ b/MetaMorpheus/GUI/GUI.csproj @@ -30,9 +30,8 @@ x64 - - + From 7463b4fbc6a6ae55d8a570ce8f1dcc4323b713a8 Mon Sep 17 00:00:00 2001 From: Nic Bollis Date: Fri, 16 Aug 2024 16:24:35 -0500 Subject: [PATCH 20/26] Update build.yml --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fed82f2f9..f6325c098 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,8 +24,6 @@ jobs: configuration: UbuntuMac - os: windows-latest configuration: Release - - os: windows-latest - configuration: Debug steps: - uses: actions/checkout@v4 From 807e02b00df3d930ff4a6fd114397b3f2c022eb4 Mon Sep 17 00:00:00 2001 From: nbollis Date: Tue, 20 Aug 2024 14:13:53 -0500 Subject: [PATCH 21/26] fixed the test? --- MetaMorpheus/Test/SpectralRecoveryTest.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MetaMorpheus/Test/SpectralRecoveryTest.cs b/MetaMorpheus/Test/SpectralRecoveryTest.cs index 40c519ec4..3257361c6 100644 --- a/MetaMorpheus/Test/SpectralRecoveryTest.cs +++ b/MetaMorpheus/Test/SpectralRecoveryTest.cs @@ -285,6 +285,8 @@ public static void MiniClassicSearchEngineTest() [Test] public static void SpectralWriterTest() { + foreach (var specLibPath in Directory.GetFiles(outputFolder, "*.msp", SearchOption.AllDirectories)) + File.Delete(specLibPath); PostSearchAnalysisTask postSearchTask = new PostSearchAnalysisTask() { @@ -377,7 +379,7 @@ public static void SpectralWriterTest() postSearchTask.Run(); var libraryList = Directory.GetFiles(path, "*.*", SearchOption.AllDirectories); - string updateLibraryPath = libraryList.First(p => p.Contains("SpectralLibrary") && !p.Contains(matchingvalue)).ToString(); + string updateLibraryPath = libraryList.First(p => p.Contains("updateSpectralLibrary") && !p.Contains(matchingvalue)).ToString(); var updatedLibraryWithoutDecoy = new SpectralLibrary(new List { Path.Combine(path, updateLibraryPath) }); Assert.That(updatedLibraryWithoutDecoy.TryGetSpectrum("EESGKPGAHVTVK", 2, out spectrum)); From 8b50faaafe5da011f9e0585dd8870e3777d66ae9 Mon Sep 17 00:00:00 2001 From: nbollis Date: Tue, 20 Aug 2024 17:33:38 -0500 Subject: [PATCH 22/26] Changes at alex's suggestion --- MetaMorpheus/GUI/GUI.csproj | 6 +----- MetaMorpheus/GuiFunctions/GuiFunctions.csproj | 2 +- MetaMorpheus/MetaMorpheus.sln | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/MetaMorpheus/GUI/GUI.csproj b/MetaMorpheus/GUI/GUI.csproj index 53e6582a4..d57835e75 100644 --- a/MetaMorpheus/GUI/GUI.csproj +++ b/MetaMorpheus/GUI/GUI.csproj @@ -12,7 +12,7 @@ false MetaMorpheusGUI MetaMorpheusGUI - Debug;Release;UbuntuMac + Debug;Release full true Icons\MMnice.ico @@ -23,10 +23,6 @@ x64 - - x64 - - x64 diff --git a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj index f1bcf50e8..a45054b18 100644 --- a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj +++ b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj @@ -2,7 +2,7 @@ net8.0-windows - Debug;Release;UbuntuMac + Debug;Release full true true diff --git a/MetaMorpheus/MetaMorpheus.sln b/MetaMorpheus/MetaMorpheus.sln index ce6bea448..8698cd87c 100644 --- a/MetaMorpheus/MetaMorpheus.sln +++ b/MetaMorpheus/MetaMorpheus.sln @@ -39,8 +39,7 @@ Global {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Release|Any CPU.Build.0 = Release|Any CPU - {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU - {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU + {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.ActiveCfg = Debug|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -62,8 +61,7 @@ Global {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.Build.0 = Debug|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.ActiveCfg = Release|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.Build.0 = Release|Any CPU - {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU - {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU + {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.ActiveCfg = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.Build.0 = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Release|Any CPU.ActiveCfg = Release|Any CPU From d284894d852ba154e828fb3885ea1bd1fb436b3f Mon Sep 17 00:00:00 2001 From: nbollis Date: Tue, 20 Aug 2024 17:45:21 -0500 Subject: [PATCH 23/26] added back in guifunctions for tests --- MetaMorpheus/GuiFunctions/GuiFunctions.csproj | 6 +++++- MetaMorpheus/MetaMorpheus.sln | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj index a45054b18..e6ec17489 100644 --- a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj +++ b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj @@ -2,7 +2,7 @@ net8.0-windows - Debug;Release + Debug;Release;UbuntuMac full true true @@ -13,6 +13,10 @@ x64 + + x64 + + diff --git a/MetaMorpheus/MetaMorpheus.sln b/MetaMorpheus/MetaMorpheus.sln index 8698cd87c..38cd00fc0 100644 --- a/MetaMorpheus/MetaMorpheus.sln +++ b/MetaMorpheus/MetaMorpheus.sln @@ -62,6 +62,7 @@ Global {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.ActiveCfg = Release|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.Build.0 = Release|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.ActiveCfg = Debug|Any CPU + {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.Build.0 = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.Build.0 = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Release|Any CPU.ActiveCfg = Release|Any CPU From 8a915828fb5dd13c64a295630d26f1ec0dcf156d Mon Sep 17 00:00:00 2001 From: nbollis Date: Tue, 20 Aug 2024 17:47:28 -0500 Subject: [PATCH 24/26] removed windows targeting from GUI as it is no longer being built on windows and mac --- MetaMorpheus/GUI/GUI.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/MetaMorpheus/GUI/GUI.csproj b/MetaMorpheus/GUI/GUI.csproj index d57835e75..29027f365 100644 --- a/MetaMorpheus/GUI/GUI.csproj +++ b/MetaMorpheus/GUI/GUI.csproj @@ -16,7 +16,6 @@ full true Icons\MMnice.ico - true From 5ecc7f767b44d1dcd74205f964e3a655e7f1e26e Mon Sep 17 00:00:00 2001 From: nbollis Date: Tue, 20 Aug 2024 18:02:56 -0500 Subject: [PATCH 25/26] cleaned up alot --- MetaMorpheus/CMD/CMD.csproj | 6 +---- MetaMorpheus/EngineLayer/EngineLayer.csproj | 6 +---- MetaMorpheus/GUI/GUI.csproj | 1 + MetaMorpheus/GuiFunctions/GuiFunctions.csproj | 6 +---- MetaMorpheus/MetaMorpheus.sln | 26 +++++++++---------- MetaMorpheus/TaskLayer/TaskLayer.csproj | 6 +---- MetaMorpheus/Test/Test.csproj | 6 +---- 7 files changed, 19 insertions(+), 38 deletions(-) diff --git a/MetaMorpheus/CMD/CMD.csproj b/MetaMorpheus/CMD/CMD.csproj index b8bf1a0f0..f278a13ce 100644 --- a/MetaMorpheus/CMD/CMD.csproj +++ b/MetaMorpheus/CMD/CMD.csproj @@ -4,7 +4,7 @@ Exe net8.0 app1.manifest - Debug;Release;UbuntuMac + Debug;Release full true @@ -14,10 +14,6 @@ x64 - - x64 - - x64 diff --git a/MetaMorpheus/EngineLayer/EngineLayer.csproj b/MetaMorpheus/EngineLayer/EngineLayer.csproj index 81f647b7f..a8621408a 100644 --- a/MetaMorpheus/EngineLayer/EngineLayer.csproj +++ b/MetaMorpheus/EngineLayer/EngineLayer.csproj @@ -2,7 +2,7 @@ net8.0 - Debug;Release;UbuntuMac + Debug;Release 1.0.0.0 full true @@ -12,10 +12,6 @@ x64 - - x64 - - x64 diff --git a/MetaMorpheus/GUI/GUI.csproj b/MetaMorpheus/GUI/GUI.csproj index 29027f365..d57835e75 100644 --- a/MetaMorpheus/GUI/GUI.csproj +++ b/MetaMorpheus/GUI/GUI.csproj @@ -16,6 +16,7 @@ full true Icons\MMnice.ico + true diff --git a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj index e6ec17489..a45054b18 100644 --- a/MetaMorpheus/GuiFunctions/GuiFunctions.csproj +++ b/MetaMorpheus/GuiFunctions/GuiFunctions.csproj @@ -2,7 +2,7 @@ net8.0-windows - Debug;Release;UbuntuMac + Debug;Release full true true @@ -13,10 +13,6 @@ x64 - - x64 - - diff --git a/MetaMorpheus/MetaMorpheus.sln b/MetaMorpheus/MetaMorpheus.sln index 38cd00fc0..f6a4a2a48 100644 --- a/MetaMorpheus/MetaMorpheus.sln +++ b/MetaMorpheus/MetaMorpheus.sln @@ -33,47 +33,47 @@ Global {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Debug|Any CPU.Build.0 = Debug|Any CPU {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Release|Any CPU.ActiveCfg = Release|Any CPU {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Release|Any CPU.Build.0 = Release|Any CPU - {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU - {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU + {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.UbuntuMac|Any CPU.ActiveCfg = Release|Any CPU + {FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.UbuntuMac|Any CPU.Build.0 = Release|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Release|Any CPU.Build.0 = Release|Any CPU - {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.ActiveCfg = Debug|Any CPU + {C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.ActiveCfg = Release|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Release|Any CPU.Build.0 = Release|Any CPU - {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU - {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU + {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.UbuntuMac|Any CPU.ActiveCfg = Release|Any CPU + {FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.UbuntuMac|Any CPU.Build.0 = Release|Any CPU {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Debug|Any CPU.Build.0 = Debug|Any CPU {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Release|Any CPU.ActiveCfg = Release|Any CPU {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Release|Any CPU.Build.0 = Release|Any CPU - {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU - {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU + {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.UbuntuMac|Any CPU.ActiveCfg = Release|Any CPU + {9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.UbuntuMac|Any CPU.Build.0 = Release|Any CPU {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Debug|Any CPU.ActiveCfg = Debug|x64 {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Debug|Any CPU.Build.0 = Debug|x64 {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Release|Any CPU.ActiveCfg = Release|x64 {BE72541A-66A4-4958-9D19-56ACC7D3876B}.Release|Any CPU.Build.0 = Release|x64 - {BE72541A-66A4-4958-9D19-56ACC7D3876B}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|x64 + {BE72541A-66A4-4958-9D19-56ACC7D3876B}.UbuntuMac|Any CPU.ActiveCfg = Release|x64 {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.Build.0 = Debug|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.ActiveCfg = Release|Any CPU {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.Build.0 = Release|Any CPU - {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.ActiveCfg = Debug|Any CPU - {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.Build.0 = Debug|Any CPU + {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.ActiveCfg = Release|Any CPU + {653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.Build.0 = Release|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.Build.0 = Debug|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Release|Any CPU.ActiveCfg = Release|Any CPU {7EE028A9-75A2-450F-A9A7-76559ED15419}.Release|Any CPU.Build.0 = Release|Any CPU - {7EE028A9-75A2-450F-A9A7-76559ED15419}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU - {7EE028A9-75A2-450F-A9A7-76559ED15419}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU + {7EE028A9-75A2-450F-A9A7-76559ED15419}.UbuntuMac|Any CPU.ActiveCfg = Release|Any CPU + {7EE028A9-75A2-450F-A9A7-76559ED15419}.UbuntuMac|Any CPU.Build.0 = Release|Any CPU {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Debug|Any CPU.ActiveCfg = Debug|x64 {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Debug|Any CPU.Build.0 = Debug|x64 {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Release|Any CPU.ActiveCfg = Release|x64 {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Release|Any CPU.Build.0 = Release|x64 - {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|x64 + {E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.UbuntuMac|Any CPU.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MetaMorpheus/TaskLayer/TaskLayer.csproj b/MetaMorpheus/TaskLayer/TaskLayer.csproj index 8c17be7b8..ded75a26e 100644 --- a/MetaMorpheus/TaskLayer/TaskLayer.csproj +++ b/MetaMorpheus/TaskLayer/TaskLayer.csproj @@ -2,7 +2,7 @@ net8.0 - Debug;Release;UbuntuMac + Debug;Release full true @@ -11,10 +11,6 @@ x64 - - x64 - - x64 diff --git a/MetaMorpheus/Test/Test.csproj b/MetaMorpheus/Test/Test.csproj index d8abb0a37..12286e77f 100644 --- a/MetaMorpheus/Test/Test.csproj +++ b/MetaMorpheus/Test/Test.csproj @@ -3,7 +3,7 @@ net8.0-windows false - Debug;Release;UbuntuMac + Debug;Release full true @@ -12,10 +12,6 @@ x64 - - x64 - - x64 From 04e31e7bf5b2fd2535678db8446d07bde542b068 Mon Sep 17 00:00:00 2001 From: nbollis Date: Tue, 20 Aug 2024 18:05:06 -0500 Subject: [PATCH 26/26] did the thing --- MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj b/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj index b445bec91..25aef3f26 100644 --- a/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj +++ b/MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj @@ -14,12 +14,6 @@ - - x64 - Debug - true - - x64 true