From 7cf3099f9c424799e1c2108d9fd87919abc904a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E9=80=B8?= <Strawberry_Str@hotmail.com>
Date: Wed, 30 May 2018 17:14:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B02.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              |  5 ++---
 TsinghuaNet.sln                        | 12 ------------
 TsinghuaNet/My Project/AssemblyInfo.vb |  8 ++++----
 TsinghuaNet/TsinghuaNet.vbproj         | 20 ++++++++++----------
 TsinghuaNet/packages.config            |  6 ++++++
 5 files changed, 22 insertions(+), 29 deletions(-)
 create mode 100644 TsinghuaNet/packages.config

diff --git a/README.md b/README.md
index 7296bdc..9b0f948 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,5 @@
 <div align=center><img src="Screenshots/MainWindow.png"/></div>
 
 ## 依赖项
-引用了我的另一个仓库[ClassLibrary](https://github.com/Berrysoft/ClassLibrary)的Berrysoft.Console与Berrysoft.Tsinghua.Net项目。
-Berrysoft.Tsinghua.Net依赖于System.Json。
-这个仓库还有一个本程序的跨平台（控制台应用程序）版本。
+使用NuGet引用了我的另一个仓库[ClassLibrary](https://github.com/Berrysoft/ClassLibrary)的Berrysoft.Console与Berrysoft.Tsinghua.Net项目。
+这个仓库还有一个本程序的跨平台（控制台应用程序）版本，只支持英文。
diff --git a/TsinghuaNet.sln b/TsinghuaNet.sln
index bb6b1bf..518aabe 100644
--- a/TsinghuaNet.sln
+++ b/TsinghuaNet.sln
@@ -5,10 +5,6 @@ VisualStudioVersion = 15.0.27428.2037
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TsinghuaNet", "TsinghuaNet\TsinghuaNet.vbproj", "{01B80EDF-8F11-4E69-A967-12376391ECA0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Berrysoft.Tsinghua.Net", "..\ClassLibrary\src\Berrysoft.Tsinghua.Net\Berrysoft.Tsinghua.Net.csproj", "{C82D2A94-7AD6-47F8-A6AF-F2DB46DDC5DB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Berrysoft.Console", "..\ClassLibrary\src\Berrysoft.Console\Berrysoft.Console.csproj", "{84A27A71-0D23-4B8D-88C0-5C00B5FBAEF0}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,14 +15,6 @@ Global
 		{01B80EDF-8F11-4E69-A967-12376391ECA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{01B80EDF-8F11-4E69-A967-12376391ECA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{01B80EDF-8F11-4E69-A967-12376391ECA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C82D2A94-7AD6-47F8-A6AF-F2DB46DDC5DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C82D2A94-7AD6-47F8-A6AF-F2DB46DDC5DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C82D2A94-7AD6-47F8-A6AF-F2DB46DDC5DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C82D2A94-7AD6-47F8-A6AF-F2DB46DDC5DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84A27A71-0D23-4B8D-88C0-5C00B5FBAEF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84A27A71-0D23-4B8D-88C0-5C00B5FBAEF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84A27A71-0D23-4B8D-88C0-5C00B5FBAEF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84A27A71-0D23-4B8D-88C0-5C00B5FBAEF0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TsinghuaNet/My Project/AssemblyInfo.vb b/TsinghuaNet/My Project/AssemblyInfo.vb
index de8e5ac..f1f41ee 100644
--- a/TsinghuaNet/My Project/AssemblyInfo.vb	
+++ b/TsinghuaNet/My Project/AssemblyInfo.vb	
@@ -12,8 +12,8 @@ Imports System.Windows
 '查看程序集特性的值
 
 <Assembly: AssemblyTitle("TsinghuaNet")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyDescription("清华大学校园网客户端")>
+<Assembly: AssemblyCompany("Berrysoft")>
 <Assembly: AssemblyProduct("TsinghuaNet")>
 <Assembly: AssemblyCopyright("Copyright ©  2018")>
 <Assembly: AssemblyTrademark("")>
@@ -55,5 +55,5 @@ Imports System.Windows
 ' 方法是按如下所示使用“*”: :
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.2.79.0")>
-<Assembly: AssemblyFileVersion("2.2.79.0")>
+<Assembly: AssemblyVersion("2.3.83.0")>
+<Assembly: AssemblyFileVersion("2.3.83.0")>
diff --git a/TsinghuaNet/TsinghuaNet.vbproj b/TsinghuaNet/TsinghuaNet.vbproj
index e04ff23..c77dbde 100644
--- a/TsinghuaNet/TsinghuaNet.vbproj
+++ b/TsinghuaNet/TsinghuaNet.vbproj
@@ -76,9 +76,18 @@
     <StartupObject>TsinghuaNet.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Berrysoft.Console, Version=1.0.112.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Berrysoft.Console.1.0.112-preview2\lib\net472\Berrysoft.Console.dll</HintPath>
+    </Reference>
+    <Reference Include="Berrysoft.Tsinghua.Net, Version=1.0.112.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Berrysoft.Tsinghua.Net.1.0.112-preview2\lib\net472\Berrysoft.Tsinghua.Net.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Json, Version=2.0.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Json.4.5.0\lib\netstandard2.0\System.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -186,6 +195,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">
@@ -215,15 +225,5 @@
   <ItemGroup>
     <None Include="LogoLarge.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ClassLibrary\src\Berrysoft.Console\Berrysoft.Console.csproj">
-      <Project>{84a27a71-0d23-4b8d-88c0-5c00b5fbaef0}</Project>
-      <Name>Berrysoft.Console</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\ClassLibrary\src\Berrysoft.Tsinghua.Net\Berrysoft.Tsinghua.Net.csproj">
-      <Project>{c82d2a94-7ad6-47f8-a6af-f2db46ddc5db}</Project>
-      <Name>Berrysoft.Tsinghua.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
\ No newline at end of file
diff --git a/TsinghuaNet/packages.config b/TsinghuaNet/packages.config
new file mode 100644
index 0000000..1937bf2
--- /dev/null
+++ b/TsinghuaNet/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Berrysoft.Console" version="1.0.112-preview2" targetFramework="net472" />
+  <package id="Berrysoft.Tsinghua.Net" version="1.0.112-preview2" targetFramework="net472" />
+  <package id="System.Json" version="4.5.0" targetFramework="net472" />
+</packages>
\ No newline at end of file