Change: 修正错误的安装步骤，将.net版本升级至7.0

Miaoyww · Oct 21, 2023 · 61db6d4 · 61db6d4
1 parent 89affe9
commit 61db6d4
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 36 deletions.
diff --git a/NonsPlayer/NonsPlayer.csproj b/NonsPlayer/NonsPlayer.csproj
@@ -18,7 +18,7 @@
         <AssemblyVersion>0.3.2</AssemblyVersion>
         <FileVersion>0.3.2</FileVersion>
         <Product>NonsPlayer</Product>
-        <PackageCertificateThumbprint>1B4546F36CAFF8A204BEB64202DB844480503318</PackageCertificateThumbprint>
+        <PackageCertificateThumbprint>4381F2516CEDCC8E4FEFF35808EA2926312EE456</PackageCertificateThumbprint>
         <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
         <ApplicationIcon>Assets/WindowIcon.ico</ApplicationIcon>
         <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -28,38 +28,39 @@
         <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
         <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
         <GenerateTestArtifacts>True</GenerateTestArtifacts>
-        <AppxBundle>Never</AppxBundle>
+        <AppxBundle>Auto</AppxBundle>
         <AppInstallerUri>D:\Program Files\NonsPlayer</AppInstallerUri>
         <RepositoryUrl></RepositoryUrl>
         <IsPackable>false</IsPackable>
-        <Authors/>
+        <Authors />
         <Company>Miaoyww</Company>
         <PublicSign>false</PublicSign>
+        <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     </PropertyGroup>
 
     <ItemGroup>
-        <Manifest Include="$(ApplicationManifest)"/>
+        <Manifest Include="$(ApplicationManifest)" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1"/>
-        <PackageReference Include="F23.StringSimilarity" Version="5.1.0"/>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1"/>
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+        <PackageReference Include="F23.StringSimilarity" Version="5.1.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
         <PackageReference Include="Microsoft.Windows.CsWin32" PrivateAssets="all" Version="0.3.18-beta">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002"/>
-        <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9"/>
-        <PackageReference Include="NAudio" Version="2.1.0"/>
-        <PackageReference Include="QRCoder" Version="1.4.3"/>
-        <PackageReference Include="RestSharp" Version="106.15.0"/>
-        <PackageReference Include="WinUIEx" Version="2.2.0"/>
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
+        <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
+        <PackageReference Include="NAudio" Version="2.1.0" />
+        <PackageReference Include="QRCoder" Version="1.4.3" />
+        <PackageReference Include="RestSharp" Version="106.15.0" />
+        <PackageReference Include="WinUIEx" Version="2.2.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\NonsPlayer.Core\NonsPlayer.Core.csproj"/>
-        <ProjectReference Include="..\NonsPlayer.Updater\NonsPlayer.Updater.csproj"/>
+        <ProjectReference Include="..\NonsPlayer.Core\NonsPlayer.Core.csproj" />
+        <ProjectReference Include="..\NonsPlayer.Updater\NonsPlayer.Updater.csproj" />
     </ItemGroup>
     <ItemGroup>
         <None Update="appsettings.json">
@@ -135,20 +136,20 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Remove="Assets\Icons\arrow-back.svg"/>
-        <None Remove="Assets\Icons\arrow-next.svg"/>
-        <None Remove="Assets\Icons\liked.svg"/>
-        <None Remove="Assets\Icons\search.svg"/>
-        <None Remove="Assets\Icons\unliked.svg"/>
-        <None Remove="Assets\SplashScreen.png"/>
-        <None Remove="Assets\UnknowResource.png"/>
-        <None Remove="Assets\WindowIcon.ico"/>
-        <None Remove="Components\Views\BestArtistCard.xaml"/>
-        <None Remove="Components\Views\BestResultCard.xaml"/>
-        <None Remove="Components\Views\FunctionBar.xaml"/>
-        <None Remove="Components\Views\LyricBox.xaml"/>
-        <None Remove="Components\Views\PlayerBar.xaml"/>
-        <None Remove="Components\Views\UserPlaylistCard.xaml"/>
+        <None Remove="Assets\Icons\arrow-back.svg" />
+        <None Remove="Assets\Icons\arrow-next.svg" />
+        <None Remove="Assets\Icons\liked.svg" />
+        <None Remove="Assets\Icons\search.svg" />
+        <None Remove="Assets\Icons\unliked.svg" />
+        <None Remove="Assets\SplashScreen.png" />
+        <None Remove="Assets\UnknowResource.png" />
+        <None Remove="Assets\WindowIcon.ico" />
+        <None Remove="Components\Views\BestArtistCard.xaml" />
+        <None Remove="Components\Views\BestResultCard.xaml" />
+        <None Remove="Components\Views\FunctionBar.xaml" />
+        <None Remove="Components\Views\LyricBox.xaml" />
+        <None Remove="Components\Views\PlayerBar.xaml" />
+        <None Remove="Components\Views\UserPlaylistCard.xaml" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/NonsPlayer/Package.appxmanifest b/NonsPlayer/Package.appxmanifest
@@ -12,7 +12,7 @@
     <Identity
             Name="EB15650D-CE4F-4DEA-8F56-EF591D71C664"
             Publisher="CN=Miaoyww"
-            Version="0.3.2.0"/>
+            Version="0.3.3.0"/>
 
     <Properties>
         <DisplayName>NonsPlayer</DisplayName>

diff --git a/README-CN.md b/README-CN.md
@@ -5,7 +5,7 @@
 
 # NonsPlayer
 
-![.net](https://img.shields.io/badge/C%23-.net6.0-orange)
+![.net](https://img.shields.io/badge/C%23-.net7.0-orange)
 ![Windows](https://img.shields.io/badge/Windows-10%2B-orange)
 ![license](https://img.shields.io/github/license/Miaoywww/NeteaseCloudMusicControl)
 
@@ -38,8 +38,8 @@
 
 你可以看到解压后目录中有 `NonsPlayer_x.x.x.x_xxx.msix` 文件和 `NonsPlayer_x.x.x.x_xxx.cer` 文件
 双击`cer`文件, 选择 `安装证书` 然后点击下一步.选择 `本地计算机` 然后下一步
-选择 `根据证书类型自动..` 接着下一步, 然后完成即可.
-双击打开`msix` 文件, 然后点击安装即可.
+选择 `将所有的证书都放入下列储存` 接着选择 `受信任的根证书颁发机构` .
+双击打开`msix` 文件, 再次点击安装即可.
 
 # 🧭开发指南
 

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 # NonsPlayer
 
-![.net](https://img.shields.io/badge/C%23-.net6.0-orange)
+![.net](https://img.shields.io/badge/C%23-.net7.0-orange)
 ![Windows](https://img.shields.io/badge/Windows-10%2B-orange)
 ![license](https://img.shields.io/github/license/Miaoywww/NeteaseCloudMusicControl)
 
@@ -39,8 +39,8 @@ version, unzip it.
 
 You can see a `NonsPlayer_x.x.x.x_xxx.msix` file and a `NonsPlayer_x.x.x.x_xxx.cer` file.
 Double Click the cer, select `Install Certificate` and press Next Button.Select `Local Machine` and next
-select `Automatically select the certificate store based...` and press Next Button.Then Finish installing the
-certificate.
+select `Place all certificates in the following store` and press `Browse`.In the Select Certificate Store dialog, 
+select Trusted Root Certification Authorities.
 
 After installed the cer, double click the `msix` file and press Install Button and then You can use it!