Update .NET 6.0.2 & Fix PubTool Version 4

ayuegm · Feb 9, 2022 · 629518f · 629518f
1 parent a495cd2
commit 629518f
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 59 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,4 +1,40 @@
 <Project>
+	<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
+		<!-- Microsoft.Extensions.* & AspNetCore & EntityFrameworkCore(NET60) -->
+		<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.2" />
+		<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.2" />
+	</ItemGroup>
+	<ItemGroup Condition=" $(TargetFramework.StartsWith('net5.0')) ">
+		<!-- Microsoft.Extensions.* & AspNetCore & EntityFrameworkCore(NET50) -->
+		<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="5.0.12" />
+		<PackageVersion Include="Microsoft.Extensions.Http" Version="5.0.12" />
+		<PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.12" />
+		<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.12" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.14" />
+	</ItemGroup>
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcoreapp3.1'))">
 		<!-- Microsoft.Extensions.* & AspNetCore & EntityFrameworkCore(NETCOREAPP31) -->
 		<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.22" />
@@ -17,46 +53,10 @@
 		<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.22" />
 		<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.22" />
 	</ItemGroup>
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net5.0')) ">
-		<!-- Microsoft.Extensions.* & AspNetCore & EntityFrameworkCore(NET50) -->
-		<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.Extensions.Http" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.12" />
-		<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.12" />
-	</ItemGroup>
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
-		<!-- Microsoft.Extensions.* & AspNetCore & EntityFrameworkCore(NET60) -->
-		<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-		<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
-		<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-		<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-		<PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
-		<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.1" />
-	</ItemGroup>
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
 		<!-- Entity Framework Plus -->
 		<!-- A FREE & Open Source library to enhance EF6 and EF Core -->
-		<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="6.13.7" />
+		<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="6.13.9" />
 
 		<!-- AspNetCore 6 OpenId/OAuth -->
 		<PackageVersion Include="AspNet.Security.OpenId.Steam" Version="6.0.0" />
@@ -79,7 +79,7 @@
 	</ItemGroup>
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
 		<!-- BCL(NETSTANDARD) -->
-		<PackageVersion Include="System.Text.Json" Version="6.0.1" />
+		<PackageVersion Include="System.Text.Json" Version="6.0.2" />
 		<PackageVersion Include="System.Text.Encodings.Web" Version="6.0.0" />
 		<PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
 		<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />

diff --git a/global.json b/global.json
@@ -3,6 +3,6 @@
     "MSBuild.Sdk.Extras": "3.0.44"
   },
   "sdk": {
-    "version": "6.0.101"
+    "version": "6.0.102"
   }
 }
diff --git a/packaging/build-osx-app.sh b/packaging/build-osx-app.sh
@@ -33,9 +33,9 @@ emit_plist() {
 	<key>CFBundleIdentifier</key>
 	<string>net.steampp.app</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.7</string>
+	<string>2.6.8</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.7.0</string>
+	<string>2.6.8.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.14</string>
 	<key>CFBundleDevelopmentRegion</key>

diff --git a/release-template.md b/release-template.md
@@ -50,7 +50,7 @@
 						- .nupkg 文件可使用解压工具打开或解压，找到此文件复制即可
 
 [![steampp.net](https://img.shields.io/badge/WebSite-steampp.net-brightgreen.svg?style=flat-square&color=61dafb)](https://steampp.net)
-[![Steam++ v2.6.7](https://img.shields.io/badge/Steam++-v2.6.7-brightgreen.svg?style=flat-square&color=512bd4)]()
+[![Steam++ v2.6.8](https://img.shields.io/badge/Steam++-v2.6.8-brightgreen.svg?style=flat-square&color=512bd4)]()
 
 
 ##### [不知道该下载哪个文件?](./download-guide.md)
@@ -59,21 +59,21 @@
 ### 文件校验
 |  File  | Checksum (SHA256)  |
 |  ----  |  ----  |
-| Steam++_win_x64_v2.6.7.7z  | SHA256 |
-| Steam++_win_x64_fde_v2.6.7.7z  | SHA256 |
+| Steam++_win_x64_v2.6.8.7z  | SHA256 |
+| Steam++_win_x64_fde_v2.6.8.7z  | SHA256 |
 | | |
-| Steam++_win_x64_v2.6.7.exe  | SHA256 |
-| Steam++_win_x64_fde_v2.6.7.exe  | SHA256 |
+| Steam++_win_x64_v2.6.8.exe  | SHA256 |
+| Steam++_win_x64_fde_v2.6.8.exe  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.7.7z  | SHA256 |
-| Steam++_linux_arm64_v2.6.7.7z  | SHA256 |
+| Steam++_linux_x64_v2.6.8.7z  | SHA256 |
+| Steam++_linux_arm64_v2.6.8.7z  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.7.deb  | SHA256 |
-| Steam++_linux_arm64_v2.6.7.deb  | SHA256 |
+| Steam++_linux_x64_v2.6.8.deb  | SHA256 |
+| Steam++_linux_arm64_v2.6.8.deb  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.7.rpm  | SHA256 |
-| Steam++_linux_arm64_v2.6.7.rpm  | SHA256 |
+| Steam++_linux_x64_v2.6.8.rpm  | SHA256 |
+| Steam++_linux_arm64_v2.6.8.rpm  | SHA256 |
 | | |
-| Steam++_macos_x64_v2.6.7.dmg  | SHA256 |
+| Steam++_macos_x64_v2.6.8.dmg  | SHA256 |
 | | |
-| Steam++_android_v2.6.7.apk  | SHA256 |
+| Steam++_android_v2.6.8.apk  | SHA256 |
diff --git a/src/Common.CoreLib/Properties/ThisAssembly.Version.cs b/src/Common.CoreLib/Properties/ThisAssembly.Version.cs
@@ -12,7 +12,7 @@ static partial class ThisAssembly
         ///   <item> macOS：\packaging\build-osx-app.sh &lt;CFBundleVersion&gt; &lt;CFBundleShortVersionString&gt; </item>
         /// </list>
         /// </summary>
-        public const string Version = "2.6.7";
+        public const string Version = "2.6.8";
 
         //public const string InfoVersion = Version + "-beta";
     }

diff --git a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="4651ED44255E.47979655102CE"
     Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
-    Version="2.6.7.0" />
+    Version="2.6.8.0" />
 
   <Properties>
     <DisplayName>Steam++</DisplayName>

diff --git a/src/ST.Client.Mobile.Droid.App/Properties/AndroidManifest.xml b/src/ST.Client.Mobile.Droid.App/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="20220206" android:versionName="2.6.7" package="net.steampp.app" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="20220206" android:versionName="2.6.8" package="net.steampp.app" android:installLocation="auto">
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
   <application android:fullBackupContent="@xml/auto_backup_rules"></application>
   <!-- Required for API Level 30 to make sure the app can detect browsers and other apps where communication is needed.-->

diff --git a/src/ST.Tools.Publish/Utils.cs b/src/ST.Tools.Publish/Utils.cs
@@ -267,7 +267,19 @@ public static string Version
                 var mainDllPath = ProjectPathUtil.projPath + ProjectPathUtil.MainDllPath;
                 var version = (File.Exists(mainDllPath) ? FileVersionInfo.GetVersionInfo(mainDllPath).FileVersion : null) ?? ThisAssembly.Version;
                 var versionArray = version.Split('.', StringSplitOptions.RemoveEmptyEntries);
-                if (versionArray.Length > 3) version = string.Join('.', versionArray.Take(3));
+                switch (versionArray.Length)
+                {
+                    case 1:
+                        version = $"{versionArray[0]}.0.0";
+                        break;
+                    case 2:
+                        version = $"{versionArray[0]}.{versionArray[1]}.0";
+                        break;
+                    case 3:
+                    case 4:
+                        version = string.Join('.', versionArray);
+                        break;
+                }
                 return version;
             }
             set
@@ -283,7 +295,19 @@ public static string GetVersion(bool dev)
             var mainDllPath = ProjectPathUtil.projPath + string.Format(ProjectPathUtil.MainDllPath_, configuration);
             var version = (File.Exists(mainDllPath) ? FileVersionInfo.GetVersionInfo(mainDllPath).FileVersion : null) ?? ThisAssembly.Version;
             var versionArray = version.Split('.', StringSplitOptions.RemoveEmptyEntries);
-            if (versionArray.Length > 3) version = string.Join('.', versionArray.Take(3));
+            switch (versionArray.Length)
+            {
+                case 1:
+                    version = $"{versionArray[0]}.0.0";
+                    break;
+                case 2:
+                    version = $"{versionArray[0]}.{versionArray[1]}.0";
+                    break;
+                case 3:
+                case 4:
+                    version = string.Join('.', versionArray);
+                    break;
+            }
             return version;
         }