Skip to content

Commit

Permalink
🔀 Merge develop into main -> EAM V3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaikEight
MaikEight committed Apr 10, 2023
2 parents 675cd13 + 7518fe8 commit 7f1fb5e
Show file tree
Hide file tree
Showing 693 changed files with 18,809 additions and 284,265 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[*.cs]

# CS4014: Because this call is not awaited, execution of the current method continues before the call is completed
dotnet_diagnostic.CS4014.severity = silent
Binary file modified .vs/EAM/v16/.suo
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions EAM Daily Login Service/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
8 changes: 5 additions & 3 deletions EAM Daily Login Service/DailyLogin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using System.Runtime.InteropServices;
using System.Runtime.Serialization.Formatters.Binary;
using System.Text;
using System.Threading.Tasks;
using System.Timers;

namespace EAM_Daily_Login_Service
Expand Down Expand Up @@ -53,6 +52,8 @@ class DailyLogin
private static Dictionary<System.Timers.Timer, Process> dicTimerToProcess = new Dictionary<System.Timers.Timer, Process>();
private static Dictionary<System.Timers.Timer, string> dicTimerToEmail = new Dictionary<System.Timers.Timer, string>();

private static bool isForcedLogin = false;

#region Show/Hide Window

[DllImport("kernel32.dll")]
Expand Down Expand Up @@ -89,7 +90,7 @@ static void Main(string[] args)
}

if (!(args != null && args[0].Equals("force")))
{
{
if (dailyLogins.DailyDatas.Count > 0)
{
DailyData lastDay = dailyLogins.DailyDatas.OrderByDescending(d => d.Date).FirstOrDefault();
Expand All @@ -102,6 +103,7 @@ static void Main(string[] args)
}
else
{
isForcedLogin = true;
LogEvent(new LogData("Daily Login Service", LogEventType.ServiceInfo, "Daily login force started!"));
}
}
Expand Down Expand Up @@ -323,7 +325,7 @@ private static void UpdateDone(object sender, EventArgs e)

private static void StartLogins()
{
dailyLogins.DailyDatas.Add(new DailyData() { AccountData = new List<DailyAccountData>(), Date = DateTime.Now });
dailyLogins.DailyDatas.Add(new DailyData() { AccountData = new List<DailyAccountData>(), Date = DateTime.Now, ManualStart = isForcedLogin });
SaveDailyLoginsData();

if (notOpt.useTaskTrayTool)
Expand Down
4 changes: 2 additions & 2 deletions EAM Daily Login Service/EAM Daily Login Service.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -69,7 +69,7 @@
<Project>{4daa2462-ce82-491d-a823-b839036566d5}</Project>
<Name>ExaltAccountManager</Name>
</ProjectReference>
<ProjectReference Include="..\MK_EAM_Lib\MK_EAM_Lib.csproj">
<ProjectReference Include="..\Libraries\MK_EAM_Lib\MK_EAM_Lib.csproj">
<Project>{63c8eba3-8dcd-46bd-98d0-58f3190c5b6f}</Project>
<Name>MK_EAM_Lib</Name>
</ProjectReference>
Expand Down
2 changes: 1 addition & 1 deletion EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
460cd12e4b7dfdb1e898f983865d1984b6476174
9df1ab5f99d2718c6c89975bfe7cffcb04a84fbc
152 changes: 110 additions & 42 deletions EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt
View file

Large diffs are not rendered by default.

Binary file modified EAM Daily Login Service/obj/Debug/EAM Daily Login Service.exe
View file
Binary file not shown.
Binary file modified EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb
View file
Binary file not shown.
Binary file removed EAM Daily Login Service/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
View file
Binary file not shown.
Binary file removed EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.AssemblyReference.cache
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
95a96932785f5d6ac39d36cf1e1a3f14b7267b8c
09cc3bb8441a5277425da76d4cb62e6898768c95
59 changes: 1 addition & 58 deletions EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Rele
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.CopyComplete
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.exe
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Win32.TaskScheduler.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Win32.TaskScheduler.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\de\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\es\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\fr\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\it\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\pl\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\ru\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\zh-CN\Microsoft.Win32.TaskScheduler.resources.dll
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Daily Login Service.exe.config
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Daily Login Service.exe
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Daily Login Service.pdb
Expand All @@ -40,42 +31,15 @@ C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Re
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.CopyComplete
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.exe
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuTransition.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPictureBox.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuScrollBar.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuToggleSwitch.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.Licensing.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuTransition.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPictureBox.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuScrollBar.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuToggleSwitch.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuCheckBox.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuCheckBox.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.AssemblyReference.cache
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuSeparator.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuSeparator.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuToolTip.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuSlider.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuTextBox.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPanel.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuDropdown.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\CsvHelper.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuSnackbar.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Bcl.AsyncInterfaces.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Threading.Tasks.Extensions.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Bcl.HashCode.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Memory.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Runtime.CompilerServices.Unsafe.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Numerics.Vectors.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Buffers.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuToolTip.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuSlider.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuTextBox.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPanel.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuDropdown.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\CsvHelper.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuSnackbar.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Bcl.AsyncInterfaces.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Threading.Tasks.Extensions.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Microsoft.Bcl.HashCode.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Memory.xml
Expand Down Expand Up @@ -152,28 +116,7 @@ C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Re
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Numerics.Vectors.xml
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\System.Buffers.xml
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.AssemblyReference.cache
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPages.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuCircleProgress.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Newtonsoft.Json.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPages.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuCircleProgress.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Newtonsoft.Json.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuShadowPanel.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuDataGridView.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuButton.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuShadowPanel.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuDataGridView.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuButton.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuLoader.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuLoader.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuFormDock.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuRadioButton.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuFormDock.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuRadioButton.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.Charts.WinForms.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuLabel.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Lib.dll.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.Charts.WinForms.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuLabel.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.SuggestedBindingRedirects.cache
Binary file modified EAM Daily Login Service/obj/Release/EAM Daily Login Service.exe
View file
Binary file not shown.
Binary file modified EAM Daily Login Service/obj/Release/EAM Daily Login Service.pdb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion EAM Daily Login Service/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
</packages>
4 changes: 2 additions & 2 deletions EAM PingChecker/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
Loading

0 comments on commit 7f1fb5e

Please sign in to comment.