fix: close app on failed login and update SharpZipLib

master
tayttt 3 days ago
parent 6d5a72b849
commit d45ef0148c

@ -106,8 +106,8 @@
<Reference Include="HandyControl, Version=3.3.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
<HintPath>..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="K4os.Compression.LZ4, Version=1.2.6.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Compression.LZ4.1.2.6\lib\net46\K4os.Compression.LZ4.dll</HintPath>

@ -21,7 +21,7 @@
<package id="Prism.Core" version="8.1.97" targetFramework="net48" />
<package id="Prism.Unity" version="8.0.0.1909" targetFramework="net48" />
<package id="Prism.Wpf" version="8.1.97" targetFramework="net48" />
<package id="SharpZipLib" version="1.2.0" targetFramework="net48" />
<package id="SharpZipLib" version="1.3.3" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />

@ -41,6 +41,10 @@
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.3.11" newVersion="1.3.3.11" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="OxyPlot" publicKeyToken="638079a8f0bd61e9" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />

@ -67,6 +67,7 @@ namespace Txgy.EWS.Client.Start
GlobalConfig.ReadConfig();
//Debug.WriteLine(GlobalConfig.LoadDataTimeLenMins);
//Debug.WriteLine(GlobalConfig.DataCacheTimeLenMins);
ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown;
_loginSucceeded = Container.Resolve<LoginView>().ShowDialog() == true;
if (!_loginSucceeded)
{
@ -91,6 +92,7 @@ namespace Txgy.EWS.Client.Start
{
//GlobalConfig.ReadConfig();
//CommonLogHelper.Debug("====Start=====>");
ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose;
base.InitializeShell(shell);
}
}

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "N8+hwhsKZm25tDJfWpBSW7EGhH/R7EMuiX+KJ4C4u+fCWVc1lJ5zg1u3S1RPPVYgTqhx/C3hxrqUpi6RwK5+Tg==",
"source": "https://api.nuget.org/v3/index.json"
}

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -0,0 +1 @@
X2mW44oxhhRJpJO5OH6RCXq+BvPKk25hjmuRQJFpm3MZvafjkqUyqWwGKH6bPCh4YYPF+8ISrCu90QgJFR5tuw==

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>SharpZipLib</id>
<version>1.3.3</version>
<authors>ICSharpCode</authors>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<icon>images/sharpziplib-nuget-256x256.png</icon>
<projectUrl>https://github.com/icsharpcode/SharpZipLib</projectUrl>
<description>SharpZipLib (#ziplib, formerly NZipLib) is a compression library for Zip, GZip, BZip2, and Tar written entirely in C# for .NET. It is implemented as an assembly (installable in the GAC), and thus can easily be incorporated into other projects (in any .NET language)</description>
<releaseNotes>Please see https://github.com/icsharpcode/SharpZipLib/wiki/Release-1.3.3 for more information.</releaseNotes>
<copyright>Copyright © 2000-2021 SharpZipLib Contributors</copyright>
<tags>Compression Library Zip GZip BZip2 LZW Tar</tags>
<repository type="git" url="https://github.com/icsharpcode/SharpZipLib" commit="1b1ab013ce1df02d8f27cf582197759c614d9126" />
<dependencies>
<group targetFramework=".NETFramework4.5" />
<group targetFramework=".NETStandard2.0" />
<group targetFramework=".NETStandard2.1" />
</dependencies>
</metadata>
</package>
Loading…
Cancel
Save