Update ESI.NET; some bug fixes

Slazanger · Feb 16, 2019 · d73d373 · d73d373
1 parent f200168
commit d73d373
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 14 deletions.
diff --git a/App.config b/App.config
@@ -1,6 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/EVEData/EveManager.cs b/EVEData/EveManager.cs
@@ -1749,7 +1749,7 @@ private async void StartUpdateIncursionsFromESI()
         /// </summary>
         private void StartUpdateCharacterThread()
         {
-            new Thread(async () =>
+            new Thread(() =>
             {
                 Thread.CurrentThread.IsBackground = true;
 
@@ -1759,7 +1759,7 @@ private void StartUpdateCharacterThread()
                     for (int i = 0; i < LocalCharacters.Count; i++)
                     {
                         LocalCharacter c = LocalCharacters.ElementAt(i);
-                        await c.Update();
+                        c.Update();
                     }
 
                     Thread.Sleep(2000);

diff --git a/EVEData/LocalCharacter.cs b/EVEData/LocalCharacter.cs
@@ -242,13 +242,13 @@ public override string ToString()
         /// <summary>
         /// Update the Character info
         /// </summary>
-        public async Task Update()
+        public void Update()
         {
             TimeSpan ts = ESIAccessTokenExpiry - DateTime.Now;
             if (ts.Minutes < 0)
             {
-                await RefreshAccessToken();
-                await UpdateInfoFromESI();
+                RefreshAccessToken().Wait();
+                UpdateInfoFromESI().Wait();
             }
 
             UpdatePositionFromESI();
@@ -370,7 +370,7 @@ private async Task RefreshAccessToken()
             SsoToken sst;
             AuthorizedCharacterData acd;
             sst = await EveManager.Instance.ESIClient.SSO.GetToken(GrantType.RefreshToken, ESIRefreshToken);
-            if(sst.RefreshToken == null)
+            if(sst == null || sst.RefreshToken == null)
             {
                 return;
             }
@@ -436,7 +436,7 @@ private async Task UpdateInfoFromESI()
                 esiClient.SetCharacterData(ESIAuthData);
 
 
-                if (CorporationID == -1 || AllianceID == -1)
+ //               if (CorporationID == -1 || AllianceID == -1)
                 {
                     ESI.NET.EsiResponse<ESI.NET.Models.Character.Information> esr = await esiClient.Character.Information((int)ID);
 

diff --git a/SMT.csproj b/SMT.csproj
@@ -28,9 +28,10 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,30 +49,56 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>smt_bomb_icon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>CAF6EC5F5180F997B5256F4F8D04B2346D508D29</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>SMT_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DotNetKit.Wpf.AutoCompleteComboBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\DotNetKit.Wpf.AutoCompleteComboBox.1.2.0\lib\net45\DotNetKit.Wpf.AutoCompleteComboBox.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ESI.NET, Version=2.5.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\ESI.NET.2.5.5\lib\net471\ESI.NET.dll</HintPath>
+    <Reference Include="ESI.NET, Version=2.9.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\ESI.NET.2.9.8\lib\net471\ESI.NET.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Configuration.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Configuration.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Configuration.Binder.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Extensions.Options.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Options.ConfigurationExtensions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Extensions.Primitives.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
@@ -351,6 +378,7 @@
     <None Include="RUN ME FIRST SMT Built in Browser Fix.reg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SMT_TemporaryKey.pfx" />
     <None Include="Sounds\woop.mp3">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/packages.config b/packages.config
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetKit.Wpf.AutoCompleteComboBox" version="1.2.0" targetFramework="net461" />
-  <package id="ESI.NET" version="2.5.5" targetFramework="net472" />
+  <package id="ESI.NET" version="2.9.8" targetFramework="net472" />
   <package id="Extended.Wpf.Toolkit" version="3.3.0" targetFramework="net461" />
   <package id="Microsoft.CSharp" version="4.4.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration" version="2.0.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.0.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="2.0.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Options" version="2.1.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.0.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Primitives" version="2.1.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />

diff --git a/packages/ESI.NET.2.5.5/.signature.p7s b/packages/ESI.NET.2.5.5/.signature.p7s
diff --git a/packages/ESI.NET.2.5.5/ESI.NET.2.5.5.nupkg b/packages/ESI.NET.2.5.5/ESI.NET.2.5.5.nupkg