更新依赖

Paving-Base · Mar 24, 2023 · d11c579 · d11c579
1 parent b38d095
commit d11c579
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 95 deletions.
diff --git a/APKInstaller.sln b/APKInstaller.sln
@@ -11,13 +11,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "APKInstaller (Delegate)", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AAPTForUWP", "APKInstaller\AAPTForUWP\AAPTForUWP.csproj", "{691DC506-E415-49FA-8895-FD96DC06C69F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{E96A0EB3-6448-407D-8966-C5D44D5F0B47}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{AB3D623D-F9A1-4DDD-831D-0A48DD1536AA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessForUWP.UWP", "..\Process-For-UWP\ProcessForUWP.UWP\ProcessForUWP.UWP.csproj", "{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessForUWP.Desktop", "..\Process-For-UWP\ProcessForUWP.Desktop\ProcessForUWP.Desktop.csproj", "{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessForUWP.Core", "..\Process-For-UWP\ProcessForUWP.Core\ProcessForUWP.Core.csproj", "{5AF80411-2A65-48B4-8D23-CD134A9B13D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvancedSharpAdbClient", "..\AdvancedSharpAdbClient\AdvancedSharpAdbClient\AdvancedSharpAdbClient.csproj", "{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -123,74 +119,32 @@ Global
 		{691DC506-E415-49FA-8895-FD96DC06C69F}.Release|x64.Build.0 = Release|Any CPU
 		{691DC506-E415-49FA-8895-FD96DC06C69F}.Release|x86.ActiveCfg = Release|Any CPU
 		{691DC506-E415-49FA-8895-FD96DC06C69F}.Release|x86.Build.0 = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|ARM.Build.0 = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|x64.Build.0 = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Debug|x86.Build.0 = Debug|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|ARM.ActiveCfg = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|ARM.Build.0 = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|ARM64.Build.0 = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|x64.ActiveCfg = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|x64.Build.0 = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|x86.ActiveCfg = Release|Any CPU
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4}.Release|x86.Build.0 = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|x64.Build.0 = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Debug|x86.Build.0 = Debug|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|ARM.Build.0 = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|ARM64.Build.0 = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|x64.ActiveCfg = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|x64.Build.0 = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|x86.ActiveCfg = Release|Any CPU
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC}.Release|x86.Build.0 = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|ARM.Build.0 = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|x64.Build.0 = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Debug|x86.Build.0 = Debug|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|ARM.Build.0 = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|ARM64.Build.0 = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|x64.ActiveCfg = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|x64.Build.0 = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|x86.ActiveCfg = Release|Any CPU
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6}.Release|x86.Build.0 = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|x64.Build.0 = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Debug|x86.Build.0 = Debug|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|ARM.Build.0 = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|ARM64.Build.0 = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|x64.ActiveCfg = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|x64.Build.0 = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{091F4DDF-479B-4179-AF0A-0C6E8440D6C4} = {E96A0EB3-6448-407D-8966-C5D44D5F0B47}
-		{7A09E63C-35F1-4BBC-9035-D2C4171C1CBC} = {E96A0EB3-6448-407D-8966-C5D44D5F0B47}
-		{5AF80411-2A65-48B4-8D23-CD134A9B13D6} = {E96A0EB3-6448-407D-8966-C5D44D5F0B47}
+		{CDC1ADDC-133D-4C93-9074-0C4CC6B153C7} = {AB3D623D-F9A1-4DDD-831D-0A48DD1536AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DFEF26CF-4248-47B1-9E0C-EBB3BD1F26E7}

diff --git a/APKInstaller/AAPTForUWP/AAPTForUWP.csproj b/APKInstaller/AAPTForUWP/AAPTForUWP.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
+    <ExtrasUwpMetaPackageVersion>6.2.14</ExtrasUwpMetaPackageVersion>
 	<LangVersion>preview</LangVersion>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>uap10.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Process-For-UWP\ProcessForUWP.UWP\ProcessForUWP.UWP.csproj" />
+    <PackageReference Include="ProcessForUWP.UWP" Version="0.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/APKInstaller/AAPTForUWP/AAPTool.cs b/APKInstaller/AAPTForUWP/AAPTool.cs
@@ -106,7 +106,7 @@ void OnOutputDataReceived(object sender, DataReceivedEventArgsEx e)
                 aapt.OutputDataReceived += OnOutputDataReceived;
                 while (!aapt.IsExited)
                 {
-                    cancellationToken.Token.ThrowIfCancellationRequested();
+                    if (cancellationToken.Token.IsCancellationRequested) { break; }
                 }
             }
             catch (Exception)

diff --git a/APKInstaller/APKInstaller (Delegate)/APKInstaller (Delegate).csproj b/APKInstaller/APKInstaller (Delegate)/APKInstaller (Delegate).csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Process-For-UWP\ProcessForUWP.Desktop\ProcessForUWP.Desktop.csproj" />
+    <PackageReference Include="ProcessForUWP.Desktop" Version="0.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/APKInstaller/APKInstaller/APKInstaller.csproj b/APKInstaller/APKInstaller/APKInstaller.csproj
@@ -744,9 +744,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AdvancedSharpAdbClient">
-      <Version>2.5.2</Version>
-    </PackageReference>
     <PackageReference Include="Downloader">
       <Version>3.0.1</Version>
     </PackageReference>
@@ -769,29 +766,35 @@
       <Version>7.1.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.8.1</Version>
+      <Version>2.8.2</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>13.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="ProcessForUWP.UWP">
+      <Version>0.0.4</Version>
     </PackageReference>
     <PackageReference Include="SharpCompress">
-      <Version>0.32.2</Version>
+      <Version>0.33.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="WindowsDesktop, Version=10.0.22621.0">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
+    <SDKReference Include="WindowsMobile, Version=10.0.22621.0">
+      <Name>Windows Mobile Extensions for the UWP</Name>
+    </SDKReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Process-For-UWP\ProcessForUWP.UWP\ProcessForUWP.UWP.csproj">
-      <Project>{d213387b-3a14-444c-b733-beb9f71aff76}</Project>
-      <Name>ProcessForUWP.UWP</Name>
-    </ProjectReference>
     <ProjectReference Include="..\AAPTForUWP\AAPTForUWP.csproj">
       <Project>{719fd4b4-4ac6-4165-b4d5-5489f2500c32}</Project>
       <Name>AAPTForUWP</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AdvancedSharpAdbClient\AdvancedSharpAdbClient\AdvancedSharpAdbClient.csproj">
+      <Project>{9A19103F-16F7-4668-BE54-9A1E7A4F7556}</Project>
+      <Name>AdvancedSharpAdbClient</Name>
+	</ProjectReference>
   </ItemGroup>
   <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

diff --git a/APKInstaller/APKInstaller/Helpers/CommandHelper.cs b/APKInstaller/APKInstaller/Helpers/CommandHelper.cs
@@ -77,8 +77,8 @@ await Task.Run(() =>
                     {
                         while (!process.IsExited)
                         {
-                            Token.Token.ThrowIfCancellationRequested();
-                            cancellationToken.ThrowIfCancellationRequested();
+                            if (Token.Token.IsCancellationRequested) { break; }
+                            if (cancellationToken.IsCancellationRequested) { break; }
                         }
                     });
                 }

diff --git a/APKInstaller/APKInstaller/ViewModels/InstallViewModel.cs b/APKInstaller/APKInstaller/ViewModels/InstallViewModel.cs
@@ -48,7 +48,7 @@ public class InstallViewModel : INotifyPropertyChanged, IDisposable
         private string _path = string.Empty;
 #else
         private Uri _url = new("apkinstaller:?source=https://dl.coolapk.com/down?pn=com.coolapk.market&id=NDU5OQ&h=46bb9d98&from=from-web");
-        private string _path = @"C:\Users\qq251\Downloads\Programs\Minecraft_1.18.2.03_sign.apk";
+        private string _path = @"C:\Users\qq251\Downloads\Programs\weixin8030android2260_arm64.apk";
 #endif
         private bool NetAPKExist => _path != APKTemp || File.Exists(_path);
 
@@ -1061,7 +1061,7 @@ private async Task<bool> ShowDeviceDialog()
                             WaitProgressText = _loader.GetString("WaitingWSAStart");
                             while (!CheckDevice())
                             {
-                                TokenSource.Token.ThrowIfCancellationRequested();
+                                if (TokenSource.Token.IsCancellationRequested) { break; }
                                 if (NetworkHelper.Instance.ConnectionInformation.IsInternetAvailable)
                                 {
                                     await AddressHelper.ConnectHyperV();

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+
+  <PropertyGroup>
+    <FullTargets>True</FullTargets>
+  </PropertyGroup>
+
+</Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -37,13 +37,13 @@ steps:
   displayName: 'Download CA certificate'
   inputs:
     secureFile: 'where.pfx'
-
+    
 - task: CmdLine@2
-  displayName: 'Clone Process-For-UWP'
+  displayName: 'Clone SharpAdbClient'
   inputs:
     script: |
-      echo 'Cloning into sources folder at: $(Build.SourcesDirectory)\..\Process-For-UWP'
-      git clone https://github.com/wherewhere/Process-For-UWP.git --progress --branch master --single-branch --depth=1 $(Build.SourcesDirectory)\..\Process-For-UWP
+      echo 'Cloning into sources folder at: $(Build.SourcesDirectory)\..\AdvancedSharpAdbClient'
+      git clone https://github.com/yungd1plomat/AdvancedSharpAdbClient.git --progress --branch main --single-branch --depth=1 $(Build.SourcesDirectory)\..\AdvancedSharpAdbClient
       exit
 
 - task: VSBuild@1

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "msbuild-sdks": {
+      "MSBuild.Sdk.Extras": "3.0.44"
+    }
+}