Merge pull request #25 from chi-rei-den/squid

Add Squid the new UI

.github/workflows/build.yml

@@ -1,12 +1,14 @@
 name: Mod Build
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v1
+        with:
+          submodules: recursive
 
       - name: Install NuGet client
         uses: warrenbuckley/Setup-Nuget@v1
@@ -16,44 +18,18 @@ jobs:
         with:
           command: setup
 
-      - name: Add reference search path
-        run: Get-ChildItem -Directory | ForEach-Object { Copy reference.xml "$($_.FullName)\$($_.Name).csproj.user" }
-
       - name: Restore NuGet Packages
         run: nuget restore Localizer.sln
 
-      - name: Release build
-        run: '& "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" Localizer.sln /p:Configuration=Release /p:Platform=x86'
-
-      - name: Clean binary
-        run: |
-          del ".\Localizer\Plugins\*.pdb"
-          del ".\Localizer\Plugins\*.dll.config"
-          del ".\Localizer\Plugins\*.xml"
-          del ".\Localizer\Plugins\Terraria.exe"
-          del ".\Localizer\Plugins\TerrariaHooks.dll"
-          del ".\Localizer\Plugins\Steamworks.NET.dll"
-          del ".\Localizer\Plugins\ReLogic.dll"
-          del ".\Localizer\Plugins\Ninject.dll"
-          del ".\Localizer\Plugins\Newtonsoft.Json.dll"
-          del ".\Localizer\Plugins\MonoMod.*.dll"
-          del ".\Localizer\Plugins\Mono.Cecil.dll"
-          del ".\Localizer\Plugins\log4net.dll"
-          del ".\Localizer\Plugins\Localizer.dll"
-          del ".\Localizer\Plugins\0Harmony.dll"
-          del ".\Localizer\Plugins\System.*.dll"
-          del ".\Localizer\Plugins\Microsoft.Xna.*.dll"
-
       - name: Build Mod
-        uses: chi-rei-den/ModLoaderTools@v1
-        with:
-          command: build
-          path: Localizer
+        run: |
+          & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" Localizer.sln /p:Configuration=Release /p:Platform=x86
 
       - name: Patch Mod
         run: '& "$ENV:GITHUB_WORKSPACE\ModPatch\bin\Release\ModPatch.exe"'
 
       - name: Publish Mod
+        if: github.ref == 'refs/heads/master'
         uses: chi-rei-den/ModLoaderTools@v1
         with:
           command: publish
@@ -71,4 +47,7 @@ jobs:
       - uses: actions/upload-artifact@master
         with:
           name: Build Artifact
-          path: Artifact
+          path: Artifact
+
+      - name: Run Tests
+        run: '& "$ENV:UserProfile\.nuget\packages\xunit.runner.console\2.4.1\tools\net472\xunit.console.x86.exe" ".\LocalizerTest\bin\Release\LocalizerTest.dll"'

.gitignore

@@ -261,4 +261,6 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
+
 /Localizer/Plugins
+/Localizer/lib

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Squid"]
+	path = Squid
+	url = https://github.com/chi-rei-den/Squid

Localizer.sln

@@ -4,17 +4,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.0.29324.140
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Localizer", "Localizer\Localizer.csproj", "{95D54B28-B67B-4248-B83A-B5E5426C3806}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalizerWPF", "LocalizerWPF\LocalizerWPF.csproj", "{CFBF9137-ECC6-4771-96E2-F7C93C40F085}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher\Launcher.csproj", "{047C62F2-9E0F-4560-9923-DC5D0FE28B7F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D05E5CFB-866F-43D1-BBFE-7CA84249CF36} = {D05E5CFB-866F-43D1-BBFE-7CA84249CF36}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalizerTest", "LocalizerTest\LocalizerTest.csproj", "{019C1A68-7B2C-400C-BCAE-FC9EF658A3BC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModBrowserMirror", "ModBrowserMirror\ModBrowserMirror.csproj", "{4447A29E-2E0A-48DA-AE34-FBF2BD08FF31}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModPatch", "ModPatch\ModPatch.csproj", "{D05E5CFB-866F-43D1-BBFE-7CA84249CF36}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squid", "Squid\Squid.csproj", "{205C6E4A-4F9C-44FE-BB81-48F9914F048F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,30 +28,12 @@ Global
 		{95D54B28-B67B-4248-B83A-B5E5426C3806}.Release|Any CPU.ActiveCfg = Release|x86
 		{95D54B28-B67B-4248-B83A-B5E5426C3806}.Release|x86.ActiveCfg = Release|x86
 		{95D54B28-B67B-4248-B83A-B5E5426C3806}.Release|x86.Build.0 = Release|x86
-		{CFBF9137-ECC6-4771-96E2-F7C93C40F085}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{CFBF9137-ECC6-4771-96E2-F7C93C40F085}.Debug|x86.ActiveCfg = Debug|x86
-		{CFBF9137-ECC6-4771-96E2-F7C93C40F085}.Debug|x86.Build.0 = Debug|x86
-		{CFBF9137-ECC6-4771-96E2-F7C93C40F085}.Release|Any CPU.ActiveCfg = Release|x86
-		{CFBF9137-ECC6-4771-96E2-F7C93C40F085}.Release|x86.ActiveCfg = Release|x86
-		{CFBF9137-ECC6-4771-96E2-F7C93C40F085}.Release|x86.Build.0 = Release|x86
-		{047C62F2-9E0F-4560-9923-DC5D0FE28B7F}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{047C62F2-9E0F-4560-9923-DC5D0FE28B7F}.Debug|x86.ActiveCfg = Debug|x86
-		{047C62F2-9E0F-4560-9923-DC5D0FE28B7F}.Debug|x86.Build.0 = Debug|x86
-		{047C62F2-9E0F-4560-9923-DC5D0FE28B7F}.Release|Any CPU.ActiveCfg = Release|x86
-		{047C62F2-9E0F-4560-9923-DC5D0FE28B7F}.Release|x86.ActiveCfg = Release|x86
-		{047C62F2-9E0F-4560-9923-DC5D0FE28B7F}.Release|x86.Build.0 = Release|x86
 		{019C1A68-7B2C-400C-BCAE-FC9EF658A3BC}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{019C1A68-7B2C-400C-BCAE-FC9EF658A3BC}.Debug|x86.ActiveCfg = Debug|x86
 		{019C1A68-7B2C-400C-BCAE-FC9EF658A3BC}.Debug|x86.Build.0 = Debug|x86
 		{019C1A68-7B2C-400C-BCAE-FC9EF658A3BC}.Release|Any CPU.ActiveCfg = Release|x86
 		{019C1A68-7B2C-400C-BCAE-FC9EF658A3BC}.Release|x86.ActiveCfg = Release|x86
 		{019C1A68-7B2C-400C-BCAE-FC9EF658A3BC}.Release|x86.Build.0 = Release|x86
-		{4447A29E-2E0A-48DA-AE34-FBF2BD08FF31}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4447A29E-2E0A-48DA-AE34-FBF2BD08FF31}.Debug|x86.ActiveCfg = Release|x86
-		{4447A29E-2E0A-48DA-AE34-FBF2BD08FF31}.Debug|x86.Build.0 = Release|x86
-		{4447A29E-2E0A-48DA-AE34-FBF2BD08FF31}.Release|Any CPU.ActiveCfg = Release|x86
-		{4447A29E-2E0A-48DA-AE34-FBF2BD08FF31}.Release|x86.ActiveCfg = Release|x86
-		{4447A29E-2E0A-48DA-AE34-FBF2BD08FF31}.Release|x86.Build.0 = Release|x86
 		{D05E5CFB-866F-43D1-BBFE-7CA84249CF36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D05E5CFB-866F-43D1-BBFE-7CA84249CF36}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D05E5CFB-866F-43D1-BBFE-7CA84249CF36}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -61,6 +42,14 @@ Global
 		{D05E5CFB-866F-43D1-BBFE-7CA84249CF36}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D05E5CFB-866F-43D1-BBFE-7CA84249CF36}.Release|x86.ActiveCfg = Release|Any CPU
 		{D05E5CFB-866F-43D1-BBFE-7CA84249CF36}.Release|x86.Build.0 = Release|Any CPU
+		{205C6E4A-4F9C-44FE-BB81-48F9914F048F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{205C6E4A-4F9C-44FE-BB81-48F9914F048F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{205C6E4A-4F9C-44FE-BB81-48F9914F048F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{205C6E4A-4F9C-44FE-BB81-48F9914F048F}.Debug|x86.Build.0 = Debug|Any CPU
+		{205C6E4A-4F9C-44FE-BB81-48F9914F048F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{205C6E4A-4F9C-44FE-BB81-48F9914F048F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{205C6E4A-4F9C-44FE-BB81-48F9914F048F}.Release|x86.ActiveCfg = Release|Any CPU
+		{205C6E4A-4F9C-44FE-BB81-48F9914F048F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Localizer/Attributes/OperationTimingAttribute.cs

@@ -5,7 +5,7 @@ namespace Localizer.Attributes
     public class OperationTimingAttribute : Attribute
     {
         public OperationTiming Timing { get; }
-        
+
         public OperationTimingAttribute(OperationTiming timing = OperationTiming.Any)
         {
             Timing = timing;