Upgrade to Ver.8.4.3

zhuxb711 · Mar 7, 2024 · d5309b8 · d5309b8
1 parent dc35dca
commit d5309b8
Show file tree

Hide file tree

Showing 15 changed files with 115 additions and 115 deletions.
diff --git a/Package/Package.appxmanifest b/Package/Package.appxmanifest
@@ -19,7 +19,7 @@
   <Identity
     Name="36186RuoFan.USB"
     Publisher="CN=4FF1CB23-04BD-4F9C-A86A-B4A43196FE02"
-    Version="8.4.2.0" />
+    Version="8.4.3.0" />
 
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>

diff --git a/RX_Explorer/Dialog/GetWinAppSdkDialog.xaml.cs b/RX_Explorer/Dialog/GetWinAppSdkDialog.xaml.cs
@@ -6,7 +6,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
-using Windows.Services.Store;
 using Windows.System;
 using Windows.UI;
 using Windows.UI.Xaml;
@@ -37,7 +36,7 @@ static async Task<string> GetCurrnetUserAccountNameAsync()
                     }
                 }
 
-                foreach (User CurrentUser in UserList.Prepend(User.GetDefault()).OfType<User>())
+                foreach (User CurrentUser in UserList.Prepend(Helper.AbsorbException(User.GetDefault)).OfType<User>())
                 {
                     string AccountName = Convert.ToString(await Helper.AbsorbExceptionAsync(() => CurrentUser.GetPropertyAsync(KnownUserProperties.AccountName).AsTask()));
 
@@ -95,7 +94,7 @@ await NoReentryExecution.ExecuteAsync(async () =>
 
                                     RedeemCodeContentResponseDto RedeemCodeResponse = await Exclusive.Controller.GetRedeemCodeFromBackendAsync(CustomerCollectionsId, Cancellation.Token);
 
-                                    CodeValidDate.Visibility = Visibility.Visible; 
+                                    CodeValidDate.Visibility = Visibility.Visible;
                                     ActivateUrlTextBox.Visibility = Visibility.Visible;
                                     GetActivationCodeButton.Visibility = Visibility.Collapsed;
                                     ActivateUrlTextBox.Text = RedeemCodeResponse.RedeemUrl;
@@ -147,6 +146,7 @@ private void ActivateUrlCopy_Click(object sender, RoutedEventArgs e)
             Package.SetText(ActivateUrlTextBox.Text);
 
             Clipboard.SetContent(Package);
+            Clipboard.Flush();
         }
 
         private async void ContactDeveloper_Click(object sender, RoutedEventArgs e)

diff --git a/RX_Explorer/MultilingualResources/RX_Explorer.de-DE.xlf b/RX_Explorer/MultilingualResources/RX_Explorer.de-DE.xlf
@@ -4984,8 +4984,8 @@ Inkorrekte Namen sind
           <target state="translated">Aktivierungscode einlösen</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourAccount" translate="yes" xml:space="preserve">
-          <source>Your Microsoft account</source>
-          <target state="translated">Ihr Microsoft-Konto</target>
+          <source>Your Microsoft account (Email)</source>
+          <target state="translated">Ihr Microsoft-Konto (E-Mail)</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourOrderScreenshot" translate="yes" xml:space="preserve">
           <source>Your orders history screenshot about RX-Explorer in your Microsoft account</source>

diff --git a/RX_Explorer/MultilingualResources/RX_Explorer.es.xlf b/RX_Explorer/MultilingualResources/RX_Explorer.es.xlf
@@ -4984,8 +4984,8 @@ Las denominaciones no válidas son:
           <target state="translated">Canjear el código de activación</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourAccount" translate="yes" xml:space="preserve">
-          <source>Your Microsoft account</source>
-          <target state="translated">Tu cuenta Microsoft</target>
+          <source>Your Microsoft account (Email)</source>
+          <target state="translated">Tu cuenta Microsoft (Correo electrónico)</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourOrderScreenshot" translate="yes" xml:space="preserve">
           <source>Your orders history screenshot about RX-Explorer in your Microsoft account</source>

diff --git a/RX_Explorer/MultilingualResources/RX_Explorer.fr-FR.xlf b/RX_Explorer/MultilingualResources/RX_Explorer.fr-FR.xlf
@@ -4984,8 +4984,8 @@ Les noms non valides incluent
           <target state="translated">Utiliser le code d’activation</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourAccount" translate="yes" xml:space="preserve">
-          <source>Your Microsoft account</source>
-          <target state="translated">Votre compte Microsoft</target>
+          <source>Your Microsoft account (Email)</source>
+          <target state="translated">Votre compte Microsoft (Courrier électronique)</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourOrderScreenshot" translate="yes" xml:space="preserve">
           <source>Your orders history screenshot about RX-Explorer in your Microsoft account</source>

diff --git a/RX_Explorer/MultilingualResources/RX_Explorer.zh-Hans.xlf b/RX_Explorer/MultilingualResources/RX_Explorer.zh-Hans.xlf
@@ -4984,8 +4984,8 @@ Invalid names include
           <target state="translated">兑换激活码</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourAccount" translate="yes" xml:space="preserve">
-          <source>Your Microsoft account</source>
-          <target state="translated">您的微软账号名称</target>
+          <source>Your Microsoft account (Email)</source>
+          <target state="translated">您的微软账号名称 (邮箱)</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourOrderScreenshot" translate="yes" xml:space="preserve">
           <source>Your orders history screenshot about RX-Explorer in your Microsoft account</source>

diff --git a/RX_Explorer/MultilingualResources/RX_Explorer.zh-Hant.xlf b/RX_Explorer/MultilingualResources/RX_Explorer.zh-Hant.xlf
@@ -4984,8 +4984,8 @@ Invalid names include
           <target state="translated">兌換啟動碼</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourAccount" translate="yes" xml:space="preserve">
-          <source>Your Microsoft account</source>
-          <target state="translated">您的微軟帳戶</target>
+          <source>Your Microsoft account (Email)</source>
+          <target state="translated">您的微軟帳戶 (电邮)</target>
         </trans-unit>
         <trans-unit id="ContactDeveloper_YourOrderScreenshot" translate="yes" xml:space="preserve">
           <source>Your orders history screenshot about RX-Explorer in your Microsoft account</source>

diff --git a/RX_Explorer/Package.appxmanifest b/RX_Explorer/Package.appxmanifest
@@ -19,7 +19,7 @@
   <Identity
     Name="36186RuoFan.USB"
     Publisher="CN=4FF1CB23-04BD-4F9C-A86A-B4A43196FE02"
-    Version="8.4.2.0" />
+    Version="8.4.3.0" />
 
   <mp:PhoneIdentity PhoneProductId="cb13434c-d58e-4756-a099-364235a676db" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/RX_Explorer/Strings/de-DE/Resources.resw b/RX_Explorer/Strings/de-DE/Resources.resw
@@ -3752,7 +3752,7 @@ Inkorrekte Namen sind
     <value>Aktivierungscode einlösen</value>
   </data>
   <data name="ContactDeveloper_YourAccount" xml:space="preserve">
-    <value>Ihr Microsoft-Konto</value>
+    <value>Ihr Microsoft-Konto (E-Mail)</value>
   </data>
   <data name="ContactDeveloper_YourOrderScreenshot" xml:space="preserve">
     <value>Screenshot Ihres Bestellverlaufs über RX-Explorer in Ihrem Microsoft-Konto</value>

diff --git a/RX_Explorer/Strings/en-US/Resources.resw b/RX_Explorer/Strings/en-US/Resources.resw
@@ -3857,7 +3857,7 @@ Invalid names include
     <value>Redeem the activation code</value>
   </data>
   <data name="ContactDeveloper_YourAccount" xml:space="preserve">
-    <value>Your Microsoft account</value>
+    <value>Your Microsoft account (Email)</value>
   </data>
   <data name="ContactDeveloper_YourOrderScreenshot" xml:space="preserve">
     <value>Your orders history screenshot about RX-Explorer in your Microsoft account</value>

diff --git a/RX_Explorer/Strings/es/Resources.resw b/RX_Explorer/Strings/es/Resources.resw
@@ -3752,7 +3752,7 @@ Las denominaciones no válidas son:
     <value>Canjear el código de activación</value>
   </data>
   <data name="ContactDeveloper_YourAccount" xml:space="preserve">
-    <value>Tu cuenta Microsoft</value>
+    <value>Tu cuenta Microsoft (Correo electrónico)</value>
   </data>
   <data name="ContactDeveloper_YourOrderScreenshot" xml:space="preserve">
     <value>Captura de pantalla del historial de pedidos sobre RX-Explorer en su cuenta Microsoft</value>

diff --git a/RX_Explorer/Strings/fr-FR/Resources.resw b/RX_Explorer/Strings/fr-FR/Resources.resw
@@ -3750,7 +3750,7 @@ Les noms non valides incluent
     <value>Utiliser le code d’activation</value>
   </data>
   <data name="ContactDeveloper_YourAccount" xml:space="preserve">
-    <value>Votre compte Microsoft</value>
+    <value>Votre compte Microsoft (Courrier électronique)</value>
   </data>
   <data name="ContactDeveloper_YourOrderScreenshot" xml:space="preserve">
     <value>Capture d’écran de l’historique de vos commandes sur RX-Explorer dans votre compte Microsoft</value>

diff --git a/RX_Explorer/Strings/zh-Hans/Resources.resw b/RX_Explorer/Strings/zh-Hans/Resources.resw
@@ -3750,7 +3750,7 @@
     <value>兑换激活码</value>
   </data>
   <data name="ContactDeveloper_YourAccount" xml:space="preserve">
-    <value>您的微软账号名称</value>
+    <value>您的微软账号名称 (邮箱)</value>
   </data>
   <data name="ContactDeveloper_YourOrderScreenshot" xml:space="preserve">
     <value>您的微软账号中有关RX文件管理器的订单历史截图</value>

diff --git a/RX_Explorer/Strings/zh-Hant/Resources.resw b/RX_Explorer/Strings/zh-Hant/Resources.resw
@@ -3750,7 +3750,7 @@
     <value>兌換啟動碼</value>
   </data>
   <data name="ContactDeveloper_YourAccount" xml:space="preserve">
-    <value>您的微軟帳戶</value>
+    <value>您的微軟帳戶 (电邮)</value>
   </data>
   <data name="ContactDeveloper_YourOrderScreenshot" xml:space="preserve">
     <value>您的 Microsoft 帳戶中有關 RX-Explorer 的訂單歷史記錄螢幕截圖</value>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -146,97 +146,97 @@ jobs:
           ArtifactName: "CIBuild"
           PathtoPublish: "$(CIBuildPublishLocation)"
 
-  - job: SideLoadBuild
-    displayName: "Build Sideload Application"
-    timeoutInMinutes: 180
-    pool:
-      vmImage: "windows-latest"
-    steps:
-      - task: UseDotNet@2
-        displayName: "Install .Net 7 SDK"
-        inputs:
-          packageType: sdk
-          installationPath: $(TempDirectory)
-          version: 7.x
-
-      - task: UseDotNet@2
-        displayName: "Install .Net 8 SDK"
-        inputs:
-          packageType: sdk
-          installationPath: $(TempDirectory)
-          version: 8.x
-
-      # Detect if Windows SDK is installed as requirement. If not install the SDK as requirement
-      - task: PowerShell@2
-        displayName: "Download And Install Latest Windows SDK As Requirement"
-        inputs:
-          targetType: "inline"
-          script: |
-            try {
-              $CurrentSDKVersion = $(Get-Item "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0").GetValue("ProductVersion")
-            } catch {
-              $CurrentSDKVersion = ''
-              Write-Host "Detect the installed Windows SDK failed. Installed Windows SDK Version is aligned with TargetSDKVersion. Skipping this check"
-            }
-
-            if ($CurrentSDKVersion -ne '') {
-              if($CurrentSDKVersion -lt $(TargetWindowsSDKVersion)) {
-                New-Item -Path $(WindowsSDKBaseLocation) -ItemType Directory
-
-                Write-Host "Start downloading Windows SDK Installer using BitsTransfer..."
-
-                Start-BitsTransfer -Source $(TargetWindowsSDKInstallerUrl) -Destination $(WindowsSDKInstallerLocation) -Description "Downloading Windows SDK..."
-
-                Write-Host "Windows SDK Installer download completed"
-                Write-Host "Start installing Windows SDK..."
-
-                Start-Process $(WindowsSDKInstallerLocation) -ArgumentList "/q" -Wait
-
-                Write-Host "Windows SDK installed completed"
-              } else {
-                Write-Host "Windows SDK meet the requeirement, skipping this task and no need to install the SDK"
-              }
-            }
-
-      - task: DownloadSecureFile@1
-        name: secureFile
-        displayName: "Download Publish Certificate"
-        inputs:
-          secureFile: "$(signingCert.secureFileName)"
-
-      - task: PowerShell@2
-        displayName: "Add AppCenter Secret Value"
-        inputs:
-          targetType: "inline"
-          script: |
-            Write-Host "Start adding AppCenter Secret Value."
-
-            $AppCenterSecret = '$(appCenter.secret)'
-            $TargetPath = '$(Build.SourcesDirectory)\RX_Explorer\View\ExtendedSplash.xaml.cs'
-            $TargetContent = Get-Content -Path $TargetPath
-            $TargetContent -Replace '<RX-Explorer-AppCenter-Secret-Value>', $AppCenterSecret | Set-Content -Path $TargetPath -Encoding UTF8
-
-            Write-Host "AppCenter Secret Value was added successfully"
-
-      - task: NuGetToolInstaller@1
-        displayName: "Install Nuget ToolSet"
-
-      - task: NuGetCommand@2
-        displayName: "Restore Nuget Packages On Solution"
-        inputs:
-          restoreSolution: "$(Solution)"
-
-      - task: VSBuild@1
-        displayName: "Build RX-Explorer Project"
-        inputs:
-          solution: "$(Solution)"
-          msbuildArgs: '/t:$(BuildProject):Rebuild /p:PreferredToolArchitecture="x64" /p:AppxBundlePlatforms="$(BuildPlatform)" /p:AppxPackageDir="$(SideloadBuildPublishLocation)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="$(signingCert.thumbprint)" /p:PackageCertificateKeyFile="$(secureFile.secureFilePath)" /p:PackageCertificatePassword="$(signingCert.password)"'
-          configuration: "$(BuildConfiguration)"
-          clean: true
-          msbuildArchitecture: "x64"
-
-      - task: PublishBuildArtifacts@1
-        displayName: "Publish And Upload Artifact"
-        inputs:
-          ArtifactName: "SideloadBuild"
-          PathtoPublish: "$(SideloadBuildPublishLocation)"
+  # - job: SideLoadBuild
+  #   displayName: "Build Sideload Application"
+  #   timeoutInMinutes: 180
+  #   pool:
+  #     vmImage: "windows-latest"
+  #   steps:
+  #     - task: UseDotNet@2
+  #       displayName: "Install .Net 7 SDK"
+  #       inputs:
+  #         packageType: sdk
+  #         installationPath: $(TempDirectory)
+  #         version: 7.x
+
+  #     - task: UseDotNet@2
+  #       displayName: "Install .Net 8 SDK"
+  #       inputs:
+  #         packageType: sdk
+  #         installationPath: $(TempDirectory)
+  #         version: 8.x
+
+  #     # Detect if Windows SDK is installed as requirement. If not install the SDK as requirement
+  #     - task: PowerShell@2
+  #       displayName: "Download And Install Latest Windows SDK As Requirement"
+  #       inputs:
+  #         targetType: "inline"
+  #         script: |
+  #           try {
+  #             $CurrentSDKVersion = $(Get-Item "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0").GetValue("ProductVersion")
+  #           } catch {
+  #             $CurrentSDKVersion = ''
+  #             Write-Host "Detect the installed Windows SDK failed. Installed Windows SDK Version is aligned with TargetSDKVersion. Skipping this check"
+  #           }
+
+  #           if ($CurrentSDKVersion -ne '') {
+  #             if($CurrentSDKVersion -lt $(TargetWindowsSDKVersion)) {
+  #               New-Item -Path $(WindowsSDKBaseLocation) -ItemType Directory
+
+  #               Write-Host "Start downloading Windows SDK Installer using BitsTransfer..."
+
+  #               Start-BitsTransfer -Source $(TargetWindowsSDKInstallerUrl) -Destination $(WindowsSDKInstallerLocation) -Description "Downloading Windows SDK..."
+
+  #               Write-Host "Windows SDK Installer download completed"
+  #               Write-Host "Start installing Windows SDK..."
+
+  #               Start-Process $(WindowsSDKInstallerLocation) -ArgumentList "/q" -Wait
+
+  #               Write-Host "Windows SDK installed completed"
+  #             } else {
+  #               Write-Host "Windows SDK meet the requeirement, skipping this task and no need to install the SDK"
+  #             }
+  #           }
+
+  #     - task: DownloadSecureFile@1
+  #       name: secureFile
+  #       displayName: "Download Publish Certificate"
+  #       inputs:
+  #         secureFile: "$(signingCert.secureFileName)"
+
+  #     - task: PowerShell@2
+  #       displayName: "Add AppCenter Secret Value"
+  #       inputs:
+  #         targetType: "inline"
+  #         script: |
+  #           Write-Host "Start adding AppCenter Secret Value."
+
+  #           $AppCenterSecret = '$(appCenter.secret)'
+  #           $TargetPath = '$(Build.SourcesDirectory)\RX_Explorer\View\ExtendedSplash.xaml.cs'
+  #           $TargetContent = Get-Content -Path $TargetPath
+  #           $TargetContent -Replace '<RX-Explorer-AppCenter-Secret-Value>', $AppCenterSecret | Set-Content -Path $TargetPath -Encoding UTF8
+
+  #           Write-Host "AppCenter Secret Value was added successfully"
+
+  #     - task: NuGetToolInstaller@1
+  #       displayName: "Install Nuget ToolSet"
+
+  #     - task: NuGetCommand@2
+  #       displayName: "Restore Nuget Packages On Solution"
+  #       inputs:
+  #         restoreSolution: "$(Solution)"
+
+  #     - task: VSBuild@1
+  #       displayName: "Build RX-Explorer Project"
+  #       inputs:
+  #         solution: "$(Solution)"
+  #         msbuildArgs: '/t:$(BuildProject):Rebuild /p:PreferredToolArchitecture="x64" /p:AppxBundlePlatforms="$(BuildPlatform)" /p:AppxPackageDir="$(SideloadBuildPublishLocation)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="$(signingCert.thumbprint)" /p:PackageCertificateKeyFile="$(secureFile.secureFilePath)" /p:PackageCertificatePassword="$(signingCert.password)"'
+  #         configuration: "$(BuildConfiguration)"
+  #         clean: true
+  #         msbuildArchitecture: "x64"
+
+  #     - task: PublishBuildArtifacts@1
+  #       displayName: "Publish And Upload Artifact"
+  #       inputs:
+  #         ArtifactName: "SideloadBuild"
+  #         PathtoPublish: "$(SideloadBuildPublishLocation)"