Skip to content
This repository has been archived by the owner on Jun 19, 2023. It is now read-only.

Commit

Permalink
Bump version.
Browse files Browse the repository at this point in the history
  • Loading branch information
Berrysoft committed Apr 15, 2022
1 parent d64d037 commit 6540691
Show file tree
Hide file tree
Showing 11 changed files with 1,029 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="4" android:versionName="4.4.86" package="com.berrysoft.tsinghuanet.xf" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="4" android:versionName="4.6.87" package="com.berrysoft.tsinghuanet.xf" android:installLocation="auto">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="31" />
<application android:label="TsinghuaNet.XF.Android" android:usesCleartextTraffic="true" android:icon="@drawable/icon" android:theme="@android:style/Theme.Material"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TsinghuaNet.XF.Android")]
[assembly: AssemblyCopyright("Copyright (C) 2019-2021 Berrysoft")]
[assembly: AssemblyCopyright("Copyright (C) 2019-2022 Berrysoft")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
Expand All @@ -24,5 +24,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("4.4.86.0")]
[assembly: AssemblyFileVersion("4.4.86.0")]
[assembly: AssemblyVersion("4.6.87.0")]
[assembly: AssemblyFileVersion("4.6.87.0")]
1,001 changes: 1,000 additions & 1 deletion TsinghuaNet.XF/TsinghuaNet.XF.Android/Resources/Resource.designer.cs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TsinghuaNet.XF.UWP.Background")]
[assembly: AssemblyCopyright("Copyright (C) 2018-2021 Berrysoft")]
[assembly: AssemblyCopyright("Copyright (C) 2018-2022 Berrysoft")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -23,6 +23,6 @@
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.4.86.0")]
[assembly: AssemblyFileVersion("4.4.86.0")]
[assembly: ComVisible(false)]
[assembly: AssemblyVersion("4.6.87.0")]
[assembly: AssemblyFileVersion("4.6.87.0")]
[assembly: ComVisible(false)]
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TsinghuaNet.XF.UWP.Helpers")]
[assembly: AssemblyCopyright("Copyright (C) 2019-2021 Berrysoft")]
[assembly: AssemblyCopyright("Copyright (C) 2019-2022 Berrysoft")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -23,6 +23,6 @@
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.4.86.0")]
[assembly: AssemblyFileVersion("4.4.86.0")]
[assembly: ComVisible(false)]
[assembly: AssemblyVersion("4.6.87.0")]
[assembly: AssemblyFileVersion("4.6.87.0")]
[assembly: ComVisible(false)]
2 changes: 1 addition & 1 deletion TsinghuaNet.XF/TsinghuaNet.XF.UWP/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity
Name="TsinghuaNet.UWP"
Publisher="CN=Straw"
Version="4.4.86.0" />
Version="4.6.87.0" />

<mp:PhoneIdentity PhoneProductId="ec0cc741-fd3e-485c-81be-68815c480690" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

Expand Down
8 changes: 4 additions & 4 deletions TsinghuaNet.XF/TsinghuaNet.XF.UWP/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TsinghuaNet.XF.UWP")]
[assembly: AssemblyCopyright("Copyright (C) 2018-2021 Berrysoft")]
[assembly: AssemblyCopyright("Copyright (C) 2018-2022 Berrysoft")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -23,6 +23,6 @@
// 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("4.4.86.0")]
[assembly: AssemblyFileVersion("4.4.86.0")]
[assembly: ComVisible(false)]
[assembly: AssemblyVersion("4.6.87.0")]
[assembly: AssemblyFileVersion("4.6.87.0")]
[assembly: ComVisible(false)]
6 changes: 3 additions & 3 deletions TsinghuaNet.XF/TsinghuaNet.XF.iOS/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TsinghuaNet.XF.iOS")]
[assembly: AssemblyCopyright("Copyright (C) 2019-2021 Berrysoft")]
[assembly: AssemblyCopyright("Copyright (C) 2019-2022 Berrysoft")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -31,5 +31,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("4.4.86.0")]
[assembly: AssemblyFileVersion("4.4.86.0")]
[assembly: AssemblyVersion("4.6.87.0")]
[assembly: AssemblyFileVersion("4.6.87.0")]
4 changes: 4 additions & 0 deletions TsinghuaNet.XF/TsinghuaNet.XF/ViewModels/AboutViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using PropertyChanged;
using TsinghuaNet.Models;
Expand All @@ -13,6 +14,9 @@ class AboutViewModel : NetViewModelBase
[DoNotNotify]
public Version Version => Assembly.GetExecutingAssembly().GetName().Version;

[DoNotNotify]
public string Copyright => Assembly.GetExecutingAssembly().GetCustomAttributes<AssemblyCopyrightAttribute>().FirstOrDefault()?.Copyright;

[DoNotNotify]
public List<PackageBox> Packages { get; } = new List<PackageBox>
{
Expand Down
2 changes: 1 addition & 1 deletion TsinghuaNet.XF/TsinghuaNet.XF/Views/AboutPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Label Text="{Binding Version,Mode=OneTime,StringFormat='{0}'}"/>
<controls:HyperlinkLabel NavigateUri="https://github.com/Berrysoft/TsinghuaNet" TextColor="{DynamicResource SystemAccentColor}">项目地址</controls:HyperlinkLabel>
</StackLayout>
<Label>版权所有 © 2018-2021 Berrysoft</Label>
<Label Text="{Binding Copyright,Mode=OneTime}"/>
<StackLayout Orientation="Horizontal">
<Label>服务热线(8:00~20:00)</Label>
<controls:HyperlinkLabel NavigateUri="tel:010-62784859" TextColor="{DynamicResource SystemAccentColor}">010-62784859</controls:HyperlinkLabel>
Expand Down
8 changes: 4 additions & 4 deletions ver.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>

<PropertyGroup>
<AssemblyVersion>4.4.86.0</AssemblyVersion>
<FileVersion>4.4.86.0</FileVersion>
<Version>4.4.86.0</Version>
<AssemblyVersion>4.6.87.0</AssemblyVersion>
<FileVersion>4.6.87.0</FileVersion>
<Version>4.6.87.0</Version>
<Authors>Berrysoft</Authors>
<Copyright>Copyright (c) 2018-2021 Berrysoft</Copyright>
<Copyright>Copyright (c) 2018-2022 Berrysoft</Copyright>
</PropertyGroup>

</Project>

0 comments on commit 6540691

Please sign in to comment.