diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5a0ba4..a33915c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: [push, pull_request] jobs: build: + name: Build Nightlies needs: [test] runs-on: ubuntu-latest strategy: @@ -24,25 +25,17 @@ jobs: dotnet-version: '7.0.x' dotnet-quality: 'ga' - - name: Install dependencies - run: dotnet restore --force -r ${{ matrix.runtime }} - - name: Build ${{ matrix.runtime }} - run: dotnet publish --no-restore -f net6.0 -c Release -r ${{ matrix.runtime }} + run: dotnet publish BitMod.sln -c Release -r ${{ matrix.runtime }} - name: Upload Files uses: actions/upload-artifact@v3 with: - name: Nightly ${{ matrix.runtime }} + name: nightly_${{ matrix.runtime }} path: build/ test: - + name: Tests runs-on: ubuntu-latest - strategy: - matrix: - framework-version: [ 'net6.0' ] - fail-fast: false - steps: - name: Checkout uses: actions/checkout@v2 @@ -57,8 +50,8 @@ jobs: dotnet-quality: 'ga' - name: Install dependencies - run: dotnet restore - - name: Build for ${{ matrix.framework-version }} - run: dotnet build tests/BitMod.Tests --framework ${{ matrix.framework-version }} --configuration Release --no-restore - - name: Test for ${{ matrix.framework-version }} - run: dotnet test tests/BitMod.Tests --framework ${{ matrix.framework-version }} --configuration Release --no-build --no-restore --verbosity normal + run: dotnet restore BitMod.sln + - name: Build + run: dotnet build tests/BitMod.Tests --framework net6.0 --configuration Release --no-restore + - name: Test + run: dotnet test tests/BitMod.Tests --framework net6.0 --configuration Release --no-build --no-restore --verbosity normal diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b3687b8..ed53ce7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -5,6 +5,9 @@ on: # Replace `main` with your branch’s name push: branches: ["master"] + # Only run if docs actually change + paths: + - "docs/**" # Specify to run a workflow manually from the Actions tab on GitHub workflow_dispatch: diff --git a/BitMod.Builtin.sln b/BitMod.Builtin.sln new file mode 100644 index 0000000..a8feacd --- /dev/null +++ b/BitMod.Builtin.sln @@ -0,0 +1,74 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "builtin", "builtin", "{A5E7842B-999F-4AB3-B846-51C68DAA792B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BitMod.Commands", "builtin\BitMod.Commands\BitMod.Commands.csproj", "{04AA6CD8-1003-4D7A-B0F0-2F1DAC2AA7E6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{575C205C-A43D-45DF-A4E4-B689A8C7AC82}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BitMod.Flags", "builtin\BitMod.Flags\BitMod.Flags.csproj", "{A88A907E-6FBC-4CC8-9DCD-8BDA5BA79703}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BitMod.Moderation", "builtin\BitMod.Moderation\BitMod.Moderation.csproj", "{9984EBA4-767D-4A6D-82B7-08F0EE50C25A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BitMod.Provision", "builtin\BitMod.Provision\BitMod.Provision.csproj", "{977540BF-CC03-4F81-AA50-22E924469634}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BitMod", "api\BitMod\BitMod.csproj", "{1CD7B592-A453-4A8E-B556-14D52947C0F5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BitMod.Whitelist", "builtin\BitMod.Whitelist\BitMod.Whitelist.csproj", "{E4BA4F87-3089-49B2-AA73-46C1D2812A92}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "upstream", "upstream", "{034634E0-DADE-4CDD-BCA4-98FDD606D934}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BattleBitAPI", "upstream\BattleBitAPI\BattleBitAPI\BattleBitAPI.csproj", "{AFF43ED3-4F91-48DA-9C78-95DCEABC8228}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McMaster.NETCore.Plugins", "upstream\DotNetCorePlugins\src\Plugins\McMaster.NETCore.Plugins.csproj", "{52914215-CD2B-4E9A-9C56-773E80011320}" +EndProject +Global + GlobalSection(NestedProjects) = preSolution + {04AA6CD8-1003-4D7A-B0F0-2F1DAC2AA7E6} = {A5E7842B-999F-4AB3-B846-51C68DAA792B} + {A88A907E-6FBC-4CC8-9DCD-8BDA5BA79703} = {A5E7842B-999F-4AB3-B846-51C68DAA792B} + {9984EBA4-767D-4A6D-82B7-08F0EE50C25A} = {A5E7842B-999F-4AB3-B846-51C68DAA792B} + {977540BF-CC03-4F81-AA50-22E924469634} = {A5E7842B-999F-4AB3-B846-51C68DAA792B} + {1CD7B592-A453-4A8E-B556-14D52947C0F5} = {575C205C-A43D-45DF-A4E4-B689A8C7AC82} + {E4BA4F87-3089-49B2-AA73-46C1D2812A92} = {A5E7842B-999F-4AB3-B846-51C68DAA792B} + {AFF43ED3-4F91-48DA-9C78-95DCEABC8228} = {034634E0-DADE-4CDD-BCA4-98FDD606D934} + {52914215-CD2B-4E9A-9C56-773E80011320} = {034634E0-DADE-4CDD-BCA4-98FDD606D934} + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1CD7B592-A453-4A8E-B556-14D52947C0F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1CD7B592-A453-4A8E-B556-14D52947C0F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1CD7B592-A453-4A8E-B556-14D52947C0F5}.Release|Any CPU.Build.0 = Release|Any CPU + {1CD7B592-A453-4A8E-B556-14D52947C0F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04AA6CD8-1003-4D7A-B0F0-2F1DAC2AA7E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04AA6CD8-1003-4D7A-B0F0-2F1DAC2AA7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04AA6CD8-1003-4D7A-B0F0-2F1DAC2AA7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04AA6CD8-1003-4D7A-B0F0-2F1DAC2AA7E6}.Release|Any CPU.Build.0 = Release|Any CPU + {A88A907E-6FBC-4CC8-9DCD-8BDA5BA79703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A88A907E-6FBC-4CC8-9DCD-8BDA5BA79703}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A88A907E-6FBC-4CC8-9DCD-8BDA5BA79703}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A88A907E-6FBC-4CC8-9DCD-8BDA5BA79703}.Release|Any CPU.Build.0 = Release|Any CPU + {9984EBA4-767D-4A6D-82B7-08F0EE50C25A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9984EBA4-767D-4A6D-82B7-08F0EE50C25A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9984EBA4-767D-4A6D-82B7-08F0EE50C25A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9984EBA4-767D-4A6D-82B7-08F0EE50C25A}.Release|Any CPU.Build.0 = Release|Any CPU + {977540BF-CC03-4F81-AA50-22E924469634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {977540BF-CC03-4F81-AA50-22E924469634}.Debug|Any CPU.Build.0 = Debug|Any CPU + {977540BF-CC03-4F81-AA50-22E924469634}.Release|Any CPU.ActiveCfg = Release|Any CPU + {977540BF-CC03-4F81-AA50-22E924469634}.Release|Any CPU.Build.0 = Release|Any CPU + {E4BA4F87-3089-49B2-AA73-46C1D2812A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4BA4F87-3089-49B2-AA73-46C1D2812A92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4BA4F87-3089-49B2-AA73-46C1D2812A92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4BA4F87-3089-49B2-AA73-46C1D2812A92}.Release|Any CPU.Build.0 = Release|Any CPU + {AFF43ED3-4F91-48DA-9C78-95DCEABC8228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AFF43ED3-4F91-48DA-9C78-95DCEABC8228}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AFF43ED3-4F91-48DA-9C78-95DCEABC8228}.Release|Any CPU.Build.0 = Release|Any CPU + {AFF43ED3-4F91-48DA-9C78-95DCEABC8228}.Debug|Any CPU.Build.0 = Debug|Any CPU + {52914215-CD2B-4E9A-9C56-773E80011320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {52914215-CD2B-4E9A-9C56-773E80011320}.Release|Any CPU.ActiveCfg = Release|Any CPU + {52914215-CD2B-4E9A-9C56-773E80011320}.Release|Any CPU.Build.0 = Release|Any CPU + {52914215-CD2B-4E9A-9C56-773E80011320}.Debug|Any CPU.Build.0 = Debug|Any CPU + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/BitMod.sln b/BitMod.sln index 038cd9b..59f1a9b 100644 --- a/BitMod.sln +++ b/BitMod.sln @@ -46,99 +46,68 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - Publish|Any CPU = Publish|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {20CD73A1-A74C-4205-AD74-9B48EEEFB3EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {20CD73A1-A74C-4205-AD74-9B48EEEFB3EC}.Debug|Any CPU.Build.0 = Debug|Any CPU {20CD73A1-A74C-4205-AD74-9B48EEEFB3EC}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CD73A1-A74C-4205-AD74-9B48EEEFB3EC}.Release|Any CPU.Build.0 = Release|Any CPU - {20CD73A1-A74C-4205-AD74-9B48EEEFB3EC}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {20CD73A1-A74C-4205-AD74-9B48EEEFB3EC}.Publish|Any CPU.Build.0 = Publish|Any CPU {63E2A804-E204-4919-98EC-F60CFC4777FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {63E2A804-E204-4919-98EC-F60CFC4777FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {63E2A804-E204-4919-98EC-F60CFC4777FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {63E2A804-E204-4919-98EC-F60CFC4777FA}.Release|Any CPU.Build.0 = Release|Any CPU - {63E2A804-E204-4919-98EC-F60CFC4777FA}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {63E2A804-E204-4919-98EC-F60CFC4777FA}.Publish|Any CPU.Build.0 = Publish|Any CPU {8D614C4F-22BE-461A-BD7D-80507EAA823F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D614C4F-22BE-461A-BD7D-80507EAA823F}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D614C4F-22BE-461A-BD7D-80507EAA823F}.Release|Any CPU.ActiveCfg = Release|Any CPU {8D614C4F-22BE-461A-BD7D-80507EAA823F}.Release|Any CPU.Build.0 = Release|Any CPU - {8D614C4F-22BE-461A-BD7D-80507EAA823F}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {8D614C4F-22BE-461A-BD7D-80507EAA823F}.Publish|Any CPU.Build.0 = Publish|Any CPU {A3BE58F5-FB17-4B97-8636-57062741EBFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A3BE58F5-FB17-4B97-8636-57062741EBFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3BE58F5-FB17-4B97-8636-57062741EBFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3BE58F5-FB17-4B97-8636-57062741EBFA}.Release|Any CPU.Build.0 = Release|Any CPU - {A3BE58F5-FB17-4B97-8636-57062741EBFA}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {A3BE58F5-FB17-4B97-8636-57062741EBFA}.Publish|Any CPU.Build.0 = Publish|Any CPU {BB262DE9-DD31-4DDB-A078-DAC6DD35AF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BB262DE9-DD31-4DDB-A078-DAC6DD35AF88}.Debug|Any CPU.Build.0 = Debug|Any CPU {BB262DE9-DD31-4DDB-A078-DAC6DD35AF88}.Release|Any CPU.ActiveCfg = Release|Any CPU {BB262DE9-DD31-4DDB-A078-DAC6DD35AF88}.Release|Any CPU.Build.0 = Release|Any CPU - {BB262DE9-DD31-4DDB-A078-DAC6DD35AF88}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {BB262DE9-DD31-4DDB-A078-DAC6DD35AF88}.Publish|Any CPU.Build.0 = Publish|Any CPU {46F25EB1-C8E0-4703-A5CA-616433688BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {46F25EB1-C8E0-4703-A5CA-616433688BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU {46F25EB1-C8E0-4703-A5CA-616433688BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU {46F25EB1-C8E0-4703-A5CA-616433688BE7}.Release|Any CPU.Build.0 = Release|Any CPU - {46F25EB1-C8E0-4703-A5CA-616433688BE7}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {46F25EB1-C8E0-4703-A5CA-616433688BE7}.Publish|Any CPU.Build.0 = Publish|Any CPU {0D18FC47-D9D6-409D-8E7F-18AEE75C4267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0D18FC47-D9D6-409D-8E7F-18AEE75C4267}.Debug|Any CPU.Build.0 = Debug|Any CPU {0D18FC47-D9D6-409D-8E7F-18AEE75C4267}.Release|Any CPU.ActiveCfg = Release|Any CPU {0D18FC47-D9D6-409D-8E7F-18AEE75C4267}.Release|Any CPU.Build.0 = Release|Any CPU - {0D18FC47-D9D6-409D-8E7F-18AEE75C4267}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {0D18FC47-D9D6-409D-8E7F-18AEE75C4267}.Publish|Any CPU.Build.0 = Publish|Any CPU {10FD03DE-6B69-40EA-98C7-5B4D77D46455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {10FD03DE-6B69-40EA-98C7-5B4D77D46455}.Debug|Any CPU.Build.0 = Debug|Any CPU {10FD03DE-6B69-40EA-98C7-5B4D77D46455}.Release|Any CPU.ActiveCfg = Release|Any CPU {10FD03DE-6B69-40EA-98C7-5B4D77D46455}.Release|Any CPU.Build.0 = Release|Any CPU - {10FD03DE-6B69-40EA-98C7-5B4D77D46455}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {10FD03DE-6B69-40EA-98C7-5B4D77D46455}.Publish|Any CPU.Build.0 = Publish|Any CPU {190C983D-FD0D-466B-B8B5-D294EA495698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {190C983D-FD0D-466B-B8B5-D294EA495698}.Debug|Any CPU.Build.0 = Debug|Any CPU {190C983D-FD0D-466B-B8B5-D294EA495698}.Release|Any CPU.ActiveCfg = Release|Any CPU {190C983D-FD0D-466B-B8B5-D294EA495698}.Release|Any CPU.Build.0 = Release|Any CPU - {190C983D-FD0D-466B-B8B5-D294EA495698}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {190C983D-FD0D-466B-B8B5-D294EA495698}.Publish|Any CPU.Build.0 = Publish|Any CPU {95ECB03D-E249-408B-9B51-EB408D687A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {95ECB03D-E249-408B-9B51-EB408D687A38}.Debug|Any CPU.Build.0 = Debug|Any CPU {95ECB03D-E249-408B-9B51-EB408D687A38}.Release|Any CPU.ActiveCfg = Release|Any CPU {95ECB03D-E249-408B-9B51-EB408D687A38}.Release|Any CPU.Build.0 = Release|Any CPU - {95ECB03D-E249-408B-9B51-EB408D687A38}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {95ECB03D-E249-408B-9B51-EB408D687A38}.Publish|Any CPU.Build.0 = Publish|Any CPU {E3329930-AED7-44DD-89BB-0D4830645020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E3329930-AED7-44DD-89BB-0D4830645020}.Debug|Any CPU.Build.0 = Debug|Any CPU {E3329930-AED7-44DD-89BB-0D4830645020}.Release|Any CPU.ActiveCfg = Release|Any CPU {E3329930-AED7-44DD-89BB-0D4830645020}.Release|Any CPU.Build.0 = Release|Any CPU - {E3329930-AED7-44DD-89BB-0D4830645020}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {E3329930-AED7-44DD-89BB-0D4830645020}.Publish|Any CPU.Build.0 = Publish|Any CPU {24DAB423-21F1-4231-922F-084C415C7D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {24DAB423-21F1-4231-922F-084C415C7D09}.Debug|Any CPU.Build.0 = Debug|Any CPU {24DAB423-21F1-4231-922F-084C415C7D09}.Release|Any CPU.ActiveCfg = Release|Any CPU {24DAB423-21F1-4231-922F-084C415C7D09}.Release|Any CPU.Build.0 = Release|Any CPU - {24DAB423-21F1-4231-922F-084C415C7D09}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {24DAB423-21F1-4231-922F-084C415C7D09}.Publish|Any CPU.Build.0 = Publish|Any CPU {0DF78B4C-26A7-4FF7-BD07-036981815125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0DF78B4C-26A7-4FF7-BD07-036981815125}.Debug|Any CPU.Build.0 = Debug|Any CPU {0DF78B4C-26A7-4FF7-BD07-036981815125}.Release|Any CPU.ActiveCfg = Release|Any CPU {0DF78B4C-26A7-4FF7-BD07-036981815125}.Release|Any CPU.Build.0 = Release|Any CPU - {0DF78B4C-26A7-4FF7-BD07-036981815125}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {0DF78B4C-26A7-4FF7-BD07-036981815125}.Publish|Any CPU.Build.0 = Publish|Any CPU {3FB356E0-587B-42EA-A1A0-C10AE6ADA621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3FB356E0-587B-42EA-A1A0-C10AE6ADA621}.Debug|Any CPU.Build.0 = Debug|Any CPU {3FB356E0-587B-42EA-A1A0-C10AE6ADA621}.Release|Any CPU.ActiveCfg = Release|Any CPU {3FB356E0-587B-42EA-A1A0-C10AE6ADA621}.Release|Any CPU.Build.0 = Release|Any CPU - {3FB356E0-587B-42EA-A1A0-C10AE6ADA621}.Publish|Any CPU.ActiveCfg = Publish|Any CPU - {3FB356E0-587B-42EA-A1A0-C10AE6ADA621}.Publish|Any CPU.Build.0 = Publish|Any CPU {2FCD0D1B-C58A-406C-83F9-FD2EB3598F9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2FCD0D1B-C58A-406C-83F9-FD2EB3598F9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {2FCD0D1B-C58A-406C-83F9-FD2EB3598F9F}.Release|Any CPU.ActiveCfg = Release|Any CPU {2FCD0D1B-C58A-406C-83F9-FD2EB3598F9F}.Release|Any CPU.Build.0 = Release|Any CPU - {2FCD0D1B-C58A-406C-83F9-FD2EB3598F9F}.Publish|Any CPU.ActiveCfg = Debug|Any CPU - {2FCD0D1B-C58A-406C-83F9-FD2EB3598F9F}.Publish|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {20CD73A1-A74C-4205-AD74-9B48EEEFB3EC} = {621F6C25-527F-4BA1-BF59-1D19021A9B88} diff --git a/api/BitMod/BitMod.csproj b/api/BitMod/BitMod.csproj index eb1d793..8ee0f50 100644 --- a/api/BitMod/BitMod.csproj +++ b/api/BitMod/BitMod.csproj @@ -8,7 +8,7 @@ bitmod EdgeGamers embedded - Debug;Release;Publish + Debug;Release AnyCPU latest diff --git a/builtin/BitMod.Commands/BitMod.Commands.csproj b/builtin/BitMod.Commands/BitMod.Commands.csproj index 4b0aa42..9cd1345 100644 --- a/builtin/BitMod.Commands/BitMod.Commands.csproj +++ b/builtin/BitMod.Commands/BitMod.Commands.csproj @@ -5,7 +5,7 @@ enable enable bitmod_commands - Debug;Release;Publish + Debug;Release AnyCPU ../../dev/plugins/$(AssemblyName)/ diff --git a/builtin/BitMod.Flags/BitMod.Flags.csproj b/builtin/BitMod.Flags/BitMod.Flags.csproj index d0a098c..29df7a7 100644 --- a/builtin/BitMod.Flags/BitMod.Flags.csproj +++ b/builtin/BitMod.Flags/BitMod.Flags.csproj @@ -5,7 +5,7 @@ enable enable bitmod_flags - Debug;Release;Publish + Debug;Release AnyCPU ../../dev/plugins/$(AssemblyName)/ diff --git a/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj b/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj index 2e46524..92d5af7 100644 --- a/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj +++ b/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj @@ -5,7 +5,7 @@ enable enable bitmod_whitelist - Debug;Release;Publish + Debug;Release AnyCPU ../../dev/plugins/$(AssemblyName)/ diff --git a/builtin/Directory.Build.props b/builtin/Directory.Build.props deleted file mode 100644 index faf2349..0000000 --- a/builtin/Directory.Build.props +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/samples/SamplePlugin/SamplePlugin.csproj b/samples/SamplePlugin/SamplePlugin.csproj index 55efdbc..307c021 100644 --- a/samples/SamplePlugin/SamplePlugin.csproj +++ b/samples/SamplePlugin/SamplePlugin.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - Debug;Release;Publish + Debug;Release AnyCPU ../../dev/plugins/$(AssemblyName)/ diff --git a/standalone/BitMod.Config/BitMod.Config.csproj b/standalone/BitMod.Config/BitMod.Config.csproj index 83c2036..1bb2e2a 100644 --- a/standalone/BitMod.Config/BitMod.Config.csproj +++ b/standalone/BitMod.Config/BitMod.Config.csproj @@ -5,7 +5,7 @@ enable enable embedded - Debug;Release;Publish + Debug;Release AnyCPU latest diff --git a/standalone/BitMod.Launcher/BitMod.Launcher.csproj b/standalone/BitMod.Launcher/BitMod.Launcher.csproj index daa923c..5ebe188 100644 --- a/standalone/BitMod.Launcher/BitMod.Launcher.csproj +++ b/standalone/BitMod.Launcher/BitMod.Launcher.csproj @@ -7,7 +7,7 @@ enable Windows bitmod_standalone - Debug;Release;Publish + Debug;Release AnyCPU ../../build diff --git a/standalone/BitMod.Logging/BitMod.Logging.csproj b/standalone/BitMod.Logging/BitMod.Logging.csproj index 9f33541..972e3f8 100644 --- a/standalone/BitMod.Logging/BitMod.Logging.csproj +++ b/standalone/BitMod.Logging/BitMod.Logging.csproj @@ -5,7 +5,7 @@ enable enable embedded - Debug;Release;Publish + Debug;Release AnyCPU latest diff --git a/standalone/BitMod.Plugins/BitMod.Plugins.csproj b/standalone/BitMod.Plugins/BitMod.Plugins.csproj index 99457aa..0a5d1d9 100644 --- a/standalone/BitMod.Plugins/BitMod.Plugins.csproj +++ b/standalone/BitMod.Plugins/BitMod.Plugins.csproj @@ -5,7 +5,7 @@ enable enable embedded - Debug;Release;Publish + Debug;Release AnyCPU latest diff --git a/standalone/BitMod.Plugins/PluginSystem.cs b/standalone/BitMod.Plugins/PluginSystem.cs index 80c7c25..2a912c0 100644 --- a/standalone/BitMod.Plugins/PluginSystem.cs +++ b/standalone/BitMod.Plugins/PluginSystem.cs @@ -132,7 +132,7 @@ internal void Unload(Plugin plugin) internal void Deleted(string name) { - foreach (Plugin plugin1 in _plugins.Where(plugin => plugin.Name == name)) + foreach (Plugin plugin1 in _plugins.Where(plugin => plugin.Name == name).ToList()) { plugin1.UnloadPlugin(); } diff --git a/tests/BitMod.Benchmarks/BitMod.Benchmarks.csproj b/tests/BitMod.Benchmarks/BitMod.Benchmarks.csproj index 08f8573..bf33237 100644 --- a/tests/BitMod.Benchmarks/BitMod.Benchmarks.csproj +++ b/tests/BitMod.Benchmarks/BitMod.Benchmarks.csproj @@ -6,7 +6,7 @@ enable enable Windows - Debug;Release;Publish + Debug;Release AnyCPU latest diff --git a/tests/BitMod.Tests/BitMod.Tests.csproj b/tests/BitMod.Tests/BitMod.Tests.csproj index 6bc0e30..e5bc350 100644 --- a/tests/BitMod.Tests/BitMod.Tests.csproj +++ b/tests/BitMod.Tests/BitMod.Tests.csproj @@ -9,7 +9,7 @@ BitMod.Tests - Debug;Release;Publish + Debug;Release AnyCPU diff --git a/upstream/Directory.Build.props b/upstream/Directory.Build.props new file mode 100644 index 0000000..90e20fd --- /dev/null +++ b/upstream/Directory.Build.props @@ -0,0 +1,6 @@ + + + false + embedded + + diff --git a/upstream/DotNetCorePlugins b/upstream/DotNetCorePlugins index 5bdb7d8..536923d 160000 --- a/upstream/DotNetCorePlugins +++ b/upstream/DotNetCorePlugins @@ -1 +1 @@ -Subproject commit 5bdb7d84327ff6737c50462b88f7ee58fbbeb50d +Subproject commit 536923dacdb2bdf126b3fee982d47b43b3770e0a