diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 73ff4913..bd8541ab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,12 +36,10 @@ jobs: file: src\SampleMods\OWML.LoadCustomAssets\manifest.json field: version value: ${{ steps.version.outputs.prop }} - - name: set assembly version - uses: rshillington/file-content-replacer@master + - name: set project version + uses: roryprimrose/set-vs-sdk-project-version@v1 with: - files: "**/AssemblyInfo.cs" - from: '\[assembly: AssemblyVersion\("[0-9.]*"\)\]' - to: '[assembly: AssemblyVersion("${{ steps.version.outputs.prop }}")]' + version: ${{ steps.version.outputs.prop }} - name: setup msbuild uses: microsoft/setup-msbuild@v1 @@ -62,7 +60,7 @@ jobs: - name: create zip run: | - cd src\OWML.Launcher\bin\Debug + cd src\OWML.Launcher\bin\Debug\net48 mkdir Logs mkdir Mods 7z a OWML.zip * @@ -70,7 +68,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: owml-zip - path: src\OWML.Launcher\bin\Debug\OWML.zip + path: src\OWML.Launcher\bin\Debug\net48\OWML.zip nuget: runs-on: windows-latest diff --git a/OWML.sln b/OWML.sln index 3f2dab1b..15756d19 100644 --- a/OWML.sln +++ b/OWML.sln @@ -5,53 +5,53 @@ VisualStudioVersion = 16.0.29123.88 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5F23B5A9-FEFC-4016-9A00-5DDE76798B85}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Launcher.Tests", "tests\OWML.Launcher.Tests\OWML.Launcher.Tests.csproj", "{04A652D4-416F-4538-9795-8AD10C09A940}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CEAC0A30-FF6F-4618-9C55-E2A0D81B863A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModLoader.Tests", "tests\OWML.ModLoader.Tests\OWML.ModLoader.Tests.csproj", "{C9520FE4-2E02-4671-A832-0A0AA3833636}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleMods", "SampleMods", "{C447A599-2700-44E1-BBFA-52880B7BFFBA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CEAC0A30-FF6F-4618-9C55-E2A0D81B863A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.Launcher", "src\OWML.Launcher\OWML.Launcher.csproj", "{FEF4EC4E-3B1E-4501-9841-1902A98BD309}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Abstractions", "src\OWML.Abstractions\OWML.Abstractions.csproj", "{F30E9352-0578-4775-A006-2501FCB35462}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.GameFinder", "src\OWML.GameFinder\OWML.GameFinder.csproj", "{79B243D0-E526-4E43-9755-D5474D258AA4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Common", "src\OWML.Common\OWML.Common.csproj", "{3C00626F-B688-4F32-B493-5B7EC1C879A0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.Common", "src\OWML.Common\OWML.Common.csproj", "{FE023885-8941-40D6-83A1-E5D30A6C8C8F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.GameFinder", "src\OWML.GameFinder\OWML.GameFinder.csproj", "{A3D507F5-22A2-4A18-B529-868FE8D59CF3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.Abstractions", "src\OWML.Abstractions\OWML.Abstractions.csproj", "{7F5AA67B-6B62-44A2-A974-65B5E6BC3EAF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Launcher", "src\OWML.Launcher\OWML.Launcher.csproj", "{9C09F86B-0C03-4630-8424-B939D3C632D0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.Logging", "src\OWML.Logging\OWML.Logging.csproj", "{438EDBCC-A16A-4326-A91A-BDCD34F73F89}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Logging", "src\OWML.Logging\OWML.Logging.csproj", "{6F14D39C-5747-4149-BE4D-365B43918A0A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.ModHelper.Assets", "src\OWML.ModHelper.Assets\OWML.ModHelper.Assets.csproj", "{BFDBBCA2-4DA3-4162-B85C-56121D715983}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModHelper", "src\OWML.ModHelper\OWML.ModHelper.csproj", "{CB57BAB8-D70E-4FCE-9BF1-328A924173A7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.ModHelper.Events", "src\OWML.ModHelper.Events\OWML.ModHelper.Events.csproj", "{0ED63C08-B5AA-4D6D-BA7C-E679F7F1FF00}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModHelper.Assets", "src\OWML.ModHelper.Assets\OWML.ModHelper.Assets.csproj", "{A62856BD-D06C-4F2C-86E8-91C6FDF8F8D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.ModHelper.Input", "src\OWML.ModHelper.Input\OWML.ModHelper.Input.csproj", "{646B43A2-009C-430C-A78E-4E1AC75536B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModHelper.Events", "src\OWML.ModHelper.Events\OWML.ModHelper.Events.csproj", "{B771615E-6B51-44F8-B862-D7543C12C0FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.ModHelper.Interaction", "src\OWML.ModHelper.Interaction\OWML.ModHelper.Interaction.csproj", "{40F30DE5-EF82-4DD1-9BE5-3B1F9B3E7544}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModHelper.Input", "src\OWML.ModHelper.Input\OWML.ModHelper.Input.csproj", "{BE89BAC0-91FF-4558-B093-79328D18AB30}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.ModHelper.Menus", "src\OWML.ModHelper.Menus\OWML.ModHelper.Menus.csproj", "{9D7DB512-E490-4D4B-814C-DD13F34C443C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModHelper.Interaction", "src\OWML.ModHelper.Interaction\OWML.ModHelper.Interaction.csproj", "{3212C570-D4C3-4083-A3DB-616F80BA5DAB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.ModLoader", "src\OWML.ModLoader\OWML.ModLoader.csproj", "{B0611F7A-3ED4-465E-A351-9EA90649DFB9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModHelper.Menus", "src\OWML.ModHelper.Menus\OWML.ModHelper.Menus.csproj", "{B874CC24-8340-4238-AC9D-1BFB41186BB5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.ModHelper", "src\OWML.ModHelper\OWML.ModHelper.csproj", "{ECC2ABFF-C9D3-4D7A-AB50-F9708236D1B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModLoader", "src\OWML.ModLoader\OWML.ModLoader.csproj", "{D075D13C-990A-46A2-B596-4600A3411BD5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.Patcher", "src\OWML.Patcher\OWML.Patcher.csproj", "{148D42B8-2C2D-40FD-83C7-CBE3E11F8987}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Patcher", "src\OWML.Patcher\OWML.Patcher.csproj", "{5153D37F-3148-45DE-B1A4-7EBF87965569}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.Utils", "src\OWML.Utils\OWML.Utils.csproj", "{AC134171-116C-42BB-95D6-BF97C2B29454}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Utils", "src\OWML.Utils\OWML.Utils.csproj", "{CC1A74B8-7068-4CD9-8AA4-C5270AAEA030}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.EnableDebugMode", "src\SampleMods\OWML.EnableDebugMode\OWML.EnableDebugMode.csproj", "{34E8B1FF-1218-42CE-832F-1FB8B39C247F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleMods", "SampleMods", "{C447A599-2700-44E1-BBFA-52880B7BFFBA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWML.LoadCustomAssets", "src\SampleMods\OWML.LoadCustomAssets\OWML.LoadCustomAssets.csproj", "{FAD6D4A0-5B49-4ABC-B11A-FF6D509FB77D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.GameFinder.Tests", "tests\OWML.GameFinder.Tests\OWML.GameFinder.Tests.csproj", "{2C1AB98A-B0EB-4E06-B006-6D3855DDB6E1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.GameFinder.Tests", "tests\OWML.GameFinder.Tests\OWML.GameFinder.Tests.csproj", "{B5F78317-9735-4B01-88EB-C288726CD69D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Tests.Setup", "tests\OWML.Tests.Setup\OWML.Tests.Setup.csproj", "{13F31207-D421-4B53-A8A2-8D690019AE2E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Tests.Setup", "tests\OWML.Tests.Setup\OWML.Tests.Setup.csproj", "{4CEDEC69-8F13-495B-8866-9B2F6ACBE8BB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModFinder.Tests", "tests\OWML.ModFinder.Tests\OWML.ModFinder.Tests.csproj", "{30C84B7F-ED70-413F-8224-2BCF433213A5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModLoader.Tests", "tests\OWML.ModLoader.Tests\OWML.ModLoader.Tests.csproj", "{ACDD836F-1A85-496A-826A-EB1865D355ED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Utils.Tests", "tests\OWML.Utils.Tests\OWML.Utils.Tests.csproj", "{A80BBC66-185F-4915-B80B-3860D6C62FA6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Launcher.Tests", "tests\OWML.Launcher.Tests\OWML.Launcher.Tests.csproj", "{39F80A26-8DBB-43CE-89E2-2D148489D73C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.EnableDebugMode", "src\SampleMods\OWML.EnableDebugMode\OWML.EnableDebugMode.csproj", "{6155732E-89B0-4D1E-A76B-229C056AE1E9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.ModFinder.Tests", "tests\OWML.ModFinder.Tests\OWML.ModFinder.Tests.csproj", "{65AC15AE-920A-4C98-B730-7CD20EA76310}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.LoadCustomAssets", "src\SampleMods\OWML.LoadCustomAssets\OWML.LoadCustomAssets.csproj", "{EC1DFA4B-D824-40FB-BF99-2B722BC1FAF6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OWML.Utils.Tests", "tests\OWML.Utils.Tests\OWML.Utils.Tests.csproj", "{DA74E671-FA8A-4834-90B7-368054990690}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -59,125 +59,125 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {04A652D4-416F-4538-9795-8AD10C09A940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04A652D4-416F-4538-9795-8AD10C09A940}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04A652D4-416F-4538-9795-8AD10C09A940}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04A652D4-416F-4538-9795-8AD10C09A940}.Release|Any CPU.Build.0 = Release|Any CPU - {C9520FE4-2E02-4671-A832-0A0AA3833636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9520FE4-2E02-4671-A832-0A0AA3833636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9520FE4-2E02-4671-A832-0A0AA3833636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9520FE4-2E02-4671-A832-0A0AA3833636}.Release|Any CPU.Build.0 = Release|Any CPU - {F30E9352-0578-4775-A006-2501FCB35462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F30E9352-0578-4775-A006-2501FCB35462}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F30E9352-0578-4775-A006-2501FCB35462}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F30E9352-0578-4775-A006-2501FCB35462}.Release|Any CPU.Build.0 = Release|Any CPU - {3C00626F-B688-4F32-B493-5B7EC1C879A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C00626F-B688-4F32-B493-5B7EC1C879A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C00626F-B688-4F32-B493-5B7EC1C879A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C00626F-B688-4F32-B493-5B7EC1C879A0}.Release|Any CPU.Build.0 = Release|Any CPU - {A3D507F5-22A2-4A18-B529-868FE8D59CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3D507F5-22A2-4A18-B529-868FE8D59CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3D507F5-22A2-4A18-B529-868FE8D59CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3D507F5-22A2-4A18-B529-868FE8D59CF3}.Release|Any CPU.Build.0 = Release|Any CPU - {9C09F86B-0C03-4630-8424-B939D3C632D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C09F86B-0C03-4630-8424-B939D3C632D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C09F86B-0C03-4630-8424-B939D3C632D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C09F86B-0C03-4630-8424-B939D3C632D0}.Release|Any CPU.Build.0 = Release|Any CPU - {6F14D39C-5747-4149-BE4D-365B43918A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F14D39C-5747-4149-BE4D-365B43918A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F14D39C-5747-4149-BE4D-365B43918A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F14D39C-5747-4149-BE4D-365B43918A0A}.Release|Any CPU.Build.0 = Release|Any CPU - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7}.Release|Any CPU.Build.0 = Release|Any CPU - {A62856BD-D06C-4F2C-86E8-91C6FDF8F8D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A62856BD-D06C-4F2C-86E8-91C6FDF8F8D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A62856BD-D06C-4F2C-86E8-91C6FDF8F8D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A62856BD-D06C-4F2C-86E8-91C6FDF8F8D5}.Release|Any CPU.Build.0 = Release|Any CPU - {B771615E-6B51-44F8-B862-D7543C12C0FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B771615E-6B51-44F8-B862-D7543C12C0FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B771615E-6B51-44F8-B862-D7543C12C0FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B771615E-6B51-44F8-B862-D7543C12C0FF}.Release|Any CPU.Build.0 = Release|Any CPU - {BE89BAC0-91FF-4558-B093-79328D18AB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE89BAC0-91FF-4558-B093-79328D18AB30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE89BAC0-91FF-4558-B093-79328D18AB30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE89BAC0-91FF-4558-B093-79328D18AB30}.Release|Any CPU.Build.0 = Release|Any CPU - {3212C570-D4C3-4083-A3DB-616F80BA5DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3212C570-D4C3-4083-A3DB-616F80BA5DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3212C570-D4C3-4083-A3DB-616F80BA5DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3212C570-D4C3-4083-A3DB-616F80BA5DAB}.Release|Any CPU.Build.0 = Release|Any CPU - {B874CC24-8340-4238-AC9D-1BFB41186BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B874CC24-8340-4238-AC9D-1BFB41186BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B874CC24-8340-4238-AC9D-1BFB41186BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B874CC24-8340-4238-AC9D-1BFB41186BB5}.Release|Any CPU.Build.0 = Release|Any CPU - {D075D13C-990A-46A2-B596-4600A3411BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D075D13C-990A-46A2-B596-4600A3411BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D075D13C-990A-46A2-B596-4600A3411BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D075D13C-990A-46A2-B596-4600A3411BD5}.Release|Any CPU.Build.0 = Release|Any CPU - {5153D37F-3148-45DE-B1A4-7EBF87965569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5153D37F-3148-45DE-B1A4-7EBF87965569}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5153D37F-3148-45DE-B1A4-7EBF87965569}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5153D37F-3148-45DE-B1A4-7EBF87965569}.Release|Any CPU.Build.0 = Release|Any CPU - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030}.Release|Any CPU.Build.0 = Release|Any CPU - {2C1AB98A-B0EB-4E06-B006-6D3855DDB6E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C1AB98A-B0EB-4E06-B006-6D3855DDB6E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C1AB98A-B0EB-4E06-B006-6D3855DDB6E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C1AB98A-B0EB-4E06-B006-6D3855DDB6E1}.Release|Any CPU.Build.0 = Release|Any CPU - {13F31207-D421-4B53-A8A2-8D690019AE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13F31207-D421-4B53-A8A2-8D690019AE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13F31207-D421-4B53-A8A2-8D690019AE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13F31207-D421-4B53-A8A2-8D690019AE2E}.Release|Any CPU.Build.0 = Release|Any CPU - {30C84B7F-ED70-413F-8224-2BCF433213A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30C84B7F-ED70-413F-8224-2BCF433213A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30C84B7F-ED70-413F-8224-2BCF433213A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30C84B7F-ED70-413F-8224-2BCF433213A5}.Release|Any CPU.Build.0 = Release|Any CPU - {A80BBC66-185F-4915-B80B-3860D6C62FA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A80BBC66-185F-4915-B80B-3860D6C62FA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A80BBC66-185F-4915-B80B-3860D6C62FA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A80BBC66-185F-4915-B80B-3860D6C62FA6}.Release|Any CPU.Build.0 = Release|Any CPU - {6155732E-89B0-4D1E-A76B-229C056AE1E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6155732E-89B0-4D1E-A76B-229C056AE1E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6155732E-89B0-4D1E-A76B-229C056AE1E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6155732E-89B0-4D1E-A76B-229C056AE1E9}.Release|Any CPU.Build.0 = Release|Any CPU - {EC1DFA4B-D824-40FB-BF99-2B722BC1FAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC1DFA4B-D824-40FB-BF99-2B722BC1FAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC1DFA4B-D824-40FB-BF99-2B722BC1FAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC1DFA4B-D824-40FB-BF99-2B722BC1FAF6}.Release|Any CPU.Build.0 = Release|Any CPU + {FEF4EC4E-3B1E-4501-9841-1902A98BD309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FEF4EC4E-3B1E-4501-9841-1902A98BD309}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FEF4EC4E-3B1E-4501-9841-1902A98BD309}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FEF4EC4E-3B1E-4501-9841-1902A98BD309}.Release|Any CPU.Build.0 = Release|Any CPU + {79B243D0-E526-4E43-9755-D5474D258AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {79B243D0-E526-4E43-9755-D5474D258AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {79B243D0-E526-4E43-9755-D5474D258AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {79B243D0-E526-4E43-9755-D5474D258AA4}.Release|Any CPU.Build.0 = Release|Any CPU + {FE023885-8941-40D6-83A1-E5D30A6C8C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE023885-8941-40D6-83A1-E5D30A6C8C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE023885-8941-40D6-83A1-E5D30A6C8C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE023885-8941-40D6-83A1-E5D30A6C8C8F}.Release|Any CPU.Build.0 = Release|Any CPU + {7F5AA67B-6B62-44A2-A974-65B5E6BC3EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F5AA67B-6B62-44A2-A974-65B5E6BC3EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F5AA67B-6B62-44A2-A974-65B5E6BC3EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F5AA67B-6B62-44A2-A974-65B5E6BC3EAF}.Release|Any CPU.Build.0 = Release|Any CPU + {438EDBCC-A16A-4326-A91A-BDCD34F73F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {438EDBCC-A16A-4326-A91A-BDCD34F73F89}.Debug|Any CPU.Build.0 = Debug|Any CPU + {438EDBCC-A16A-4326-A91A-BDCD34F73F89}.Release|Any CPU.ActiveCfg = Release|Any CPU + {438EDBCC-A16A-4326-A91A-BDCD34F73F89}.Release|Any CPU.Build.0 = Release|Any CPU + {BFDBBCA2-4DA3-4162-B85C-56121D715983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFDBBCA2-4DA3-4162-B85C-56121D715983}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFDBBCA2-4DA3-4162-B85C-56121D715983}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFDBBCA2-4DA3-4162-B85C-56121D715983}.Release|Any CPU.Build.0 = Release|Any CPU + {0ED63C08-B5AA-4D6D-BA7C-E679F7F1FF00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0ED63C08-B5AA-4D6D-BA7C-E679F7F1FF00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0ED63C08-B5AA-4D6D-BA7C-E679F7F1FF00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0ED63C08-B5AA-4D6D-BA7C-E679F7F1FF00}.Release|Any CPU.Build.0 = Release|Any CPU + {646B43A2-009C-430C-A78E-4E1AC75536B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {646B43A2-009C-430C-A78E-4E1AC75536B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {646B43A2-009C-430C-A78E-4E1AC75536B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {646B43A2-009C-430C-A78E-4E1AC75536B2}.Release|Any CPU.Build.0 = Release|Any CPU + {40F30DE5-EF82-4DD1-9BE5-3B1F9B3E7544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {40F30DE5-EF82-4DD1-9BE5-3B1F9B3E7544}.Debug|Any CPU.Build.0 = Debug|Any CPU + {40F30DE5-EF82-4DD1-9BE5-3B1F9B3E7544}.Release|Any CPU.ActiveCfg = Release|Any CPU + {40F30DE5-EF82-4DD1-9BE5-3B1F9B3E7544}.Release|Any CPU.Build.0 = Release|Any CPU + {9D7DB512-E490-4D4B-814C-DD13F34C443C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D7DB512-E490-4D4B-814C-DD13F34C443C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D7DB512-E490-4D4B-814C-DD13F34C443C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D7DB512-E490-4D4B-814C-DD13F34C443C}.Release|Any CPU.Build.0 = Release|Any CPU + {B0611F7A-3ED4-465E-A351-9EA90649DFB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0611F7A-3ED4-465E-A351-9EA90649DFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0611F7A-3ED4-465E-A351-9EA90649DFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0611F7A-3ED4-465E-A351-9EA90649DFB9}.Release|Any CPU.Build.0 = Release|Any CPU + {ECC2ABFF-C9D3-4D7A-AB50-F9708236D1B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ECC2ABFF-C9D3-4D7A-AB50-F9708236D1B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ECC2ABFF-C9D3-4D7A-AB50-F9708236D1B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ECC2ABFF-C9D3-4D7A-AB50-F9708236D1B2}.Release|Any CPU.Build.0 = Release|Any CPU + {148D42B8-2C2D-40FD-83C7-CBE3E11F8987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {148D42B8-2C2D-40FD-83C7-CBE3E11F8987}.Debug|Any CPU.Build.0 = Debug|Any CPU + {148D42B8-2C2D-40FD-83C7-CBE3E11F8987}.Release|Any CPU.ActiveCfg = Release|Any CPU + {148D42B8-2C2D-40FD-83C7-CBE3E11F8987}.Release|Any CPU.Build.0 = Release|Any CPU + {AC134171-116C-42BB-95D6-BF97C2B29454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AC134171-116C-42BB-95D6-BF97C2B29454}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AC134171-116C-42BB-95D6-BF97C2B29454}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AC134171-116C-42BB-95D6-BF97C2B29454}.Release|Any CPU.Build.0 = Release|Any CPU + {34E8B1FF-1218-42CE-832F-1FB8B39C247F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34E8B1FF-1218-42CE-832F-1FB8B39C247F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34E8B1FF-1218-42CE-832F-1FB8B39C247F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34E8B1FF-1218-42CE-832F-1FB8B39C247F}.Release|Any CPU.Build.0 = Release|Any CPU + {FAD6D4A0-5B49-4ABC-B11A-FF6D509FB77D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FAD6D4A0-5B49-4ABC-B11A-FF6D509FB77D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FAD6D4A0-5B49-4ABC-B11A-FF6D509FB77D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FAD6D4A0-5B49-4ABC-B11A-FF6D509FB77D}.Release|Any CPU.Build.0 = Release|Any CPU + {B5F78317-9735-4B01-88EB-C288726CD69D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B5F78317-9735-4B01-88EB-C288726CD69D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5F78317-9735-4B01-88EB-C288726CD69D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5F78317-9735-4B01-88EB-C288726CD69D}.Release|Any CPU.Build.0 = Release|Any CPU + {4CEDEC69-8F13-495B-8866-9B2F6ACBE8BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CEDEC69-8F13-495B-8866-9B2F6ACBE8BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CEDEC69-8F13-495B-8866-9B2F6ACBE8BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CEDEC69-8F13-495B-8866-9B2F6ACBE8BB}.Release|Any CPU.Build.0 = Release|Any CPU + {ACDD836F-1A85-496A-826A-EB1865D355ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ACDD836F-1A85-496A-826A-EB1865D355ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ACDD836F-1A85-496A-826A-EB1865D355ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ACDD836F-1A85-496A-826A-EB1865D355ED}.Release|Any CPU.Build.0 = Release|Any CPU + {39F80A26-8DBB-43CE-89E2-2D148489D73C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39F80A26-8DBB-43CE-89E2-2D148489D73C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39F80A26-8DBB-43CE-89E2-2D148489D73C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39F80A26-8DBB-43CE-89E2-2D148489D73C}.Release|Any CPU.Build.0 = Release|Any CPU + {65AC15AE-920A-4C98-B730-7CD20EA76310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65AC15AE-920A-4C98-B730-7CD20EA76310}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65AC15AE-920A-4C98-B730-7CD20EA76310}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65AC15AE-920A-4C98-B730-7CD20EA76310}.Release|Any CPU.Build.0 = Release|Any CPU + {DA74E671-FA8A-4834-90B7-368054990690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA74E671-FA8A-4834-90B7-368054990690}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA74E671-FA8A-4834-90B7-368054990690}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA74E671-FA8A-4834-90B7-368054990690}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {04A652D4-416F-4538-9795-8AD10C09A940} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} - {C9520FE4-2E02-4671-A832-0A0AA3833636} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} - {F30E9352-0578-4775-A006-2501FCB35462} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {3C00626F-B688-4F32-B493-5B7EC1C879A0} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {A3D507F5-22A2-4A18-B529-868FE8D59CF3} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {9C09F86B-0C03-4630-8424-B939D3C632D0} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {6F14D39C-5747-4149-BE4D-365B43918A0A} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {A62856BD-D06C-4F2C-86E8-91C6FDF8F8D5} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {B771615E-6B51-44F8-B862-D7543C12C0FF} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {BE89BAC0-91FF-4558-B093-79328D18AB30} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {3212C570-D4C3-4083-A3DB-616F80BA5DAB} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {B874CC24-8340-4238-AC9D-1BFB41186BB5} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {D075D13C-990A-46A2-B596-4600A3411BD5} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {5153D37F-3148-45DE-B1A4-7EBF87965569} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} {C447A599-2700-44E1-BBFA-52880B7BFFBA} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} - {2C1AB98A-B0EB-4E06-B006-6D3855DDB6E1} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} - {13F31207-D421-4B53-A8A2-8D690019AE2E} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} - {30C84B7F-ED70-413F-8224-2BCF433213A5} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} - {A80BBC66-185F-4915-B80B-3860D6C62FA6} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} - {6155732E-89B0-4D1E-A76B-229C056AE1E9} = {C447A599-2700-44E1-BBFA-52880B7BFFBA} - {EC1DFA4B-D824-40FB-BF99-2B722BC1FAF6} = {C447A599-2700-44E1-BBFA-52880B7BFFBA} + {FEF4EC4E-3B1E-4501-9841-1902A98BD309} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {79B243D0-E526-4E43-9755-D5474D258AA4} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {FE023885-8941-40D6-83A1-E5D30A6C8C8F} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {7F5AA67B-6B62-44A2-A974-65B5E6BC3EAF} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {438EDBCC-A16A-4326-A91A-BDCD34F73F89} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {BFDBBCA2-4DA3-4162-B85C-56121D715983} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {0ED63C08-B5AA-4D6D-BA7C-E679F7F1FF00} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {646B43A2-009C-430C-A78E-4E1AC75536B2} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {40F30DE5-EF82-4DD1-9BE5-3B1F9B3E7544} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {9D7DB512-E490-4D4B-814C-DD13F34C443C} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {B0611F7A-3ED4-465E-A351-9EA90649DFB9} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {ECC2ABFF-C9D3-4D7A-AB50-F9708236D1B2} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {148D42B8-2C2D-40FD-83C7-CBE3E11F8987} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {AC134171-116C-42BB-95D6-BF97C2B29454} = {CEAC0A30-FF6F-4618-9C55-E2A0D81B863A} + {34E8B1FF-1218-42CE-832F-1FB8B39C247F} = {C447A599-2700-44E1-BBFA-52880B7BFFBA} + {FAD6D4A0-5B49-4ABC-B11A-FF6D509FB77D} = {C447A599-2700-44E1-BBFA-52880B7BFFBA} + {B5F78317-9735-4B01-88EB-C288726CD69D} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} + {4CEDEC69-8F13-495B-8866-9B2F6ACBE8BB} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} + {ACDD836F-1A85-496A-826A-EB1865D355ED} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} + {39F80A26-8DBB-43CE-89E2-2D148489D73C} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} + {65AC15AE-920A-4C98-B730-7CD20EA76310} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} + {DA74E671-FA8A-4834-90B7-368054990690} = {5F23B5A9-FEFC-4016-9A00-5DDE76798B85} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35;packages\Unity.2.1.505.0\lib\NET35 SolutionGuid = {0E767163-75F9-420A-80EB-320429543CAD} + EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35;packages\Unity.2.1.505.0\lib\NET35 EndGlobalSection EndGlobal diff --git a/src/OWML.Abstractions/OWML.Abstractions.csproj b/src/OWML.Abstractions/OWML.Abstractions.csproj index fdbe047a..637330b5 100644 --- a/src/OWML.Abstractions/OWML.Abstractions.csproj +++ b/src/OWML.Abstractions/OWML.Abstractions.csproj @@ -1,97 +1,12 @@ - - - + + - Debug - AnyCPU - {F30E9352-0578-4775-A006-2501FCB35462} - Library - Properties - OWML.Abstractions - OWML.Abstractions - v3.5 - 512 - true + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - - - - - - - - - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - + - + - - \ No newline at end of file + + diff --git a/src/OWML.Abstractions/Properties/AssemblyInfo.cs b/src/OWML.Abstractions/Properties/AssemblyInfo.cs deleted file mode 100644 index 8a48ff55..00000000 --- a/src/OWML.Abstractions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Abstractions")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.Abstractions")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f30e9352-0578-4775-a006-2501fcb35462")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.Abstractions/packages.config b/src/OWML.Abstractions/packages.config deleted file mode 100644 index b6352623..00000000 --- a/src/OWML.Abstractions/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/OWML.Common/OWML.Common.csproj b/src/OWML.Common/OWML.Common.csproj index 2abf7beb..8994129b 100644 --- a/src/OWML.Common/OWML.Common.csproj +++ b/src/OWML.Common/OWML.Common.csproj @@ -1,172 +1,21 @@ - - - - - Debug - AnyCPU - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - Library - Properties - OWML.Common - OWML.Common - v3.5 - 512 - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - - - - - - \ No newline at end of file + + + + net35 + 9.0 + + + + + + runtime + + + + + + true + + + + diff --git a/src/OWML.Common/OWML.Common.csproj.DotSettings b/src/OWML.Common/OWML.Common.csproj.DotSettings deleted file mode 100644 index 8cae7b0f..00000000 --- a/src/OWML.Common/OWML.Common.csproj.DotSettings +++ /dev/null @@ -1,4 +0,0 @@ - - True - True - True \ No newline at end of file diff --git a/src/OWML.Common/Properties/AssemblyInfo.cs b/src/OWML.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index fe855cd9..00000000 --- a/src/OWML.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.Common")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3c00626f-b688-4f32-b493-5b7ec1c879a0")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.Common/packages.config b/src/OWML.Common/packages.config deleted file mode 100644 index 1d82139f..00000000 --- a/src/OWML.Common/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/OWML.GameFinder/CurrentPathFinder.cs b/src/OWML.GameFinder/CurrentPathFinder.cs index 0c62bdba..c04844f8 100644 --- a/src/OWML.GameFinder/CurrentPathFinder.cs +++ b/src/OWML.GameFinder/CurrentPathFinder.cs @@ -18,6 +18,5 @@ public override string FindGamePath() Writer.WriteLine($"Current game path is not valid: {Config.GamePath}", MessageType.Warning); return null; } - } } diff --git a/src/OWML.GameFinder/OWML.GameFinder.csproj b/src/OWML.GameFinder/OWML.GameFinder.csproj index c32414ff..fcb4e3dc 100644 --- a/src/OWML.GameFinder/OWML.GameFinder.csproj +++ b/src/OWML.GameFinder/OWML.GameFinder.csproj @@ -1,65 +1,17 @@ - - - + + - Debug - AnyCPU - {A3D507F5-22A2-4A18-B529-868FE8D59CF3} - Library - Properties - OWML.GameFinder - OWML.GameFinder - v4.7.2 - 512 - true + net48 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\Gameloop.Vdf.0.6.1\lib\net45\Gameloop.Vdf.dll - - - ..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - - - - - - - - - - - - - - - + - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - + + + - - + - - \ No newline at end of file + + diff --git a/src/OWML.GameFinder/Properties/AssemblyInfo.cs b/src/OWML.GameFinder/Properties/AssemblyInfo.cs deleted file mode 100644 index d8b67c86..00000000 --- a/src/OWML.GameFinder/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.GameFinder")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.GameFinder")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a3d507f5-22a2-4a18-b529-868fe8d59cf3")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.GameFinder/SteamGameFinder.cs b/src/OWML.GameFinder/SteamGameFinder.cs index 3412a2f6..342ed208 100644 --- a/src/OWML.GameFinder/SteamGameFinder.cs +++ b/src/OWML.GameFinder/SteamGameFinder.cs @@ -63,6 +63,5 @@ public override string FindGamePath() Writer.WriteLine("Game not found in Steam."); return null; } - } } diff --git a/src/OWML.GameFinder/app.config b/src/OWML.GameFinder/app.config deleted file mode 100644 index e936cc13..00000000 --- a/src/OWML.GameFinder/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/OWML.GameFinder/packages.config b/src/OWML.GameFinder/packages.config deleted file mode 100644 index 0cdb1fee..00000000 --- a/src/OWML.GameFinder/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/OWML.Launcher/App.config b/src/OWML.Launcher/App.config deleted file mode 100644 index a7bf03db..00000000 --- a/src/OWML.Launcher/App.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/OWML.Launcher/OWML.Launcher.csproj b/src/OWML.Launcher/OWML.Launcher.csproj index 71998e2f..6b54d6dc 100644 --- a/src/OWML.Launcher/OWML.Launcher.csproj +++ b/src/OWML.Launcher/OWML.Launcher.csproj @@ -1,113 +1,32 @@ - - - + + - Debug - AnyCPU - {9C09F86B-0C03-4630-8424-B939D3C632D0} - Exe - OWML.Launcher - OWML.Launcher - v4.7.2 - 512 - true - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - app.manifest + net48 + 9.0 + Exe + - - ..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - - - - - True - + + - - - - - - + + + - - - + Always - + Always - - - - - {F30E9352-0578-4775-A006-2501FCB35462} - OWML.Abstractions - - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {a3d507f5-22a2-4a18-b529-868fe8d59cf3} - OWML.GameFinder - - - {6F14D39C-5747-4149-BE4D-365B43918A0A} - OWML.Logging - - - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7} - OWML.ModHelper - - - {D075D13C-990A-46A2-B596-4600A3411BD5} - OWML.ModLoader - - - {5153D37F-3148-45DE-B1A4-7EBF87965569} - OWML.Patcher - - - {cc1a74b8-7068-4cd9-8aa4-c5270aaea030} - OWML.Utils - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/src/OWML.Launcher/OWML.Manifest.json b/src/OWML.Launcher/OWML.Manifest.json index 659b17ce..7ab4f798 100644 --- a/src/OWML.Launcher/OWML.Manifest.json +++ b/src/OWML.Launcher/OWML.Manifest.json @@ -2,7 +2,7 @@ "author": "Alek", "name": "OWML", "uniqueName": "Alek.OWML", - "version": "1.0.1", + "version": "1.1.0", "description": "The mod loader and mod framework for Outer Wilds", "minGameVersion": "1.0.7.0", "maxGameVersion": "1.0.7.481" diff --git a/src/OWML.Launcher/Properties/AssemblyInfo.cs b/src/OWML.Launcher/Properties/AssemblyInfo.cs deleted file mode 100644 index e841b639..00000000 --- a/src/OWML.Launcher/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Launcher")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.Launcher")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9c09f86b-0c03-4630-8424-b939d3c632d0")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.Logging/ConsoleUtils.cs b/src/OWML.Logging/ConsoleUtils.cs index f898ddba..126c757c 100644 --- a/src/OWML.Logging/ConsoleUtils.cs +++ b/src/OWML.Logging/ConsoleUtils.cs @@ -1,20 +1,10 @@ using System; -using System.Collections.Generic; using OWML.Common; namespace OWML.Logging { public static class ConsoleUtils { - private static readonly Dictionary MessageTypeColors = new Dictionary { - { MessageType.Error, ConsoleColor.Red }, - { MessageType.Warning, ConsoleColor.Yellow }, - { MessageType.Success, ConsoleColor.Green }, - { MessageType.Message, ConsoleColor.Gray }, - { MessageType.Info, ConsoleColor.Cyan }, - { MessageType.Fatal, ConsoleColor.Magenta } - }; - public static void WriteByType(MessageType type, string line) { if (string.IsNullOrEmpty(line)) @@ -22,9 +12,16 @@ public static void WriteByType(MessageType type, string line) return; } - Console.ForegroundColor = MessageTypeColors.ContainsKey(type) - ? MessageTypeColors[type] - : ConsoleColor.Gray; + Console.ForegroundColor = type switch + { + MessageType.Error => ConsoleColor.Red, + MessageType.Warning => ConsoleColor.Yellow, + MessageType.Success => ConsoleColor.Green, + MessageType.Message => ConsoleColor.Gray, + MessageType.Info => ConsoleColor.Cyan, + MessageType.Fatal => ConsoleColor.Magenta, + _ => ConsoleColor.Gray + }; Console.WriteLine(line); Console.ForegroundColor = ConsoleColor.Gray; diff --git a/src/OWML.Logging/ModLogger.cs b/src/OWML.Logging/ModLogger.cs index 38f74196..2335f250 100644 --- a/src/OWML.Logging/ModLogger.cs +++ b/src/OWML.Logging/ModLogger.cs @@ -21,13 +21,13 @@ public ModLogger(IOwmlConfig config, IModManifest manifest) } } - public void Log(string s) => + public void Log(string s) => LogInternal($"[{_manifest.Name}]: {s}"); - public void Log(params object[] objects) => + public void Log(params object[] objects) => Log(string.Join(" ", objects.Select(o => o.ToString()).ToArray())); - private static void LogInternal(string message) => + private static void LogInternal(string message) => File.AppendAllText(_logFileName, $"{DateTime.Now}: {message}{Environment.NewLine}"); } } diff --git a/src/OWML.Logging/OWML.Logging.csproj b/src/OWML.Logging/OWML.Logging.csproj index 5e5a4bf8..c86179a2 100644 --- a/src/OWML.Logging/OWML.Logging.csproj +++ b/src/OWML.Logging/OWML.Logging.csproj @@ -1,105 +1,12 @@ - - - + + - Debug - AnyCPU - {6F14D39C-5747-4149-BE4D-365B43918A0A} - Library - Properties - OWML.Logging - OWML.Logging - v3.5 - 512 - true + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - - - - - - - - - - - - - - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - + - + - - \ No newline at end of file + + diff --git a/src/OWML.Logging/Properties/AssemblyInfo.cs b/src/OWML.Logging/Properties/AssemblyInfo.cs deleted file mode 100644 index 908241b4..00000000 --- a/src/OWML.Logging/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Logging")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.Logging")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6f14d39c-5747-4149-be4d-365b43918a0a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.Logging/packages.config b/src/OWML.Logging/packages.config deleted file mode 100644 index 1d82139f..00000000 --- a/src/OWML.Logging/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/OWML.ModHelper.Assets/ModAssets.cs b/src/OWML.ModHelper.Assets/ModAssets.cs index 011d33e7..6d97049b 100644 --- a/src/OWML.ModHelper.Assets/ModAssets.cs +++ b/src/OWML.ModHelper.Assets/ModAssets.cs @@ -105,10 +105,7 @@ private IEnumerator LoadTexture(ObjectAsset modAsset, string imagePath) yield return www; www.LoadImageIntoTexture(texture); } - if (texture == null) - { - _console.WriteLine("Error - Texture is null.", MessageType.Error); - } + var meshRenderer = modAsset.AddComponent(); meshRenderer.material.mainTexture = texture; modAsset.SetMeshRenderer(meshRenderer); @@ -136,10 +133,7 @@ private IEnumerator LoadTexture(TextureAsset modAsset, string imagePath) yield return www; www.LoadImageIntoTexture(texture); } - if (texture == null) - { - _console.WriteLine("Error - Texture is null.", MessageType.Error); - } + var meshRenderer = modAsset.AddComponent(); meshRenderer.material.mainTexture = texture; yield return new WaitForEndOfFrame(); diff --git a/src/OWML.ModHelper.Assets/OWML.ModHelper.Assets.csproj b/src/OWML.ModHelper.Assets/OWML.ModHelper.Assets.csproj index 6e95c514..d184ae45 100644 --- a/src/OWML.ModHelper.Assets/OWML.ModHelper.Assets.csproj +++ b/src/OWML.ModHelper.Assets/OWML.ModHelper.Assets.csproj @@ -1,109 +1,18 @@ - - - + + - Debug - AnyCPU - {A62856BD-D06C-4F2C-86E8-91C6FDF8F8D5} - Library - Properties - OWML.ModHelper.Assets - OWML.ModHelper.Assets - v3.5 - 512 - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net35 + 9.0 + - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - False - lib\NAudio-Unity.dll - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - + + - - - - - - - - - - - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - - - - - + + lib\NAudio-Unity.dll + - - \ No newline at end of file + + diff --git a/src/OWML.ModHelper.Assets/ObjImporter.cs b/src/OWML.ModHelper.Assets/ObjImporter.cs index e3daa314..57455aae 100644 --- a/src/OWML.ModHelper.Assets/ObjImporter.cs +++ b/src/OWML.ModHelper.Assets/ObjImporter.cs @@ -67,47 +67,45 @@ private static MeshStruct CreateMeshStruct(string filename) var entireText = stream.ReadToEnd(); stream.Close(); - using (var reader = new StringReader(entireText)) - { - var currentText = reader.ReadLine(); - char[] splitIdentifier = { ' ' }; + using var reader = new StringReader(entireText); + var currentText = reader.ReadLine(); + char[] splitIdentifier = { ' ' }; - while (currentText != null) + while (currentText != null) + { + if (!currentText.StartsWith("f ") + && !currentText.StartsWith("v ") + && !currentText.StartsWith("vt ") + && !currentText.StartsWith("vn ")) { - if (!currentText.StartsWith("f ") - && !currentText.StartsWith("v ") - && !currentText.StartsWith("vt ") - && !currentText.StartsWith("vn ")) - { - currentText = reader.ReadLine(); - currentText = currentText?.Replace(" ", " "); - } - else + currentText = reader.ReadLine(); + currentText = currentText?.Replace(" ", " "); + } + else + { + currentText = currentText.Trim(); + var brokenString = currentText.Split(splitIdentifier, 50); + switch (brokenString[0]) { - currentText = currentText.Trim(); - var brokenString = currentText.Split(splitIdentifier, 50); - switch (brokenString[0]) - { - case "v": - vertices++; - break; - case "vt": - vt++; - break; - case "vn": - vn++; - break; - case "f": - face = face + brokenString.Length - 1; - triangles += 3 * (brokenString.Length - 2); - /* brokenString.Length is 3 or greater since a face must have at least + case "v": + vertices++; + break; + case "vt": + vt++; + break; + case "vn": + vn++; + break; + case "f": + face = face + brokenString.Length - 1; + triangles += 3 * (brokenString.Length - 2); + /* brokenString.Length is 3 or greater since a face must have at least 3 vertices. For each additional vertex, there is an additional triangle in the mesh (hence this formula).*/ - break; - } - currentText = reader.ReadLine(); - currentText = currentText?.Replace(" ", " "); + break; } + currentText = reader.ReadLine(); + currentText = currentText?.Replace(" ", " "); } } @@ -128,113 +126,111 @@ private static void PopulateMeshStruct(ref MeshStruct mesh) var entireText = stream.ReadToEnd(); stream.Close(); - using (var reader = new StringReader(entireText)) - { - var currentText = reader.ReadLine(); + using var reader = new StringReader(entireText); + var currentText = reader.ReadLine(); - char[] splitIdentifier = { ' ' }; - char[] splitIdentifier2 = { '/' }; - var f = 0; - var f2 = 0; - var v = 0; - var vn = 0; - var vt = 0; - var vt1 = 0; - var vt2 = 0; + char[] splitIdentifier = { ' ' }; + char[] splitIdentifier2 = { '/' }; + var f = 0; + var f2 = 0; + var v = 0; + var vn = 0; + var vt = 0; + var vt1 = 0; + var vt2 = 0; - while (currentText != null) + while (currentText != null) + { + if (!currentText.StartsWith("f ") && + !currentText.StartsWith("v ") && + !currentText.StartsWith("vt ") && + !currentText.StartsWith("vn ") && + !currentText.StartsWith("g ") && + !currentText.StartsWith("usemtl ") && + !currentText.StartsWith("mtllib ") && + !currentText.StartsWith("vt1 ") && + !currentText.StartsWith("vt2 ") && + !currentText.StartsWith("vc ") && + !currentText.StartsWith("usemap ")) { - if (!currentText.StartsWith("f ") && - !currentText.StartsWith("v ") && - !currentText.StartsWith("vt ") && - !currentText.StartsWith("vn ") && - !currentText.StartsWith("g ") && - !currentText.StartsWith("usemtl ") && - !currentText.StartsWith("mtllib ") && - !currentText.StartsWith("vt1 ") && - !currentText.StartsWith("vt2 ") && - !currentText.StartsWith("vc ") && - !currentText.StartsWith("usemap ")) - { - currentText = reader.ReadLine(); - currentText = currentText?.Replace(" ", " "); - } - else + currentText = reader.ReadLine(); + currentText = currentText?.Replace(" ", " "); + } + else + { + currentText = currentText.Trim(); + var brokenString = currentText.Split(splitIdentifier, 50); + switch (brokenString[0]) { - currentText = currentText.Trim(); - var brokenString = currentText.Split(splitIdentifier, 50); - switch (brokenString[0]) - { - case "v": - mesh.Vertices[v] = new Vector3( - System.Convert.ToSingle(brokenString[1]), System.Convert.ToSingle(brokenString[2]), - System.Convert.ToSingle(brokenString[3])); - v++; - break; - case "vt": - mesh.Uv[vt] = new Vector2( - System.Convert.ToSingle(brokenString[1]), - System.Convert.ToSingle(brokenString[2])); - vt++; - break; - case "vt1": - mesh.Uv[vt1] = new Vector2( - System.Convert.ToSingle(brokenString[1]), - System.Convert.ToSingle(brokenString[2])); - vt1++; - break; - case "vt2": - mesh.Uv[vt2] = new Vector2( - System.Convert.ToSingle(brokenString[1]), - System.Convert.ToSingle(brokenString[2])); - vt2++; - break; - case "vn": - mesh.Normals[vn] = new Vector3( - System.Convert.ToSingle(brokenString[1]), - System.Convert.ToSingle(brokenString[2]), - System.Convert.ToSingle(brokenString[3])); - vn++; - break; - case "f": - var j = 1; - var intArray = new List(); - while (j < brokenString.Length && ("" + brokenString[j]).Length > 0) + case "v": + mesh.Vertices[v] = new Vector3( + System.Convert.ToSingle(brokenString[1]), System.Convert.ToSingle(brokenString[2]), + System.Convert.ToSingle(brokenString[3])); + v++; + break; + case "vt": + mesh.Uv[vt] = new Vector2( + System.Convert.ToSingle(brokenString[1]), + System.Convert.ToSingle(brokenString[2])); + vt++; + break; + case "vt1": + mesh.Uv[vt1] = new Vector2( + System.Convert.ToSingle(brokenString[1]), + System.Convert.ToSingle(brokenString[2])); + vt1++; + break; + case "vt2": + mesh.Uv[vt2] = new Vector2( + System.Convert.ToSingle(brokenString[1]), + System.Convert.ToSingle(brokenString[2])); + vt2++; + break; + case "vn": + mesh.Normals[vn] = new Vector3( + System.Convert.ToSingle(brokenString[1]), + System.Convert.ToSingle(brokenString[2]), + System.Convert.ToSingle(brokenString[3])); + vn++; + break; + case "f": + var j = 1; + var intArray = new List(); + while (j < brokenString.Length && ("" + brokenString[j]).Length > 0) + { + var temp = new Vector3(); + var brokenBrokenString = brokenString[j].Split(splitIdentifier2, 3); + temp.x = System.Convert.ToInt32(brokenBrokenString[0]); + if (brokenBrokenString.Length > 1) // Some .obj files skip UV and normal { - var temp = new Vector3(); - var brokenBrokenString = brokenString[j].Split(splitIdentifier2, 3); - temp.x = System.Convert.ToInt32(brokenBrokenString[0]); - if (brokenBrokenString.Length > 1) // Some .obj files skip UV and normal + if (brokenBrokenString[1] != "") // Some .obj files skip the uv and not the normal { - if (brokenBrokenString[1] != "") // Some .obj files skip the uv and not the normal - { - temp.y = System.Convert.ToInt32(brokenBrokenString[1]); - } - temp.z = System.Convert.ToInt32(brokenBrokenString[2]); + temp.y = System.Convert.ToInt32(brokenBrokenString[1]); } - j++; - - mesh.FaceData[f2] = temp; - intArray.Add(f2); - f2++; - } - j = 1; - while (j + 2 < brokenString.Length) // Create triangles out of the face data. There will generally be more than 1 triangle per face. - { - mesh.Triangles[f] = intArray[0]; - f++; - mesh.Triangles[f] = intArray[j]; - f++; - mesh.Triangles[f] = intArray[j + 1]; - f++; - - j++; + temp.z = System.Convert.ToInt32(brokenBrokenString[2]); } - break; - } - currentText = reader.ReadLine(); - currentText = currentText?.Replace(" ", " "); // Some .obj files insert double spaces, this removes them. + j++; + + mesh.FaceData[f2] = temp; + intArray.Add(f2); + f2++; + } + j = 1; + while (j + 2 < brokenString.Length) // Create triangles out of the face data. There will generally be more than 1 triangle per face. + { + mesh.Triangles[f] = intArray[0]; + f++; + mesh.Triangles[f] = intArray[j]; + f++; + mesh.Triangles[f] = intArray[j + 1]; + f++; + + j++; + } + break; } + currentText = reader.ReadLine(); + currentText = currentText?.Replace(" ", " "); // Some .obj files insert double spaces, this removes them. } } } diff --git a/src/OWML.ModHelper.Assets/Properties/AssemblyInfo.cs b/src/OWML.ModHelper.Assets/Properties/AssemblyInfo.cs deleted file mode 100644 index f343c05a..00000000 --- a/src/OWML.ModHelper.Assets/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModHelper.Assets")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.ModHelper.Assets")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a62856bd-d06c-4f2c-86e8-91c6fdf8f8d5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.ModHelper.Assets/packages.config b/src/OWML.ModHelper.Assets/packages.config deleted file mode 100644 index b6352623..00000000 --- a/src/OWML.ModHelper.Assets/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/OWML.ModHelper.Events/ModEvents.cs b/src/OWML.ModHelper.Events/ModEvents.cs index 48a25356..e55203cf 100644 --- a/src/OWML.ModHelper.Events/ModEvents.cs +++ b/src/OWML.ModHelper.Events/ModEvents.cs @@ -19,8 +19,8 @@ public class ModEvents : IModEvents [Obsolete("Use Event instead.")] public Action OnEvent { get; set; } - private static readonly List> PatchedEvents = new List>(); - private readonly List> _subscribedEvents = new List>(); + private static readonly List> PatchedEvents = new(); + private readonly List> _subscribedEvents = new(); private readonly IHarmonyHelper _harmonyHelper; private readonly IModConsole _console; diff --git a/src/OWML.ModHelper.Events/OWML.ModHelper.Events.csproj b/src/OWML.ModHelper.Events/OWML.ModHelper.Events.csproj index e4dd6d05..cb173868 100644 --- a/src/OWML.ModHelper.Events/OWML.ModHelper.Events.csproj +++ b/src/OWML.ModHelper.Events/OWML.ModHelper.Events.csproj @@ -1,112 +1,17 @@ - - - + + - Debug - AnyCPU - {B771615E-6B51-44F8-B862-D7543C12C0FF} - Library - Properties - OWML.ModHelper.Events - OWML.ModHelper.Events - v3.5 - 512 - true + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - latest - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\Lib.Harmony.1.2.0.1\lib\net35\0Harmony.dll - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - - - - - - - - - - - + - + + - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {6F14D39C-5747-4149-BE4D-365B43918A0A} - OWML.Logging - - - {cc1a74b8-7068-4cd9-8aa4-c5270aaea030} - OWML.Utils - + + - - \ No newline at end of file + + diff --git a/src/OWML.ModHelper.Events/Patches.cs b/src/OWML.ModHelper.Events/Patches.cs index c2eee410..ab96688d 100644 --- a/src/OWML.ModHelper.Events/Patches.cs +++ b/src/OWML.ModHelper.Events/Patches.cs @@ -39,7 +39,7 @@ public static void BeforeDestroy(MonoBehaviour __instance) => public static void AfterDestroy(MonoBehaviour __instance) => OnEvent?.Invoke(__instance, Common.Events.AfterDestroy); - public static IEnumerable EmptyMethod(IEnumerable instructions) => + public static IEnumerable EmptyMethod(IEnumerable _) => new List(); } } diff --git a/src/OWML.ModHelper.Events/Properties/AssemblyInfo.cs b/src/OWML.ModHelper.Events/Properties/AssemblyInfo.cs deleted file mode 100644 index beedb0cc..00000000 --- a/src/OWML.ModHelper.Events/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModHelper.Events")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.ModHelper.Events")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b771615e-6b51-44f8-b862-d7543c12c0ff")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.ModHelper.Events/packages.config b/src/OWML.ModHelper.Events/packages.config deleted file mode 100644 index ef667e06..00000000 --- a/src/OWML.ModHelper.Events/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/OWML.ModHelper.Input/ModCommandListener.cs b/src/OWML.ModHelper.Input/ModCommandListener.cs index da07fbcc..b01a1468 100644 --- a/src/OWML.ModHelper.Input/ModCommandListener.cs +++ b/src/OWML.ModHelper.Input/ModCommandListener.cs @@ -19,10 +19,10 @@ public class ModCommandListener : MonoBehaviour public float MaximalTapDuration { get; set; } = 0.1f; - private readonly HashSet _commands = new HashSet(); - private readonly HashSet _toRemove = new HashSet(); - private readonly Dictionary _wasPressed = new Dictionary(); - private readonly Dictionary _isPressed = new Dictionary(); + private readonly HashSet _commands = new(); + private readonly HashSet _toRemove = new(); + private readonly Dictionary _wasPressed = new(); + private readonly Dictionary _isPressed = new(); public void AddToListener(SingleAxisCommand command) { @@ -95,7 +95,7 @@ public void Update() { OnTapped?.Invoke(command); } - if (blockFlag)//damn you, Mobius Digital + if (blockFlag) //damn you, Mobius Digital { var toReblock = _wasPressed[command] || _isPressed[command]; command.SetValue("_blockNextRelease", toReblock); diff --git a/src/OWML.ModHelper.Input/ModInputCombination.cs b/src/OWML.ModHelper.Input/ModInputCombination.cs index 7c203d13..e3467252 100644 --- a/src/OWML.ModHelper.Input/ModInputCombination.cs +++ b/src/OWML.ModHelper.Input/ModInputCombination.cs @@ -25,7 +25,7 @@ public class ModInputCombination : IModInputCombination private bool _isPressed; private float _firstPressedMoment; - private readonly List _singles = new List(); + private readonly List _singles = new(); private readonly List _hashes; private readonly IModManifest _manifest; private readonly IModConsole _console; diff --git a/src/OWML.ModHelper.Input/ModInputHandler.cs b/src/OWML.ModHelper.Input/ModInputHandler.cs index 0897bbba..ad21c87a 100644 --- a/src/OWML.ModHelper.Input/ModInputHandler.cs +++ b/src/OWML.ModHelper.Input/ModInputHandler.cs @@ -18,15 +18,15 @@ public class ModInputHandler : IModInputHandler private const float TapDuration = 0.1f; private const BindingFlags NonPublic = BindingFlags.NonPublic | BindingFlags.Instance; - private readonly HashSet _singlesPressed = new HashSet(); - private readonly Dictionary> _comboRegistry = new Dictionary>(); - private readonly HashSet _toResetOnNextFrame = new HashSet(); + private readonly HashSet _singlesPressed = new(); + private readonly Dictionary> _comboRegistry = new(); + private readonly HashSet _toResetOnNextFrame = new(); private readonly int[] _blockedFrame = new int[ModInputLibrary.MaxUsefulKey]; private readonly int[] _gameBindingCounter = new int[ModInputLibrary.MaxUsefulKey]; private readonly IModLogger _logger; private readonly IModConsole _console; - private HashSet _currentCombinations = new HashSet(); + private HashSet _currentCombinations = new(); private int _lastSingleUpdate; private int _lastCombinationUpdate; @@ -366,8 +366,6 @@ public void UnregisterCombination(IModInputCombination combination) case RegistrationCode.AllNormal: _logger.Log($"Successfully unregistered \"{combination.FullName}\"", MessageType.Success); return; - default: - return; } } diff --git a/src/OWML.ModHelper.Input/ModInputLibrary.cs b/src/OWML.ModHelper.Input/ModInputLibrary.cs index 30e9382c..4e84c461 100644 --- a/src/OWML.ModHelper.Input/ModInputLibrary.cs +++ b/src/OWML.ModHelper.Input/ModInputLibrary.cs @@ -13,22 +13,15 @@ public static class ModInputLibrary public const int MaxComboLength = 7; public const int GamePadKeyDiff = 20; - internal static string GetReadableMessage(RegistrationCode code) - { - switch (code) + internal static string GetReadableMessage(RegistrationCode code) => + code switch { - case RegistrationCode.InvalidCombination: - return "contains invalid keys"; - case RegistrationCode.CombinationTooLong: - return "contains too many keys"; - case RegistrationCode.CombinationTaken: - return "similar combination already registered"; - case RegistrationCode.AllNormal: - return "correct combination"; - default: - return "unknown"; - } - } + RegistrationCode.InvalidCombination => "contains invalid keys", + RegistrationCode.CombinationTooLong => "contains too many keys", + RegistrationCode.CombinationTaken => "similar combination already registered", + RegistrationCode.AllNormal => "correct combination", + _ => "unknown" + }; public static KeyCode NormalizeKeyCode(KeyCode key) { @@ -39,55 +32,35 @@ public static KeyCode NormalizeKeyCode(KeyCode key) return key; } - public static JoystickButton XboxButtonToJoystickButton(string xboxKey) - { - switch (xboxKey[0]) + public static JoystickButton XboxButtonToJoystickButton(string xboxKey) => + xboxKey[0] switch { - case 'a': - return JoystickButton.FaceDown; - case 'b': - return JoystickButton.FaceRight; - case 'x': - return JoystickButton.FaceLeft; - case 'y': - return JoystickButton.FaceUp; - default: - return KeyToKeycode(xboxKey, JoystickButton.None); - } - } + 'a' => JoystickButton.FaceDown, + 'b' => JoystickButton.FaceRight, + 'x' => JoystickButton.FaceLeft, + 'y' => JoystickButton.FaceUp, + _ => KeyToKeycode(xboxKey, JoystickButton.None) + }; - public static string JoystickButtonToXboxButton(JoystickButton key) - { - switch (key) + public static string JoystickButtonToXboxButton(JoystickButton key) => + key switch { - case JoystickButton.FaceDown: - return "a"; - case JoystickButton.FaceRight: - return "b"; - case JoystickButton.FaceLeft: - return "x"; - case JoystickButton.FaceUp: - return "y"; - default: - return key.ToString(); - } - } + JoystickButton.FaceDown => "a", + JoystickButton.FaceRight => "b", + JoystickButton.FaceLeft => "x", + JoystickButton.FaceUp => "y", + _ => key.ToString() + }; - private static KeyCode StringToKeyCodeKeyboard(string keyboardKey) - { - switch (keyboardKey) + private static KeyCode StringToKeyCodeKeyboard(string keyboardKey) => + keyboardKey switch { - case "control": - case "ctrl": - return KeyCode.LeftControl; - case "shift": - return KeyCode.LeftShift; - case "alt": - return KeyCode.LeftAlt; - default: - return KeyToKeycode(keyboardKey, KeyCode.None); - } - } + "control" => KeyCode.LeftControl, + "ctrl" => KeyCode.LeftControl, + "shift" => KeyCode.LeftShift, + "alt" => KeyCode.LeftAlt, + _ => KeyToKeycode(keyboardKey, KeyCode.None) + }; private static T KeyToKeycode(string keyboardKey, T defaultValue) { diff --git a/src/OWML.ModHelper.Input/OWML.ModHelper.Input.csproj b/src/OWML.ModHelper.Input/OWML.ModHelper.Input.csproj index e37c51ce..57416d71 100644 --- a/src/OWML.ModHelper.Input/OWML.ModHelper.Input.csproj +++ b/src/OWML.ModHelper.Input/OWML.ModHelper.Input.csproj @@ -1,106 +1,13 @@ - - - + + - Debug - AnyCPU - {BE89BAC0-91FF-4558-B093-79328D18AB30} - Library - Properties - OWML.ModHelper.Input - OWML.ModHelper.Input - v3.5 - 512 - true + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - - - - - - - - - - - - - - - - {3c00626f-b688-4f32-b493-5b7ec1c879a0} - OWML.Common - - - {cc1a74b8-7068-4cd9-8aa4-c5270aaea030} - OWML.Utils - - + - + + - - \ No newline at end of file + + diff --git a/src/OWML.ModHelper.Input/Properties/AssemblyInfo.cs b/src/OWML.ModHelper.Input/Properties/AssemblyInfo.cs deleted file mode 100644 index 76e40611..00000000 --- a/src/OWML.ModHelper.Input/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModHelper.Input")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.ModHelper.Input")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("be89bac0-91ff-4558-b093-79328d18ab30")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.ModHelper.Input/packages.config b/src/OWML.ModHelper.Input/packages.config deleted file mode 100644 index b6352623..00000000 --- a/src/OWML.ModHelper.Input/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/OWML.ModHelper.Interaction/ModInteraction.cs b/src/OWML.ModHelper.Interaction/ModInteraction.cs index 6b75edce..753e1d79 100644 --- a/src/OWML.ModHelper.Interaction/ModInteraction.cs +++ b/src/OWML.ModHelper.Interaction/ModInteraction.cs @@ -10,8 +10,8 @@ public class ModInteraction : IModInteraction private readonly IInterfaceProxyFactory _proxyFactory; private readonly IModManifest _manifest; - private Dictionary> _dependantDict = new Dictionary>(); - private Dictionary> _dependencyDict = new Dictionary>(); + private Dictionary> _dependantDict = new(); + private Dictionary> _dependencyDict = new(); public ModInteraction(IList modList, IInterfaceProxyFactory proxyFactory, IModManifest manifest) { @@ -74,15 +74,12 @@ private object GetApi(string uniqueName) => public TInterface GetModApi(string uniqueName) where TInterface : class { var api = GetApi(uniqueName); - switch (api) + return api switch { - case null: - return null; - case TInterface inter: - return inter; - default: - return _proxyFactory.CreateProxy(api, _manifest.UniqueName, uniqueName); - } + null => null, + TInterface inter => inter, + _ => _proxyFactory.CreateProxy(api, _manifest.UniqueName, uniqueName) + }; } public IList GetMods() => diff --git a/src/OWML.ModHelper.Interaction/OWML.ModHelper.Interaction.csproj b/src/OWML.ModHelper.Interaction/OWML.ModHelper.Interaction.csproj index 3bf92302..c86179a2 100644 --- a/src/OWML.ModHelper.Interaction/OWML.ModHelper.Interaction.csproj +++ b/src/OWML.ModHelper.Interaction/OWML.ModHelper.Interaction.csproj @@ -1,49 +1,12 @@ - - - + + - Debug - AnyCPU - {3212C570-D4C3-4083-A3DB-616F80BA5DAB} - Library - Properties - OWML.ModHelper.Interaction - OWML.ModHelper.Interaction - v3.5 - 512 - true + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - + - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - + - - \ No newline at end of file + + diff --git a/src/OWML.ModHelper.Interaction/Properties/AssemblyInfo.cs b/src/OWML.ModHelper.Interaction/Properties/AssemblyInfo.cs deleted file mode 100644 index f811bdb4..00000000 --- a/src/OWML.ModHelper.Interaction/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModHelper.Interaction")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.ModHelper.Interaction")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3212c570-d4c3-4083-a3db-616f80ba5dab")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.ModHelper.Menus/ModInputCombinationElement.cs b/src/OWML.ModHelper.Menus/ModInputCombinationElement.cs index c152f71d..9aca3521 100644 --- a/src/OWML.ModHelper.Menus/ModInputCombinationElement.cs +++ b/src/OWML.ModHelper.Menus/ModInputCombinationElement.cs @@ -25,7 +25,7 @@ public override string Title private string _combination; private readonly IModInputHandler _inputHandler; - private readonly List _openCommands = new List + private readonly List _openCommands = new() { InputLibrary.menuConfirm }; diff --git a/src/OWML.ModHelper.Menus/ModInputCombinationMenu.cs b/src/OWML.ModHelper.Menus/ModInputCombinationMenu.cs index a28d9019..1cdda83d 100644 --- a/src/OWML.ModHelper.Menus/ModInputCombinationMenu.cs +++ b/src/OWML.ModHelper.Menus/ModInputCombinationMenu.cs @@ -12,7 +12,7 @@ public class ModInputCombinationMenu : ModMenuWithSelectables, IModInputCombinat { public event Action OnConfirm; - public List CombinationElements { get; } = new List(); + public List CombinationElements { get; } = new(); private IModInputCombinationElement _combinationElementTemplate; diff --git a/src/OWML.ModHelper.Menus/ModInputCombinationPopup.cs b/src/OWML.ModHelper.Menus/ModInputCombinationPopup.cs index 53697f6c..c9e7eeac 100644 --- a/src/OWML.ModHelper.Menus/ModInputCombinationPopup.cs +++ b/src/OWML.ModHelper.Menus/ModInputCombinationPopup.cs @@ -24,7 +24,7 @@ public class ModInputCombinationPopup : PopupMenu [SerializeField] private ButtonWithHotkeyImageElement _resetButton; - private List _combination = new List(); + private List _combination = new(); private IModInputHandler _inputHandler; private bool _wasReleased = true; private SingleAxisCommand _resetCommand; diff --git a/src/OWML.ModHelper.Menus/ModLayoutManager.cs b/src/OWML.ModHelper.Menus/ModLayoutManager.cs index 75b745d8..72434f8e 100644 --- a/src/OWML.ModHelper.Menus/ModLayoutManager.cs +++ b/src/OWML.ModHelper.Menus/ModLayoutManager.cs @@ -9,7 +9,7 @@ namespace OWML.ModHelper.Menus public class ModLayoutManager : IModLayoutManager { private const int FontSize = 36; - private static readonly Vector2 NormalPivot = new Vector2(0.5f, 0.5f); + private static readonly Vector2 NormalPivot = new(0.5f, 0.5f); public LayoutGroup LayoutGroup { get; } @@ -18,7 +18,7 @@ public class ModLayoutManager : IModLayoutManager private readonly UIStyleManager _styleManager; private readonly ModUIStyleApplier _styleApplier; private readonly Vector3 _scale; - private readonly HashSet _constantGraphics = new HashSet(); + private readonly HashSet _constantGraphics = new(); public ModLayoutManager( LayoutGroup layout, diff --git a/src/OWML.ModHelper.Menus/ModMainMenu.cs b/src/OWML.ModHelper.Menus/ModMainMenu.cs index 78479763..72554d06 100644 --- a/src/OWML.ModHelper.Menus/ModMainMenu.cs +++ b/src/OWML.ModHelper.Menus/ModMainMenu.cs @@ -8,7 +8,7 @@ namespace OWML.ModHelper.Menus { public class ModMainMenu : ModMenu, IModMainMenu { - public IModTabbedMenu OptionsMenu { get; } = new ModOptionsMenu(); // todo DI? + public IModTabbedMenu OptionsMenu { get; } public IModButton ResumeExpeditionButton { get; private set; } @@ -25,6 +25,9 @@ public class ModMainMenu : ModMenu, IModMainMenu private TitleAnimationController _anim; private TitleScreenManager _titleManager; + public ModMainMenu(IModTabbedMenu optionsMenu) => + OptionsMenu = optionsMenu; + public void Initialize(TitleScreenManager titleScreenManager) { _titleManager = titleScreenManager; @@ -62,6 +65,5 @@ public override IModButtonBase AddButton(IModButtonBase button, int index) return modButton; } - } } diff --git a/src/OWML.ModHelper.Menus/ModPauseMenu.cs b/src/OWML.ModHelper.Menus/ModPauseMenu.cs index 279c7378..576a4e09 100644 --- a/src/OWML.ModHelper.Menus/ModPauseMenu.cs +++ b/src/OWML.ModHelper.Menus/ModPauseMenu.cs @@ -5,7 +5,7 @@ namespace OWML.ModHelper.Menus { public class ModPauseMenu : ModPopupMenu, IModPauseMenu { - public IModTabbedMenu OptionsMenu { get; } = new ModOptionsMenu(); // todo DI? + public IModTabbedMenu OptionsMenu { get; } public IModButton ResumeButton { get; private set; } @@ -13,6 +13,9 @@ public class ModPauseMenu : ModPopupMenu, IModPauseMenu public IModButton QuitButton { get; private set; } + public ModPauseMenu(IModTabbedMenu optionsMenu) => + OptionsMenu = optionsMenu; + public void Initialize(SettingsManager settingsManager) { var pauseMenuManager = settingsManager.GetComponent(); @@ -28,6 +31,5 @@ public void Initialize(SettingsManager settingsManager) InvokeOnInit(); } - } } diff --git a/src/OWML.ModHelper.Menus/ModPopupInput.cs b/src/OWML.ModHelper.Menus/ModPopupInput.cs index 94205992..d59cbaf9 100644 --- a/src/OWML.ModHelper.Menus/ModPopupInput.cs +++ b/src/OWML.ModHelper.Menus/ModPopupInput.cs @@ -15,7 +15,7 @@ public abstract class ModPopupInput : ModInput protected readonly TwoButtonToggleElement ToggleElement; protected ModCommandListener CommandListener; - private readonly List _openCommands = new List + private readonly List _openCommands = new() { InputLibrary.menuConfirm, InputLibrary.enter, diff --git a/src/OWML.ModHelper.Menus/ModPopupManager.cs b/src/OWML.ModHelper.Menus/ModPopupManager.cs index b0ae3ae3..da7ba1e8 100644 --- a/src/OWML.ModHelper.Menus/ModPopupManager.cs +++ b/src/OWML.ModHelper.Menus/ModPopupManager.cs @@ -10,7 +10,7 @@ public class ModPopupManager : IModPopupManager private readonly IModInputMenu _inputPopup; private readonly IModMessagePopup _messagePopup; private readonly IModInputCombinationElementMenu _combinationPopup; - private readonly List _toDestroy = new List(); + private readonly List _toDestroy = new(); private readonly IModEvents _events; public ModPopupManager( @@ -62,7 +62,7 @@ public IModInputMenu CreateInputPopup(InputType inputType, string value) var newPopup = _inputPopup.Copy(); newPopup.Open(inputType, value); newPopup.OnCancel += () => OnPopupClose(newPopup); - newPopup.OnConfirm += thing => OnPopupClose(newPopup); + newPopup.OnConfirm += _ => OnPopupClose(newPopup); return newPopup; } @@ -72,7 +72,7 @@ public IModInputCombinationElementMenu CreateCombinationInput(string value, stri var newPopup = _combinationPopup.Copy(); newPopup.Open(value, comboName, combinationMenu, element); newPopup.OnCancel += () => OnPopupClose(newPopup); - newPopup.OnConfirm += thing => OnPopupClose(newPopup); + newPopup.OnConfirm += _ => OnPopupClose(newPopup); return newPopup; } diff --git a/src/OWML.ModHelper.Menus/ModSelectorInput.cs b/src/OWML.ModHelper.Menus/ModSelectorInput.cs index 51b58a4d..d3ade3fb 100644 --- a/src/OWML.ModHelper.Menus/ModSelectorInput.cs +++ b/src/OWML.ModHelper.Menus/ModSelectorInput.cs @@ -13,7 +13,7 @@ public class ModSelectorInput : ModInput, IModSelectorInput private readonly OptionsSelectorElement _element; private int _count; - private List _options = new List(); + private List _options = new(); public override string Value { diff --git a/src/OWML.ModHelper.Menus/ModUIStyleApplier.cs b/src/OWML.ModHelper.Menus/ModUIStyleApplier.cs index 5101cdcb..f2ec7f52 100644 --- a/src/OWML.ModHelper.Menus/ModUIStyleApplier.cs +++ b/src/OWML.ModHelper.Menus/ModUIStyleApplier.cs @@ -23,30 +23,20 @@ public void ClearAllArrays() _onOffGraphicList = new OnOffGraphic[0]; } - public void SetTexts(Text[] texts) - { + public void SetTexts(Text[] texts) => _textItems = texts; - } - public void SetForeground(Graphic[] foreground) - { + public void SetForeground(Graphic[] foreground) => _foregroundGraphics = foreground; - } - public void SetBackground(Graphic[] background) - { + public void SetBackground(Graphic[] background) => _backgroundGraphics = background; - } - public void SetOnOffGraphics(Graphic[] onOffs) - { + public void SetOnOffGraphics(Graphic[] onOffs) => _onOffGraphics = onOffs; - } - public void SetOnOffExtended(OnOffGraphic[] onOffs) - { + public void SetOnOffExtended(OnOffGraphic[] onOffs) => _onOffGraphicList = onOffs; - } public void SetAsButton() { @@ -70,11 +60,13 @@ public static ModUIStyleApplier ReplaceStyleApplier(GameObject obj) { var oldUIStyleApplier = obj.GetComponent(); var newUIStyleApplier = obj.AddComponent(); - if (oldUIStyleApplier != null) + if (oldUIStyleApplier == null) { - newUIStyleApplier.Initialize(oldUIStyleApplier); - Destroy(oldUIStyleApplier); + return newUIStyleApplier; } + + newUIStyleApplier.Initialize(oldUIStyleApplier); + Destroy(oldUIStyleApplier); return newUIStyleApplier; } } diff --git a/src/OWML.ModHelper.Menus/ModsMenu.cs b/src/OWML.ModHelper.Menus/ModsMenu.cs index 99fd861e..862b7f65 100644 --- a/src/OWML.ModHelper.Menus/ModsMenu.cs +++ b/src/OWML.ModHelper.Menus/ModsMenu.cs @@ -18,7 +18,7 @@ public class ModsMenu : ModPopupMenu, IModsMenu private readonly IModInputHandler _inputHandler; private readonly IModEvents _events; private readonly IModStorage _storage; - private readonly List _modConfigMenus = new List(); + private readonly List _modConfigMenus = new(); private IModMenus _menus; public ModsMenu(IModConfigMenuBase owmlMenu, IModInputHandler inputHandler, IModEvents events, IModStorage storage) diff --git a/src/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj b/src/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj index fa2b9761..813fface 100644 --- a/src/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj +++ b/src/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj @@ -1,145 +1,13 @@ - - - + + - Debug - AnyCPU - {B874CC24-8340-4238-AC9D-1BFB41186BB5} - Library - Properties - OWML.ModHelper.Menus - OWML.ModHelper.Menus - v3.5 - 512 - true + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {6F14D39C-5747-4149-BE4D-365B43918A0A} - OWML.Logging - - - {be89bac0-91ff-4558-b093-79328d18ab30} - OWML.ModHelper.Input - - - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030} - OWML.Utils - - + - + + - - \ No newline at end of file + + diff --git a/src/OWML.ModHelper.Menus/OwmlConfigMenu.cs b/src/OWML.ModHelper.Menus/OwmlConfigMenu.cs index bc5e5a9d..22d2ace9 100644 --- a/src/OWML.ModHelper.Menus/OwmlConfigMenu.cs +++ b/src/OWML.ModHelper.Menus/OwmlConfigMenu.cs @@ -19,8 +19,7 @@ public OwmlConfigMenu(IModManifest manifest, IOwmlConfig config, IModStorage sto protected override void AddInputs() { - var index = 2; - AddConfigInput(BlockInputTitle, _config.BlockInput, index++); + AddConfigInput(BlockInputTitle, _config.BlockInput, 2); UpdateNavigation(); SelectFirst(); } @@ -43,6 +42,5 @@ protected override void OnReset() _config.BlockInput = _defaultConfig.BlockInput; UpdateUIValues(); } - } } diff --git a/src/OWML.ModHelper.Menus/Properties/AssemblyInfo.cs b/src/OWML.ModHelper.Menus/Properties/AssemblyInfo.cs deleted file mode 100644 index d670d5ed..00000000 --- a/src/OWML.ModHelper.Menus/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModHelper.Menus")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.ModHelper.Menus")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b874cc24-8340-4238-ac9d-1bfb41186bb5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.ModHelper.Menus/packages.config b/src/OWML.ModHelper.Menus/packages.config deleted file mode 100644 index 1d82139f..00000000 --- a/src/OWML.ModHelper.Menus/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/OWML.ModHelper/OWML.ModHelper.csproj b/src/OWML.ModHelper/OWML.ModHelper.csproj index 0b5bf297..9eb89397 100644 --- a/src/OWML.ModHelper/OWML.ModHelper.csproj +++ b/src/OWML.ModHelper/OWML.ModHelper.csproj @@ -1,136 +1,17 @@ - - - + + - Debug - AnyCPU - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7} - Library - Properties - OWML.ModHelper - OWML.ModHelper - v3.5 - 512 - true + net35 + 9.0 + 1.1.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - latest - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - - - - - - - - - - - - - + - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {6F14D39C-5747-4149-BE4D-365B43918A0A} - OWML.Logging - - - {a62856bd-d06c-4f2c-86e8-91c6fdf8f8d5} - OWML.ModHelper.Assets - - - {b771615e-6b51-44f8-b862-d7543c12c0ff} - OWML.ModHelper.Events - - - {be89bac0-91ff-4558-b093-79328d18ab30} - OWML.ModHelper.Input - - - {3212c570-d4c3-4083-a3db-616f80ba5dab} - OWML.ModHelper.Interaction - - - {b874cc24-8340-4238-ac9d-1bfb41186bb5} - OWML.ModHelper.Menus - - - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030} - OWML.Utils - + + + + + - - - - - - \ No newline at end of file + + diff --git a/src/OWML.ModHelper/OWML.ModHelper.csproj.DotSettings b/src/OWML.ModHelper/OWML.ModHelper.csproj.DotSettings deleted file mode 100644 index 644ace30..00000000 --- a/src/OWML.ModHelper/OWML.ModHelper.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - True \ No newline at end of file diff --git a/src/OWML.ModHelper/OWML.ModHelper.nuspec b/src/OWML.ModHelper/OWML.ModHelper.nuspec index 85fcbd0b..265d4f1e 100644 --- a/src/OWML.ModHelper/OWML.ModHelper.nuspec +++ b/src/OWML.ModHelper/OWML.ModHelper.nuspec @@ -1,4 +1,4 @@ - + OWML @@ -21,15 +21,14 @@ - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/OWML.ModHelper/Properties/AssemblyInfo.cs b/src/OWML.ModHelper/Properties/AssemblyInfo.cs deleted file mode 100644 index 237fa35f..00000000 --- a/src/OWML.ModHelper/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModHelper")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.ModHelper")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cb57bab8-d70e-4fce-9bf1-328a924173a7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.ModHelper/packages.config b/src/OWML.ModHelper/packages.config deleted file mode 100644 index 1d82139f..00000000 --- a/src/OWML.ModHelper/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/OWML.ModLoader/ModData.cs b/src/OWML.ModLoader/ModData.cs index 1c418c40..d7dec09e 100644 --- a/src/OWML.ModLoader/ModData.cs +++ b/src/OWML.ModLoader/ModData.cs @@ -35,10 +35,10 @@ public ModData(IModManifest manifest, IModConfig config, IModConfig defaultConfi UpdateSnapshot(); } - public void UpdateSnapshot() => + public void UpdateSnapshot() => _configSnapshot = Config != null ? Config.Copy() : DefaultConfig.Copy(); - public void ResetConfigToDefaults() => + public void ResetConfigToDefaults() => Config = DefaultConfig.Copy(); public bool FixConfigs() @@ -133,7 +133,8 @@ setting is JObject settingObject private bool IsSettingSameType(object settingValue1, object settingValue2) => settingValue1.GetType() == settingValue2.GetType() && - (!(settingValue1 is JObject obj1) || !(settingValue2 is JObject obj2) || + (settingValue1 is not JObject obj1 || + settingValue2 is not JObject obj2 || (string)obj1["type"] == (string)obj2["type"]); } } diff --git a/src/OWML.ModLoader/ModLoader.cs b/src/OWML.ModLoader/ModLoader.cs index 1b25cc1a..e3ceda24 100644 --- a/src/OWML.ModLoader/ModLoader.cs +++ b/src/OWML.ModLoader/ModLoader.cs @@ -57,6 +57,7 @@ public static Container CreateContainer(IApplicationHelper appHelper, IGameObjec .Add() .Add() .Add() + .Add() .Add() .Add() .Add() diff --git a/src/OWML.ModLoader/OWML.ModLoader.csproj b/src/OWML.ModLoader/OWML.ModLoader.csproj index e7068307..3cf46c41 100644 --- a/src/OWML.ModLoader/OWML.ModLoader.csproj +++ b/src/OWML.ModLoader/OWML.ModLoader.csproj @@ -1,138 +1,13 @@ - - - + + - Debug - AnyCPU - {D075D13C-990A-46A2-B596-4600A3411BD5} - Library - Properties - OWML.ModLoader - OWML.ModLoader - v3.5 - 512 - true - + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - - - - - - - - - - - - {F30E9352-0578-4775-A006-2501FCB35462} - OWML.Abstractions - - - {3c00626f-b688-4f32-b493-5b7ec1c879a0} - OWML.Common - - - {6F14D39C-5747-4149-BE4D-365B43918A0A} - OWML.Logging - - - {A62856BD-D06C-4F2C-86E8-91C6FDF8F8D5} - OWML.ModHelper.Assets - - - {B771615E-6B51-44F8-B862-D7543C12C0FF} - OWML.ModHelper.Events - - - {be89bac0-91ff-4558-b093-79328d18ab30} - OWML.ModHelper.Input - - - {3212C570-D4C3-4083-A3DB-616F80BA5DAB} - OWML.ModHelper.Interaction - - - {b874cc24-8340-4238-ac9d-1bfb41186bb5} - OWML.ModHelper.Menus - - - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7} - OWML.ModHelper - - - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030} - OWML.Utils - - + - + + - - \ No newline at end of file + + diff --git a/src/OWML.ModLoader/Properties/AssemblyInfo.cs b/src/OWML.ModLoader/Properties/AssemblyInfo.cs deleted file mode 100644 index 49454e2a..00000000 --- a/src/OWML.ModLoader/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModLoader")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.ModLoader")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d075d13c-990a-46a2-b596-4600a3411bd5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.ModLoader/packages.config b/src/OWML.ModLoader/packages.config deleted file mode 100644 index 1d82139f..00000000 --- a/src/OWML.ModLoader/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/OWML.Patcher/OWML.Patcher.csproj b/src/OWML.Patcher/OWML.Patcher.csproj index 73d2fa24..21f6663b 100644 --- a/src/OWML.Patcher/OWML.Patcher.csproj +++ b/src/OWML.Patcher/OWML.Patcher.csproj @@ -1,78 +1,30 @@ - - - + + - Debug - AnyCPU - {5153D37F-3148-45DE-B1A4-7EBF87965569} - Library - Properties - OWML.Patcher - OWML.Patcher - v4.7.2 - 512 - true - + net48 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - False - dnpatch\dnlib.dll - - - False - dnpatch\dnpatch.dll - - - - + - - - - - - - + + - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {D075D13C-990A-46A2-B596-4600A3411BD5} - OWML.ModLoader - + + lib\dnlib.dll + + + lib\dnpatch.dll + + - - - + Always - + Always - - \ No newline at end of file + + diff --git a/src/OWML.Patcher/Properties/AssemblyInfo.cs b/src/OWML.Patcher/Properties/AssemblyInfo.cs deleted file mode 100644 index 8630ee14..00000000 --- a/src/OWML.Patcher/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Patcher")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.Patcher")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5153d37f-3148-45de-b1a4-7ebf87965569")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.Utils/OWML.Utils.csproj b/src/OWML.Utils/OWML.Utils.csproj index 72300d41..197bd86d 100644 --- a/src/OWML.Utils/OWML.Utils.csproj +++ b/src/OWML.Utils/OWML.Utils.csproj @@ -1,58 +1,13 @@ - - - + + - Debug - AnyCPU - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030} - Library - Properties - OWML.Utils - OWML.Utils - v3.5 - 512 - true + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll - - - ..\..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll - - - ..\..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll - - - ..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - - - - - - - - - + - + + - - \ No newline at end of file + + diff --git a/src/OWML.Utils/Properties/AssemblyInfo.cs b/src/OWML.Utils/Properties/AssemblyInfo.cs deleted file mode 100644 index 83e9b07b..00000000 --- a/src/OWML.Utils/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Utils")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.Utils")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cc1a74b8-7068-4cd9-8aa4-c5270aaea030")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OWML.Utils/TypeExtensions.cs b/src/OWML.Utils/TypeExtensions.cs index d8c1c916..ffff2fbb 100644 --- a/src/OWML.Utils/TypeExtensions.cs +++ b/src/OWML.Utils/TypeExtensions.cs @@ -18,18 +18,13 @@ public static MemberInfo GetAnyMember(this Type type, string name) => type.BaseType?.GetMember(name, Flags).FirstOrDefault() ?? type.BaseType?.BaseType?.GetMember(name, Flags).FirstOrDefault(); - public static T GetValue(this object obj, string name) - { - switch (obj.GetType().GetAnyMember(name)) + public static T GetValue(this object obj, string name) => + obj.GetType().GetAnyMember(name) switch { - case FieldInfo field: - return (T)field.GetValue(obj); - case PropertyInfo property: - return (T)property.GetValue(obj, null); - default: - return default; - } - } + FieldInfo field => (T) field.GetValue(obj), + PropertyInfo property => (T) property.GetValue(obj, null), + _ => default + }; public static void SetValue(this object obj, string name, object value) { diff --git a/src/OWML.Utils/packages.config b/src/OWML.Utils/packages.config deleted file mode 100644 index 1c6682e2..00000000 --- a/src/OWML.Utils/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/SampleMods/OWML.EnableDebugMode/EnableDebugMode.cs b/src/SampleMods/OWML.EnableDebugMode/EnableDebugMode.cs index 5cf48f1a..b169f4b2 100644 --- a/src/SampleMods/OWML.EnableDebugMode/EnableDebugMode.cs +++ b/src/SampleMods/OWML.EnableDebugMode/EnableDebugMode.cs @@ -11,7 +11,7 @@ public class EnableDebugMode : ModBehaviour private int _renderValue; private bool _isStarted; private PlayerSpawner _playerSpawner; - private readonly Dictionary _inputs = new Dictionary(); + private readonly Dictionary _inputs = new(); public override void Configure(IModConfig config) { @@ -29,7 +29,7 @@ public override void Configure(IModConfig config) } } - private void Start() + public void Start() { ModHelper.Console.WriteLine($"In {nameof(EnableDebugMode)}!", MessageType.Info); ModHelper.HarmonyHelper.EmptyMethod("Awake"); @@ -46,7 +46,7 @@ private void OnEvent(MonoBehaviour behaviour, Events ev) } } - private void Update() + public void Update() { if (!_isStarted) { @@ -112,6 +112,5 @@ private void WarpTo(SpawnLocation location) ModHelper.Console.WriteLine($"Warping to {location}!"); _playerSpawner.DebugWarp(_playerSpawner.GetSpawnPoint(location)); } - } } diff --git a/src/SampleMods/OWML.EnableDebugMode/OWML.EnableDebugMode.csproj b/src/SampleMods/OWML.EnableDebugMode/OWML.EnableDebugMode.csproj index 3d979416..b8270d84 100644 --- a/src/SampleMods/OWML.EnableDebugMode/OWML.EnableDebugMode.csproj +++ b/src/SampleMods/OWML.EnableDebugMode/OWML.EnableDebugMode.csproj @@ -1,153 +1,21 @@ - - - + + - Debug - AnyCPU - {6155732E-89B0-4D1E-A76B-229C056AE1E9} - Library - Properties - OWML.EnableDebugMode - OWML.EnableDebugMode - v3.5 - 512 - true + net35 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\..\packages\Lib.Harmony.1.2.0.1\lib\net35\0Harmony.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - - + - - + + - + Always - + Always - - - - {3c00626f-b688-4f32-b493-5b7ec1c879a0} - OWML.Common - False - - - {6f14d39c-5747-4149-be4d-365b43918a0a} - OWML.Logging - False - - - {a62856bd-d06c-4f2c-86e8-91c6fdf8f8d5} - OWML.ModHelper.Assets - False - - - {b771615e-6b51-44f8-b862-d7543c12c0ff} - OWML.ModHelper.Events - False - - - {be89bac0-91ff-4558-b093-79328d18ab30} - OWML.ModHelper.Input - False - - - {3212c570-d4c3-4083-a3db-616f80ba5dab} - OWML.ModHelper.Interaction - False - - - {b874cc24-8340-4238-ac9d-1bfb41186bb5} - OWML.ModHelper.Menus - False - - - {cb57bab8-d70e-4fce-9bf1-328a924173a7} - OWML.ModHelper - False - - - {cc1a74b8-7068-4cd9-8aa4-c5270aaea030} - OWML.Utils - False - - - - - - - - \ No newline at end of file + + diff --git a/src/SampleMods/OWML.EnableDebugMode/Properties/AssemblyInfo.cs b/src/SampleMods/OWML.EnableDebugMode/Properties/AssemblyInfo.cs deleted file mode 100644 index 54d7e0c0..00000000 --- a/src/SampleMods/OWML.EnableDebugMode/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.EnableDebugMode")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Alek")] -[assembly: AssemblyProduct("OWML.EnableDebugMode")] -[assembly: AssemblyCopyright("Copyright © Alek 2019-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6155732e-89b0-4d1e-a76b-229c056ae1e9")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/SampleMods/OWML.EnableDebugMode/packages.config b/src/SampleMods/OWML.EnableDebugMode/packages.config deleted file mode 100644 index 2e4c3ac3..00000000 --- a/src/SampleMods/OWML.EnableDebugMode/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/SampleMods/OWML.LoadCustomAssets/LoadCustomAssets.cs b/src/SampleMods/OWML.LoadCustomAssets/LoadCustomAssets.cs index a9724b4e..914bbb22 100644 --- a/src/SampleMods/OWML.LoadCustomAssets/LoadCustomAssets.cs +++ b/src/SampleMods/OWML.LoadCustomAssets/LoadCustomAssets.cs @@ -26,9 +26,9 @@ private enum ABC private bool _isDucksEnabled; private bool _isCubesEnabled; - private readonly List _ducks = new List(); + private readonly List _ducks = new(); - private void Start() + public void Start() { ModHelper.Console.WriteLine($"In {nameof(LoadCustomAssets)}!", MessageType.Info); _saveFile = ModHelper.Storage.Load("savefile.json"); @@ -117,7 +117,7 @@ private void OnCompleteSceneChange(OWScene oldScene, OWScene newScene) ToggleMusic(ModHelper.Config.GetSettingsValue("enableMusic")); } - private void Update() + public void Update() { if (Input.GetKeyDown(KeyCode.F9)) { @@ -180,6 +180,5 @@ private void ToggleMusic(bool enable) _music.Stop(); } } - } } diff --git a/src/SampleMods/OWML.LoadCustomAssets/OWML.LoadCustomAssets.csproj b/src/SampleMods/OWML.LoadCustomAssets/OWML.LoadCustomAssets.csproj index d5feb2a9..8d9f4a16 100644 --- a/src/SampleMods/OWML.LoadCustomAssets/OWML.LoadCustomAssets.csproj +++ b/src/SampleMods/OWML.LoadCustomAssets/OWML.LoadCustomAssets.csproj @@ -1,171 +1,54 @@ - - - + + - Debug - AnyCPU - {EC1DFA4B-D824-40FB-BF99-2B722BC1FAF6} - Library - Properties - OWML.LoadCustomAssets - OWML.LoadCustomAssets - v3.5 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net35 + 9.0 + + + + + + + - - ..\..\..\packages\Lib.Harmony.1.2.0.1\lib\net35\0Harmony.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - False - - - ..\..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - False - - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - False - - - ..\..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - False - + + Always + + + Always + + + Always + + - - - + + - + Always - + Always - + Always - + Always - + Always - + Always - + Always - - - - - Always - - - Always - - - Always - - - - - {3c00626f-b688-4f32-b493-5b7ec1c879a0} - OWML.Common - False - - - {6f14d39c-5747-4149-be4d-365b43918a0a} - OWML.Logging - False - - - {a62856bd-d06c-4f2c-86e8-91c6fdf8f8d5} - OWML.ModHelper.Assets - False - - - {b771615e-6b51-44f8-b862-d7543c12c0ff} - OWML.ModHelper.Events - False - - - {be89bac0-91ff-4558-b093-79328d18ab30} - OWML.ModHelper.Input - False - - - {3212c570-d4c3-4083-a3db-616f80ba5dab} - OWML.ModHelper.Interaction - False - - - {b874cc24-8340-4238-ac9d-1bfb41186bb5} - OWML.ModHelper.Menus - False - - - {cb57bab8-d70e-4fce-9bf1-328a924173a7} - OWML.ModHelper - False - - - \ No newline at end of file + + diff --git a/src/SampleMods/OWML.LoadCustomAssets/Properties/AssemblyInfo.cs b/src/SampleMods/OWML.LoadCustomAssets/Properties/AssemblyInfo.cs deleted file mode 100644 index c864d42b..00000000 --- a/src/SampleMods/OWML.LoadCustomAssets/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Load3DModel")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OWML.Load3DModel")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ec1dfa4b-d824-40fb-bf99-2b722bc1faf6")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/SampleMods/OWML.LoadCustomAssets/packages.config b/src/SampleMods/OWML.LoadCustomAssets/packages.config deleted file mode 100644 index 2e4c3ac3..00000000 --- a/src/SampleMods/OWML.LoadCustomAssets/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/OWML.GameFinder.Tests/EpicGameFinderTests.cs b/tests/OWML.GameFinder.Tests/EpicGameFinderTests.cs new file mode 100644 index 00000000..6fd32c54 --- /dev/null +++ b/tests/OWML.GameFinder.Tests/EpicGameFinderTests.cs @@ -0,0 +1,26 @@ +using System.IO; +using OWML.Common; +using OWML.Tests.Setup; +using Xunit; +using Xunit.Abstractions; + +namespace OWML.GameFinder.Tests +{ + public class EpicGameFinderTests : OWMLTests + { + public EpicGameFinderTests(ITestOutputHelper outputHelper) + : base(outputHelper) + { + } + + [Fact] + public void EpicGameFinder_FindGamePath() + { + var pathFinder = new EpicGameFinder(new OwmlConfig(), Console.Object); + + var gamePath = pathFinder.FindGamePath(); + + Assert.Equal(new DirectoryInfo(Config.GamePath).FullName, new DirectoryInfo(gamePath).FullName); + } + } +} diff --git a/tests/OWML.GameFinder.Tests/GameFinderTests.cs b/tests/OWML.GameFinder.Tests/GameFinderTests.cs index e41bb5b6..116792c3 100644 --- a/tests/OWML.GameFinder.Tests/GameFinderTests.cs +++ b/tests/OWML.GameFinder.Tests/GameFinderTests.cs @@ -6,7 +6,7 @@ namespace OWML.GameFinder.Tests { - public class GameFinderTests : OWMLTests // todo test steam finder, epic finder etc + public class GameFinderTests : OWMLTests { public GameFinderTests(ITestOutputHelper outputHelper) : base(outputHelper) diff --git a/tests/OWML.GameFinder.Tests/OWML.GameFinder.Tests.csproj b/tests/OWML.GameFinder.Tests/OWML.GameFinder.Tests.csproj index 09f35f96..cbfbb900 100644 --- a/tests/OWML.GameFinder.Tests/OWML.GameFinder.Tests.csproj +++ b/tests/OWML.GameFinder.Tests/OWML.GameFinder.Tests.csproj @@ -1,99 +1,22 @@ - - - - - + + - Debug - AnyCPU - {2C1AB98A-B0EB-4E06-B006-6D3855DDB6E1} - Library - Properties - OWML.GameFinder.Tests - OWML.GameFinder.Tests - v4.7.2 - 512 - true - - + net48 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\..\packages\Moq.4.15.2\lib\net45\Moq.dll - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {A3D507F5-22A2-4A18-B529-868FE8D59CF3} - OWML.GameFinder - - - {13F31207-D421-4B53-A8A2-8D690019AE2E} - OWML.Tests.Setup - - + - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file + + diff --git a/tests/OWML.GameFinder.Tests/Properties/AssemblyInfo.cs b/tests/OWML.GameFinder.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 80ba6104..00000000 --- a/tests/OWML.GameFinder.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.GameFinder.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OWML.GameFinder.Tests")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("2c1ab98a-b0eb-4e06-b006-6d3855ddb6e1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/OWML.GameFinder.Tests/packages.config b/tests/OWML.GameFinder.Tests/packages.config deleted file mode 100644 index d9511324..00000000 --- a/tests/OWML.GameFinder.Tests/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/OWML.Launcher.Tests/LauncherTests.cs b/tests/OWML.Launcher.Tests/LauncherTests.cs index 3163adf5..76b894b4 100644 --- a/tests/OWML.Launcher.Tests/LauncherTests.cs +++ b/tests/OWML.Launcher.Tests/LauncherTests.cs @@ -28,24 +28,5 @@ public void Run_StartsGame() processHelper.Verify(s => s.Start(Config.ExePath, new string[] { }), Times.Once); } - - [Fact] - public void Run_OldVersion_StartsGame() - { - Config.GamePath = "C:/Program Files (x86)/Outer Wilds"; - - var processHelper = new Mock(); - - var container = Program.CreateContainer(new[] { "-consolePort", "1337" }); - container.Add(processHelper.Object); - container.Add(Console.Object); - container.Add(Logger.Object); - container.Add(Config); - - var app = container.Resolve(); - app.Run(); - - processHelper.Verify(s => s.Start(Config.ExePath, new string[] { }), Times.Once); - } } } diff --git a/tests/OWML.Launcher.Tests/OWML.Launcher.Tests.csproj b/tests/OWML.Launcher.Tests/OWML.Launcher.Tests.csproj index b88a8539..0f0e9cbc 100644 --- a/tests/OWML.Launcher.Tests/OWML.Launcher.Tests.csproj +++ b/tests/OWML.Launcher.Tests/OWML.Launcher.Tests.csproj @@ -1,108 +1,22 @@ - - - - - + + - Debug - AnyCPU - {04A652D4-416F-4538-9795-8AD10C09A940} - Library - Properties - OWML.Launcher.Tests - OWML.Launcher.Tests - v4.7.2 - 512 - true - - - + net48 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\..\packages\Moq.4.15.2\lib\net45\Moq.dll - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - - - + - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {9C09F86B-0C03-4630-8424-B939D3C632D0} - OWML.Launcher - - - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030} - OWML.Utils - - - {13F31207-D421-4B53-A8A2-8D690019AE2E} - OWML.Tests.Setup - + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file + + diff --git a/tests/OWML.Launcher.Tests/Properties/AssemblyInfo.cs b/tests/OWML.Launcher.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index b908035f..00000000 --- a/tests/OWML.Launcher.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Launcher.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OWML.Launcher.Tests")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("04a652d4-416f-4538-9795-8ad10c09a940")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/OWML.Launcher.Tests/ReleaseTests.cs b/tests/OWML.Launcher.Tests/ReleaseTests.cs index 1952f244..41769608 100644 --- a/tests/OWML.Launcher.Tests/ReleaseTests.cs +++ b/tests/OWML.Launcher.Tests/ReleaseTests.cs @@ -49,7 +49,11 @@ public void ReleaseContainsAllFiles() "openvr_api.dll", "OVRPlugin.dll" }); - + } + + [Fact] + public void ReleaseContainsAllModFiles() + { Directory.CreateDirectory($"{OwmlReleasePath}/Logs"); Directory.CreateDirectory($"{OwmlReleasePath}/Mods"); CopyMod("OWML.EnableDebugMode"); @@ -81,14 +85,13 @@ public void ReleaseContainsAllFiles() [Fact] public void ReleaseDoesNotContainGameFiles() { - Assert.NotEmpty(Directory.GetFiles(OwmlReleasePath, "OWML*.dll", SearchOption.AllDirectories)); Assert.Empty(Directory.GetFiles(OwmlReleasePath, "UnityEngine*.dll", SearchOption.AllDirectories)); Assert.Empty(Directory.GetFiles(OwmlReleasePath, "Assembly-CSharp.dll", SearchOption.AllDirectories)); } private void CopyMod(string modName) { - var fromModPath = $"{OwmlSolutionPath}/src/SampleMods/{modName}/bin/Debug"; + var fromModPath = $"{OwmlSolutionPath}/src/SampleMods/{modName}/bin/Debug/net35"; var toModPath = $"{OwmlReleasePath}/Mods/{modName}"; Directory.CreateDirectory(toModPath); var modFiles = Directory.GetFiles(fromModPath); diff --git a/tests/OWML.Launcher.Tests/app.config b/tests/OWML.Launcher.Tests/app.config deleted file mode 100644 index a7aa798d..00000000 --- a/tests/OWML.Launcher.Tests/app.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/OWML.Launcher.Tests/packages.config b/tests/OWML.Launcher.Tests/packages.config deleted file mode 100644 index d9511324..00000000 --- a/tests/OWML.Launcher.Tests/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/OWML.ModFinder.Tests/OWML.ModFinder.Tests.csproj b/tests/OWML.ModFinder.Tests/OWML.ModFinder.Tests.csproj index a5c14a65..67ae8641 100644 --- a/tests/OWML.ModFinder.Tests/OWML.ModFinder.Tests.csproj +++ b/tests/OWML.ModFinder.Tests/OWML.ModFinder.Tests.csproj @@ -1,99 +1,22 @@ - - - - - + + - Debug - AnyCPU - {30C84B7F-ED70-413F-8224-2BCF433213A5} - Library - Properties - OWML.ModFinder.Tests - OWML.ModFinder.Tests - v4.7.2 - 512 - true - - + net48 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\..\packages\Moq.4.15.2\lib\net45\Moq.dll - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {D075D13C-990A-46A2-B596-4600A3411BD5} - OWML.ModLoader - - - {13F31207-D421-4B53-A8A2-8D690019AE2E} - OWML.Tests.Setup - - + - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file + + diff --git a/tests/OWML.ModFinder.Tests/Properties/AssemblyInfo.cs b/tests/OWML.ModFinder.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 0cc0c985..00000000 --- a/tests/OWML.ModFinder.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModFinder.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OWML.ModFinder.Tests")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("30c84b7f-ed70-413f-8224-2bcf433213a5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/OWML.ModFinder.Tests/packages.config b/tests/OWML.ModFinder.Tests/packages.config deleted file mode 100644 index d9511324..00000000 --- a/tests/OWML.ModFinder.Tests/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/OWML.ModLoader.Tests/ModLoaderTests.cs b/tests/OWML.ModLoader.Tests/ModLoaderTests.cs index 9fabb874..9340f025 100644 --- a/tests/OWML.ModLoader.Tests/ModLoaderTests.cs +++ b/tests/OWML.ModLoader.Tests/ModLoaderTests.cs @@ -22,19 +22,5 @@ public void ModLoader_LoadMods() var owo = container.Resolve(); owo.LoadMods(); } - - [Fact] - public void ModLoader_OldVersion_LoadMods() - { - Config.GamePath = "C:/Program Files (x86)/Outer Wilds"; - - var container = ModLoader.CreateContainer(AppHelper.Object, GOHelper.Object); - container.Add(Console.Object); - container.Add(Logger.Object); - container.Add(Config); - - var owo = container.Resolve(); - owo.LoadMods(); - } } } diff --git a/tests/OWML.ModLoader.Tests/OWML.ModLoader.Tests.csproj b/tests/OWML.ModLoader.Tests/OWML.ModLoader.Tests.csproj index 34d95b61..67ae8641 100644 --- a/tests/OWML.ModLoader.Tests/OWML.ModLoader.Tests.csproj +++ b/tests/OWML.ModLoader.Tests/OWML.ModLoader.Tests.csproj @@ -1,150 +1,22 @@ - - - - - + + - Debug - AnyCPU - {C9520FE4-2E02-4671-A832-0A0AA3833636} - Library - Properties - OWML.ModLoader.Tests - OWML.ModLoader.Tests - v4.7.2 - 512 - true - - - + net48 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll - True - - - ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\..\packages\Moq.4.15.2\lib\net45\Moq.dll - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll - True - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll - True - - - ..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll - True - - - ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - + - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {d075d13c-990a-46a2-b596-4600a3411bd5} - OWML.ModLoader - - - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030} - OWML.Utils - - - {13F31207-D421-4B53-A8A2-8D690019AE2E} - OWML.Tests.Setup - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file + + diff --git a/tests/OWML.ModLoader.Tests/Properties/AssemblyInfo.cs b/tests/OWML.ModLoader.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 5a96b4a9..00000000 --- a/tests/OWML.ModLoader.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModLoader.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OWML.ModLoader.Tests")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c9520fe4-2e02-4671-a832-0a0aa3833636")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/OWML.ModLoader.Tests/packages.config b/tests/OWML.ModLoader.Tests/packages.config deleted file mode 100644 index 2df56abd..00000000 --- a/tests/OWML.ModLoader.Tests/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/OWML.Tests.Setup/OWML.Tests.Setup.csproj b/tests/OWML.Tests.Setup/OWML.Tests.Setup.csproj index a08da760..5404be00 100644 --- a/tests/OWML.Tests.Setup/OWML.Tests.Setup.csproj +++ b/tests/OWML.Tests.Setup/OWML.Tests.Setup.csproj @@ -1,95 +1,21 @@ - - - - - + + - Debug - AnyCPU - {13F31207-D421-4B53-A8A2-8D690019AE2E} - Library - Properties - OWML.Tests.Setup - OWML.Tests.Setup - v4.7.2 - 512 - true - - + net48 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\..\packages\Moq.4.15.2\lib\net45\Moq.dll - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - + - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - {3C00626F-B688-4F32-B493-5B7EC1C879A0} - OWML.Common - - - {CC1A74B8-7068-4CD9-8AA4-C5270AAEA030} - OWML.Utils - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file + + diff --git a/tests/OWML.Tests.Setup/OWMLTests.cs b/tests/OWML.Tests.Setup/OWMLTests.cs index 6511dd25..d54eebbe 100644 --- a/tests/OWML.Tests.Setup/OWMLTests.cs +++ b/tests/OWML.Tests.Setup/OWMLTests.cs @@ -2,7 +2,6 @@ using System.IO; using Moq; using OWML.Common; -using OWML.Utils; using Xunit; using Xunit.Abstractions; @@ -12,26 +11,31 @@ public class OWMLTests { protected string OwmlSolutionPath => GetSolutionPath(); - protected string OwmlReleasePath => $"{OwmlSolutionPath}/src/OWML.Launcher/bin/Debug/"; + protected string OwmlReleasePath => $"{OwmlSolutionPath}/src/OWML.Launcher/bin/Debug/net48/"; - protected Mock Console { get; } = new Mock(); + protected Mock Console { get; } = new(); - protected Mock Logger { get; } = new Mock(); + protected Mock Logger { get; } = new(); - protected Mock AppHelper { get; } = new Mock(); + protected Mock AppHelper { get; } = new(); - protected Mock GOHelper { get; } = new Mock(); + protected Mock GOHelper { get; } = new(); protected IOwmlConfig Config { get; } = new OwmlConfig(); + private const string GamePath = "C:/Program Files/Epic Games/OuterWilds"; + private readonly ITestOutputHelper _outputHelper; public OWMLTests(ITestOutputHelper outputHelper) { _outputHelper = outputHelper; + Config.OWMLPath = OwmlReleasePath; + Config.GamePath = GamePath; + AppHelper.Setup(s => s.DataPath) - .Returns(() => "C:/Program Files/Epic Games/OuterWilds/OuterWilds_Data"); + .Returns(() => $"{GamePath}/OuterWilds_Data"); AppHelper.Setup(s => s.Version) .Returns(() => "1.3.3.7"); @@ -56,16 +60,10 @@ public OWMLTests(ITestOutputHelper outputHelper) .Returns(() => new Mock().Object); GOHelper.Setup(s => s.CreateAndAdd(It.IsAny())) .Returns(() => new Mock().Object); - - Config.OWMLPath = OwmlReleasePath; - Config.GamePath = "C:/Program Files/Epic Games/OuterWilds"; } - private string GetSolutionPath() - { - var currentFolder = Directory.GetCurrentDirectory(); - return Directory.GetParent(currentFolder).Parent.Parent.Parent.FullName; - } + private string GetSolutionPath() => + Directory.GetParent(Directory.GetCurrentDirectory()).Parent.Parent.Parent.Parent.FullName; private void WriteLine(string s) { diff --git a/tests/OWML.Tests.Setup/Properties/AssemblyInfo.cs b/tests/OWML.Tests.Setup/Properties/AssemblyInfo.cs deleted file mode 100644 index 07db3268..00000000 --- a/tests/OWML.Tests.Setup/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.Tests.Setup")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OWML.Tests.Setup")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("13f31207-d421-4b53-a8a2-8d690019ae2e")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/OWML.Tests.Setup/packages.config b/tests/OWML.Tests.Setup/packages.config deleted file mode 100644 index d9511324..00000000 --- a/tests/OWML.Tests.Setup/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/OWML.Utils.Tests/OWML.Utils.Tests.csproj b/tests/OWML.Utils.Tests/OWML.Utils.Tests.csproj index ba86d947..42e55037 100644 --- a/tests/OWML.Utils.Tests/OWML.Utils.Tests.csproj +++ b/tests/OWML.Utils.Tests/OWML.Utils.Tests.csproj @@ -1,99 +1,22 @@ - - - - - + + - Debug - AnyCPU - {A80BBC66-185F-4915-B80B-3860D6C62FA6} - Library - Properties - OWML.ModHelper.Events.Tests - OWML.ModHelper.Events.Tests - v4.7.2 - 512 - true - - + net48 + 9.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\..\packages\Moq.4.15.2\lib\net45\Moq.dll - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - {CB57BAB8-D70E-4FCE-9BF1-328A924173A7} - OWML.ModHelper - - - {cc1a74b8-7068-4cd9-8aa4-c5270aaea030} - OWML.Utils - - - {13F31207-D421-4B53-A8A2-8D690019AE2E} - OWML.Tests.Setup - - + - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file + + diff --git a/tests/OWML.Utils.Tests/Properties/AssemblyInfo.cs b/tests/OWML.Utils.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index dcfdb5a0..00000000 --- a/tests/OWML.Utils.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OWML.ModHelper.Events.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OWML.ModHelper.Events.Tests")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a80bbc66-185f-4915-b80b-3860d6c62fa6")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/OWML.Utils.Tests/TypeExtensionTests.cs b/tests/OWML.Utils.Tests/TypeExtensionTests.cs index 55f8a5b4..b49a5c1a 100644 --- a/tests/OWML.Utils.Tests/TypeExtensionTests.cs +++ b/tests/OWML.Utils.Tests/TypeExtensionTests.cs @@ -1,9 +1,9 @@ -using OWML.Tests.Setup; -using OWML.Utils; +using OWML.ModHelper; +using OWML.Tests.Setup; using Xunit; using Xunit.Abstractions; -namespace OWML.ModHelper.Events.Tests +namespace OWML.Utils.Tests { public class TypeExtensionTests : OWMLTests { diff --git a/tests/OWML.Utils.Tests/packages.config b/tests/OWML.Utils.Tests/packages.config deleted file mode 100644 index d9511324..00000000 --- a/tests/OWML.Utils.Tests/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file