Browse Source

fix 加签名信息

zhangtaotao 6 years ago
parent
commit
d70e59077e
25 changed files with 63301 additions and 7 deletions
  1. 22 0
      .gitignore
  2. BIN
      WeChatCore/Referce/CommonTools.dll
  3. BIN
      WeChatCore/Referce/HttpHelper.dll
  4. BIN
      WeChatCore/Referce/x86/CommonTools.dll
  5. BIN
      WeChatCore/Referce/x86/HttpHelper.dll
  6. 34 7
      WeChatCore/WeChatCore.csproj
  7. 31 0
      WeChatCore/WeChatCore.sln
  8. 4 0
      WeChatCore/packages.config
  9. BIN
      WeChatCore/packages/Newtonsoft.Json.9.0.1/Newtonsoft.Json.9.0.1.nupkg
  10. BIN
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net20/Newtonsoft.Json.dll
  11. 9793 0
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net20/Newtonsoft.Json.xml
  12. BIN
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net35/Newtonsoft.Json.dll
  13. 8922 0
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net35/Newtonsoft.Json.xml
  14. BIN
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net40/Newtonsoft.Json.dll
  15. 9229 0
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net40/Newtonsoft.Json.xml
  16. BIN
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net45/Newtonsoft.Json.dll
  17. 9229 0
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net45/Newtonsoft.Json.xml
  18. BIN
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/netstandard1.0/Newtonsoft.Json.dll
  19. 8756 0
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/netstandard1.0/Newtonsoft.Json.xml
  20. BIN
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll
  21. 8409 0
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml
  22. BIN
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll
  23. 8756 0
      WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.xml
  24. 116 0
      WeChatCore/packages/Newtonsoft.Json.9.0.1/tools/install.ps1
  25. BIN
      WeChatCore/wechat.snk

+ 22 - 0
.gitignore

@@ -71,3 +71,25 @@ sample/EasyWeChatClient/EasyWeChatClient/obj/Debug/TemporaryGeneratedFile_E7A71F
 sample/EasyWeChatClient/EasyWeChatClient/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
 /WeChatCore/obj/Debug/DesignTimeResolveAssemblyReferences.cache
 /WeChatCore/.vs/WeChatCore/v15/.suo
+/WeChatCore/bin/x64/Debug/CommonTools.dll
+/WeChatCore/bin/x64/Debug/Data/data.dat
+/WeChatCore/bin/x64/Debug/HttpHelper.dll
+/WeChatCore/bin/x64/Debug/ICSharpCode.SharpZipLib.dll
+/WeChatCore/bin/x64/Debug/Newtonsoft.Json.dll
+/WeChatCore/bin/x64/Debug/Newtonsoft.Json.xml
+/WeChatCore/bin/x64/Debug/WeChatCore.dll
+/WeChatCore/bin/x64/Debug/WeChatCore.pdb
+/WeChatCore/obj/x64/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+/WeChatCore/obj/x64/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
+/WeChatCore/obj/x64/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
+/WeChatCore/obj/x64/Debug/WeChatCore.csproj.CopyComplete
+/WeChatCore/obj/x64/Debug/WeChatCore.csproj.CoreCompileInputs.cache
+/WeChatCore/obj/x64/Debug/WeChatCore.csproj.FileListAbsolute.txt
+/WeChatCore/obj/x64/Debug/WeChatCore.csprojResolveAssemblyReference.cache
+/WeChatCore/obj/x64/Debug/WeChatCore.dll
+/WeChatCore/obj/x64/Debug/WeChatCore.g.resources
+/WeChatCore/obj/x64/Debug/WeChatCore.pdb
+/WeChatCore/.vs/WeChatCore/v15/Server/sqlite3/db.lock
+/WeChatCore/.vs/WeChatCore/v15/Server/sqlite3/storage.ide
+/WeChatCore/.vs/WeChatCore/v15/Server/sqlite3/storage.ide-shm
+/WeChatCore/.vs/WeChatCore/v15/Server/sqlite3/storage.ide-wal

BIN
WeChatCore/Referce/CommonTools.dll


BIN
WeChatCore/Referce/HttpHelper.dll


BIN
WeChatCore/Referce/x86/CommonTools.dll


BIN
WeChatCore/Referce/x86/HttpHelper.dll


+ 34 - 7
WeChatCore/WeChatCore.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WeChatCore</RootNamespace>
     <AssemblyName>WeChatCore</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,18 +30,42 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>wechat.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonTools, Version=1.0.0.3, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="CommonTools, Version=1.0.0.3, Culture=neutral, PublicKeyToken=c81093cf33f6c5e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>Referce\x86\CommonTools.dll</HintPath>
+      <HintPath>Referce\CommonTools.dll</HintPath>
     </Reference>
-    <Reference Include="HttpHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="HttpHelper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c81093cf33f6c5e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>Referce\x86\HttpHelper.dll</HintPath>
+      <HintPath>Referce\HttpHelper.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Referce\Newtonsoft.Json.dll</HintPath>
+      <HintPath>packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -122,6 +147,8 @@
     <None Include="Data\data.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
+    <None Include="wechat.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 31 - 0
WeChatCore/WeChatCore.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2037
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeChatCore", "WeChatCore.csproj", "{588E8149-F7FC-4304-87E1-43426D41AAC4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{588E8149-F7FC-4304-87E1-43426D41AAC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{588E8149-F7FC-4304-87E1-43426D41AAC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{588E8149-F7FC-4304-87E1-43426D41AAC4}.Debug|x64.ActiveCfg = Debug|x64
+		{588E8149-F7FC-4304-87E1-43426D41AAC4}.Debug|x64.Build.0 = Debug|x64
+		{588E8149-F7FC-4304-87E1-43426D41AAC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{588E8149-F7FC-4304-87E1-43426D41AAC4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{588E8149-F7FC-4304-87E1-43426D41AAC4}.Release|x64.ActiveCfg = Release|x64
+		{588E8149-F7FC-4304-87E1-43426D41AAC4}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F7B20DB8-527D-4CA0-BDE8-AE6F0B69A2CC}
+	EndGlobalSection
+EndGlobal

+ 4 - 0
WeChatCore/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+</packages>

BIN
WeChatCore/packages/Newtonsoft.Json.9.0.1/Newtonsoft.Json.9.0.1.nupkg


BIN
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net20/Newtonsoft.Json.dll


File diff suppressed because it is too large
+ 9793 - 0
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net20/Newtonsoft.Json.xml


BIN
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net35/Newtonsoft.Json.dll


File diff suppressed because it is too large
+ 8922 - 0
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net35/Newtonsoft.Json.xml


BIN
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net40/Newtonsoft.Json.dll


File diff suppressed because it is too large
+ 9229 - 0
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net40/Newtonsoft.Json.xml


BIN
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net45/Newtonsoft.Json.dll


File diff suppressed because it is too large
+ 9229 - 0
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/net45/Newtonsoft.Json.xml


BIN
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/netstandard1.0/Newtonsoft.Json.dll


File diff suppressed because it is too large
+ 8756 - 0
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/netstandard1.0/Newtonsoft.Json.xml


BIN
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll


File diff suppressed because it is too large
+ 8409 - 0
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml


BIN
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll


File diff suppressed because it is too large
+ 8756 - 0
WeChatCore/packages/Newtonsoft.Json.9.0.1/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.xml


+ 116 - 0
WeChatCore/packages/Newtonsoft.Json.9.0.1/tools/install.ps1

@@ -0,0 +1,116 @@
+param($installPath, $toolsPath, $package, $project)
+
+# open json.net splash page on package install
+# don't open if json.net is installed as a dependency
+
+try
+{
+  $url = "http://www.newtonsoft.com/json/install?version=" + $package.Version
+  $dte2 = Get-Interface $dte ([EnvDTE80.DTE2])
+
+  if ($dte2.ActiveWindow.Caption -eq "Package Manager Console")
+  {
+    # user is installing from VS NuGet console
+    # get reference to the window, the console host and the input history
+    # show webpage if "install-package newtonsoft.json" was last input
+
+    $consoleWindow = $(Get-VSComponentModel).GetService([NuGetConsole.IPowerConsoleWindow])
+
+    $props = $consoleWindow.GetType().GetProperties([System.Reflection.BindingFlags]::Instance -bor `
+      [System.Reflection.BindingFlags]::NonPublic)
+
+    $prop = $props | ? { $_.Name -eq "ActiveHostInfo" } | select -first 1
+    if ($prop -eq $null) { return }
+  
+    $hostInfo = $prop.GetValue($consoleWindow)
+    if ($hostInfo -eq $null) { return }
+
+    $history = $hostInfo.WpfConsole.InputHistory.History
+
+    $lastCommand = $history | select -last 1
+
+    if ($lastCommand)
+    {
+      $lastCommand = $lastCommand.Trim().ToLower()
+      if ($lastCommand.StartsWith("install-package") -and $lastCommand.Contains("newtonsoft.json"))
+      {
+        $dte2.ItemOperations.Navigate($url) | Out-Null
+      }
+    }
+  }
+  else
+  {
+    # user is installing from VS NuGet dialog
+    # get reference to the window, then smart output console provider
+    # show webpage if messages in buffered console contains "installing...newtonsoft.json" in last operation
+
+    $instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor `
+      [System.Reflection.BindingFlags]::NonPublic)
+
+    $consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor `
+      [System.Reflection.BindingFlags]::NonPublic)
+
+    if ($instanceField -eq $null -or $consoleField -eq $null) { return }
+
+    $instance = $instanceField.GetValue($null)
+
+    if ($instance -eq $null) { return }
+
+    $consoleProvider = $consoleField.GetValue($instance)
+    if ($consoleProvider -eq $null) { return }
+
+    $console = $consoleProvider.CreateOutputConsole($false)
+
+    $messagesField = $console.GetType().GetField("_messages", [System.Reflection.BindingFlags]::Instance -bor `
+      [System.Reflection.BindingFlags]::NonPublic)
+    if ($messagesField -eq $null) { return }
+
+    $messages = $messagesField.GetValue($console)
+    if ($messages -eq $null) { return }
+
+    $operations = $messages -split "=============================="
+
+    $lastOperation = $operations | select -last 1
+
+    if ($lastOperation)
+    {
+      $lastOperation = $lastOperation.ToLower()
+
+      $lines = $lastOperation -split "`r`n"
+
+      $installMatch = $lines | ? { $_.StartsWith("------- installing...newtonsoft.json ") } | select -first 1
+
+      if ($installMatch)
+      {
+        $dte2.ItemOperations.Navigate($url) | Out-Null
+      }
+    }
+  }
+}
+catch
+{
+  try
+  {
+    $pmPane = $dte2.ToolWindows.OutputWindow.OutputWindowPanes.Item("Package Manager")
+
+    $selection = $pmPane.TextDocument.Selection
+    $selection.StartOfDocument($false)
+    $selection.EndOfDocument($true)
+
+    if ($selection.Text.StartsWith("Attempting to gather dependencies information for package 'Newtonsoft.Json." + $package.Version + "'"))
+    {
+      # don't show on upgrade
+      if (!$selection.Text.Contains("Removed package"))
+      {
+        $dte2.ItemOperations.Navigate($url) | Out-Null
+      }
+    }
+  }
+  catch
+  {
+    # stop potential errors from bubbling up
+    # worst case the splash page won't open  
+  }
+}
+
+# still yolo

BIN
WeChatCore/wechat.snk