Merge branch 'Development'

wanjizheng · Oct 12, 2021 · 0493a8f · 0493a8f
2 parents cc4e4e7 + 2aca4c3
commit 0493a8f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/ISBoxerEVELauncher.csproj b/ISBoxerEVELauncher.csproj
@@ -34,7 +34,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -115,8 +115,8 @@
     <Reference Include="Costura, Version=5.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\Costura.Fody.5.6.0\lib\netstandard1.0\Costura.dll</HintPath>
     </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.11.36.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>packages\HtmlAgilityPack.1.11.36\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="HtmlAgilityPack, Version=1.11.37.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\..\MyProject\iEVE\iTrader\packages\HtmlAgilityPack.1.11.37\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.IdentityModel.Logging.6.12.2\lib\net472\Microsoft.IdentityModel.Logging.dll</HintPath>
@@ -527,9 +527,11 @@ if "$(ConfigurationName)"=="Debug" (
     <Error Condition="!Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
     <Error Condition="!Exists('packages\Costura.Fody.5.6.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.6.0\build\Costura.Fody.props'))" />
     <Error Condition="!Exists('packages\Costura.Fody.5.6.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.6.0\build\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('..\..\MyProject\iEVE\iTrader\packages\Fody.6.5.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\MyProject\iEVE\iTrader\packages\Fody.6.5.3\build\Fody.targets'))" />
   </Target>
   <Import Project="packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
   <Import Project="packages\Costura.Fody.5.6.0\build\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.5.6.0\build\Costura.Fody.targets')" />
+  <Import Project="..\..\MyProject\iEVE\iTrader\packages\Fody.6.5.3\build\Fody.targets" Condition="Exists('..\..\MyProject\iEVE\iTrader\packages\Fody.6.5.3\build\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.38")]
-[assembly: AssemblyFileVersion("1.0.0.38")]
+[assembly: AssemblyVersion("1.0.0.39")]
+[assembly: AssemblyFileVersion("1.0.0.39")]
diff --git a/Web/RequestResponse.cs b/Web/RequestResponse.cs
@@ -79,7 +79,7 @@ public static HttpWebRequest CreateGetRequest(Uri uri, bool sisi, bool origin, s
         {
             //.Replace("https:", "http:")
             if (!uri.IsAbsoluteUri)
-                uri = new Uri(string.Concat(sisi ? sisiBaseUri : tqBaseUri.Replace("https:", "http:"), uri.ToString()));
+                uri = new Uri(string.Concat(sisi ? sisiBaseUri : tqBaseUri, uri.ToString()));
             return CreateHttpWebRequest(uri, "GET", sisi, origin, referer, cookies);
         }
         public static HttpWebRequest CreatePostRequest(Uri uri, bool sisi, bool origin, string referer, CookieContainer cookies)

diff --git a/packages.config b/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Costura.Fody" version="5.6.0" targetFramework="net48" developmentDependency="true" />
-  <package id="Fody" version="6.5.2" targetFramework="net48" developmentDependency="true" />
-  <package id="HtmlAgilityPack" version="1.11.36" targetFramework="net48" />
+  <package id="Fody" version="6.5.3" targetFramework="net48" developmentDependency="true" />
+  <package id="HtmlAgilityPack" version="1.11.37" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
   <package id="Microsoft.IdentityModel.Logging" version="6.12.2" targetFramework="net48" />
   <package id="Microsoft.IdentityModel.Tokens" version="6.12.2" targetFramework="net48" />
-  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.3" targetFramework="net48" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />