diff --git a/Arknights Automation Library/Arknights Automation Library.csproj b/Arknights Automation Library/Arknights Automation Library.csproj
index 63162a0..3000278 100644
--- a/Arknights Automation Library/Arknights Automation Library.csproj
+++ b/Arknights Automation Library/Arknights Automation Library.csproj
@@ -1,17 +1,20 @@
+
- net5.0
+ net5.0-windows
REVUnit.AutoArknights.Core
x64
win-x64
enable
+
+
PreserveNewest
@@ -20,11 +23,14 @@
PreserveNewest
+
+
+
\ No newline at end of file
diff --git a/Auto Arknights CLI/Auto Arknights CLI.csproj b/Auto Arknights CLI/Auto Arknights CLI.csproj
index 1208c39..b3d59dc 100644
--- a/Auto Arknights CLI/Auto Arknights CLI.csproj
+++ b/Auto Arknights CLI/Auto Arknights CLI.csproj
@@ -1,6 +1,7 @@
+
- netcoreapp5.0
+ net5.0-windows
Exe
REVUnit.AutoArknights.CLI
x64
@@ -10,25 +11,31 @@
artifact\
enable
+
none
false
+
+
+
PreserveNewest
+
+
\ No newline at end of file
diff --git a/Auto Arknights CLI/AutoArknightsCli.cs b/Auto Arknights CLI/AutoArknightsCli.cs
index 6f57cea..8d59bb1 100644
--- a/Auto Arknights CLI/AutoArknightsCli.cs
+++ b/Auto Arknights CLI/AutoArknightsCli.cs
@@ -1,5 +1,4 @@
using System;
-using System.Configuration;
using System.IO;
using System.Reflection;
using Microsoft.Extensions.Configuration;
@@ -26,7 +25,7 @@ public AutoArknightsCli()
_config = new ConfigurationBuilder().AddJsonFile(ConfigJson).Build();
Log.LogLevel = Log.Level.Get(Conf("Log:Level")) ??
- throw new ConfigurationErrorsException("Value of Log:Level in configuration is invalid");
+ throw new Exception("Value of Log:Level in configuration is invalid");
}
public void Run()
@@ -46,7 +45,7 @@ public void Run()
private string Conf(string key)
{
- return _config[key] ?? throw new ConfigurationErrorsException($"Configuration key {key} is required");
+ return _config[key] ?? throw new Exception($"Configuration key {key} is required");
}
}
}
\ No newline at end of file
diff --git a/Auto Arknights CLI/Entry.cs b/Auto Arknights CLI/Entry.cs
index eede2e7..f8ad64d 100644
--- a/Auto Arknights CLI/Entry.cs
+++ b/Auto Arknights CLI/Entry.cs
@@ -2,6 +2,7 @@
using System;
using REVUnit.AutoArknights.Core;
using REVUnit.Crlib.Extension;
+
#endif
namespace REVUnit.AutoArknights.CLI
diff --git a/Auto Arknights.sln b/Auto Arknights.sln
index 018f21a..8282246 100644
--- a/Auto Arknights.sln
+++ b/Auto Arknights.sln
@@ -16,8 +16,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageLocator", "ImageLocato
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crlib", "Crlib\Crlib\Crlib.csproj", "{D0C9D2B9-210A-4E2B-9F5A-148C234FE0BB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickTest", "QuickTest\QuickTest.csproj", "{F7707506-2D86-44D9-B3D1-20F757F8755B}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -27,18 +25,19 @@ Global
{AF3D1DDF-8CC0-4A1C-A3D2-DB3875B8C3ED}.Debug|x64.ActiveCfg = Debug|x64
{AF3D1DDF-8CC0-4A1C-A3D2-DB3875B8C3ED}.Debug|x64.Build.0 = Debug|x64
{AF3D1DDF-8CC0-4A1C-A3D2-DB3875B8C3ED}.Release|x64.ActiveCfg = Release|x64
+ {AF3D1DDF-8CC0-4A1C-A3D2-DB3875B8C3ED}.Release|x64.Build.0 = Release|x64
{0C76DBB2-8CCF-4860-8C28-C542E74666BE}.Debug|x64.ActiveCfg = Debug|x64
{0C76DBB2-8CCF-4860-8C28-C542E74666BE}.Debug|x64.Build.0 = Debug|x64
{0C76DBB2-8CCF-4860-8C28-C542E74666BE}.Release|x64.ActiveCfg = Release|x64
+ {0C76DBB2-8CCF-4860-8C28-C542E74666BE}.Release|x64.Build.0 = Release|x64
{20BF00F4-DDBE-4592-A6C0-EEAF080326FC}.Debug|x64.ActiveCfg = Debug|Any CPU
{20BF00F4-DDBE-4592-A6C0-EEAF080326FC}.Debug|x64.Build.0 = Debug|Any CPU
{20BF00F4-DDBE-4592-A6C0-EEAF080326FC}.Release|x64.ActiveCfg = Release|Any CPU
+ {20BF00F4-DDBE-4592-A6C0-EEAF080326FC}.Release|x64.Build.0 = Release|Any CPU
{D0C9D2B9-210A-4E2B-9F5A-148C234FE0BB}.Debug|x64.ActiveCfg = Debug|Any CPU
{D0C9D2B9-210A-4E2B-9F5A-148C234FE0BB}.Debug|x64.Build.0 = Debug|Any CPU
{D0C9D2B9-210A-4E2B-9F5A-148C234FE0BB}.Release|x64.ActiveCfg = Release|Any CPU
- {F7707506-2D86-44D9-B3D1-20F757F8755B}.Debug|x64.ActiveCfg = Debug|x64
- {F7707506-2D86-44D9-B3D1-20F757F8755B}.Debug|x64.Build.0 = Debug|x64
- {F7707506-2D86-44D9-B3D1-20F757F8755B}.Release|x64.ActiveCfg = Release|x64
+ {D0C9D2B9-210A-4E2B-9F5A-148C234FE0BB}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Crlib b/Crlib
index 0fec95b..1f09a49 160000
--- a/Crlib
+++ b/Crlib
@@ -1 +1 @@
-Subproject commit 0fec95bb37522e1e93b3f7264c52bea95af32df1
+Subproject commit 1f09a49b6a89822abe4b452797b9d17fff12ef72
diff --git a/ImageLocator b/ImageLocator
index b0541d3..aced025 160000
--- a/ImageLocator
+++ b/ImageLocator
@@ -1 +1 @@
-Subproject commit b0541d38714e357aca4e44fceebf46e053d586b2
+Subproject commit aced025a0c7c998486af564c6432abde4f12fa18
diff --git a/QuickTest/QuickTest.csproj b/QuickTest/QuickTest.csproj
deleted file mode 100644
index ef70c80..0000000
--- a/QuickTest/QuickTest.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Exe
- true
- true
- net5.0
- REVUnit.AutoArknights.QuickTest
- x64
- win-x64
-
-
-
-
-
-
-
-