Skip to content
This repository has been archived by the owner on May 8, 2019. It is now read-only.

Commit

Permalink
Update packages to rc1.
Browse files Browse the repository at this point in the history
  • Loading branch information
Berrysoft committed Jun 10, 2018
1 parent 3a4ff4c commit a6e7b51
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 14 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# TsinghuaNet
能快速连接清华大学校园网,包括有线网与无线网。
## 多种登录方式
支持Auth4、Auth6(未测试)、Net方式的登录。
支持Auth4、Auth6(未测试,不建议使用)、Net方式的登录。
## 多语言支持
默认为简体中文,所有不支持的且存在的语言会以简体中文代替;不存在的语言会以用户电脑的语言或简体中文代替。
### 支持语言列表
Expand All @@ -18,7 +18,7 @@
现在已经弃疗,就这么多吧。
## 屏幕截图
<div align=center><img src="Screenshots/MainWindow.png"/></div>

## 依赖项
使用NuGet引用了我的另一个仓库[ClassLibrary](https://github.com/Berrysoft/ClassLibrary)的Berrysoft.Console与Berrysoft.Tsinghua.Net项目。
二者均使用MIT许可证。
这个仓库还有一个本程序的跨平台(控制台应用程序)版本,只支持英文。
57 changes: 57 additions & 0 deletions ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
TsinghuaNet uses third-party libraries or other resources that may be
distributed under licenses different than the TsinghuaNet software.

In the event that we accidentally failed to list a required notice, please
bring it to our attention. Post an issue on:

https://github.com/Berrysoft/Tsinghua_Auth4_Net

The attached notices are provided for information only.

License notice for Berrysoft.Console
-----------------------------------------
MIT License

Copyright (c) 2018 Berrysoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

License notice for Berrysoft.Tsinghua.Net
-----------------------------------------
MIT License

Copyright (c) 2018 Berrysoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 2 additions & 2 deletions TsinghuaNet/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ Imports System.Windows
' 方法是按如下所示使用“*”: :
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("2.4.86.0")>
<Assembly: AssemblyFileVersion("2.4.86.0")>
<Assembly: AssemblyVersion("2.4.91.0")>
<Assembly: AssemblyFileVersion("2.4.91.0")>
11 changes: 4 additions & 7 deletions TsinghuaNet/TsinghuaNet.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,15 @@
<StartupObject>TsinghuaNet.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="Berrysoft.Console, Version=1.0.140.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Berrysoft.Console.1.0.140-preview3\lib\net472\Berrysoft.Console.dll</HintPath>
<Reference Include="Berrysoft.Console, Version=1.0.152.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Berrysoft.Console.1.0.152-rc1\lib\net472\Berrysoft.Console.dll</HintPath>
</Reference>
<Reference Include="Berrysoft.Tsinghua.Net, Version=1.0.140.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Berrysoft.Tsinghua.Net.1.0.140-preview3\lib\net472\Berrysoft.Tsinghua.Net.dll</HintPath>
<Reference Include="Berrysoft.Tsinghua.Net, Version=1.0.152.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Berrysoft.Tsinghua.Net.1.0.152-rc1\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.Runtime.Remoting" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
Expand Down
5 changes: 2 additions & 3 deletions TsinghuaNet/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Berrysoft.Console" version="1.0.140-preview3" targetFramework="net472" />
<package id="Berrysoft.Tsinghua.Net" version="1.0.140-preview3" targetFramework="net472" />
<package id="System.Json" version="4.5.0" targetFramework="net472" />
<package id="Berrysoft.Console" version="1.0.152-rc1" targetFramework="net472" />
<package id="Berrysoft.Tsinghua.Net" version="1.0.152-rc1" targetFramework="net472" />
</packages>

0 comments on commit a6e7b51

Please sign in to comment.