Finish task and publish 5.0.905.0 version

1.Finish task and publish 5.0.905.0 version 2.Remove custom Microsoft.Web.WebView2.Core.Projection 3.Update Windows App SDK to 1.6.240829007 4.Update Microsoft.Web.WebView2 to 1.0.2817-prerelease(bug fix)
Gaoyifei1011 · Sep 5, 2024 · 2ca8523 · 2ca8523
1 parent 48454aa
commit 2ca8523
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 103 deletions.
diff --git a/GetStoreApp.sln b/GetStoreApp.sln
@@ -43,8 +43,6 @@ Project("{911E67C6-3D85-4FCE-B560-20A9C3E3FF48}") = "signtool", "signtool.exe",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetStoreAppWebView", "GetStoreAppWebView\GetStoreAppWebView.csproj", "{AA3374D5-346B-41F9-A362-329F01589BE2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.WebView2.Core.Projection", "Microsoft.Web.WebView2.Core.Projection\Microsoft.Web.WebView2.Core.Projection.csproj", "{1393D03D-7521-4AAD-A8D0-136E3A4482F8}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -115,18 +113,6 @@ Global
 		{AA3374D5-346B-41F9-A362-329F01589BE2}.Release|x64.Build.0 = Release|x64
 		{AA3374D5-346B-41F9-A362-329F01589BE2}.Release|x86.ActiveCfg = Release|x86
 		{AA3374D5-346B-41F9-A362-329F01589BE2}.Release|x86.Build.0 = Release|x86
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Debug|ARM64.Build.0 = Debug|ARM64
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Debug|x64.ActiveCfg = Debug|x64
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Debug|x64.Build.0 = Debug|x64
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Debug|x86.ActiveCfg = Debug|x86
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Debug|x86.Build.0 = Debug|x86
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Release|ARM64.ActiveCfg = Release|ARM64
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Release|ARM64.Build.0 = Release|ARM64
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Release|x64.ActiveCfg = Release|x64
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Release|x64.Build.0 = Release|x64
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Release|x86.ActiveCfg = Release|x86
-		{1393D03D-7521-4AAD-A8D0-136E3A4482F8}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -27,7 +27,7 @@
     <PublishProtocol>FileSystem</PublishProtocol>
     <PublishReadyToRun>false</PublishReadyToRun>
     <PublishSelfContained>true</PublishSelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
+    <PublishSingleFile>true</PublishSingleFile>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <RootNamespace>GetStoreApp</RootNamespace>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
@@ -36,8 +36,9 @@
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
     <UseRidGraph>true</UseRidGraph>
-    <UseUwp>false</UseUwp>
+    <UseUwpTools>false</UseUwpTools>
     <WebView2EnableCsWinRTProjection>false</WebView2EnableCsWinRTProjection>
+    <WebView2NeverCopyLoaderDllToOutputDirectory>true</WebView2NeverCopyLoaderDllToOutputDirectory>
     <WebView2UseWinRT>true</WebView2UseWinRT>
     <Win32Resource>GetStoreApp.res</Win32Resource>
     <WindowsAppSDKDeploymentManagerInitialize>false</WindowsAppSDKDeploymentManagerInitialize>
@@ -112,9 +113,9 @@
     <None Remove="Views\Windows\MainWindow.xaml" />
     <None Remove="WinUIApp.xaml" />
 
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2817-prerelease" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240821007-preview2" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
 
     <Page Update="Styles\WinUI\AppBarButton.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
     <Page Update="Styles\WinUI\HyperlinkButton.xaml" XamlRuntime="$(DefaultXamlRuntime)" />

diff --git a/GetStoreApp/GetStoreApp.res b/GetStoreApp/GetStoreApp.res
diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 [assembly: AssemblyCompany("高怡飞")]
 [assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
 [assembly: AssemblyDescription("获取商店应用")]
-[assembly: AssemblyFileVersion("4.6.904.0")]
-[assembly: AssemblyInformationalVersion("4.6.904.0")]
+[assembly: AssemblyFileVersion("5.0.905.0")]
+[assembly: AssemblyInformationalVersion("5.0.905.0")]
 [assembly: AssemblyProduct("获取商店应用")]
 [assembly: AssemblyTitle("获取商店应用")]
-[assembly: AssemblyVersion("4.6.904.0")]
+[assembly: AssemblyVersion("5.0.905.0")]
 
 // 应用程序默认区域性的资源控制器设置
 [assembly: NeutralResourcesLanguage("en-us")]

diff --git a/GetStoreAppPackage/GetStoreAppPackage.wapproj b/GetStoreAppPackage/GetStoreAppPackage.wapproj
@@ -50,11 +50,11 @@
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <PackageCertificateKeyFile>GetStoreAppPackage_SignKey.pfx</PackageCertificateKeyFile>
-    <ProjectGuid>ca6c2dc4-c96d-4c23-ae18-fc7150bef554</ProjectGuid>
+    <ProjectGuid>CA6C2DC4-C96D-4C23-AE18-FC7150BEF554</ProjectGuid>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <TargetFrameworkMoniker>.NETCoreApp,Version=v9.0</TargetFrameworkMoniker>
     <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
-    <UserSecretsId>ff1007a3-37e5-4856-a3d5-765555830f81</UserSecretsId>
+    <UserSecretsId>FF1007A3-37E5-4856-A3D5-765555830F81</UserSecretsId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <AppxBundle>Always</AppxBundle>
@@ -106,8 +106,7 @@
   -->
   <Target Name="_RemoveFilesFromPayload" AfterTargets="_CalculateInputsForGenerateAppxPackageRecipe" Condition="'$(MSBuildProjectExtension)' == '.wapproj' and '$(_IsGeneratingAppxPackage)' == 'true'">
     <ItemGroup>
-      <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="'%(FileName)%(Extension)'=='Microsoft.WindowsAppRuntime.Bootstrap.dll'" />
-      <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="'%(FileName)%(Extension)'=='WebView2Loader.dll'" />
+      <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="'%(FileName)%(Extension)'=='Microsoft.Web.WebView2.Core.Projection.dll'" />
       <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="$([System.String]::new('%(Identity)').EndsWith('.xr.xml'))" />
     </ItemGroup>
   </Target>

diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
 	  Name="Gaoyifei1011.GetStoreApp"
 	  Publisher="CN=高怡飞"
-	  Version="4.6.904.0" />
+	  Version="5.0.905.0" />
 
   <Properties>
     <DisplayName>ms-resource:PackageDisplayName</DisplayName>

diff --git a/GetStoreAppWebView/GetStoreAppWebView.csproj b/GetStoreAppWebView/GetStoreAppWebView.csproj
@@ -27,7 +27,7 @@
     <PublishProtocol>FileSystem</PublishProtocol>
     <PublishReadyToRun>false</PublishReadyToRun>
     <PublishSelfContained>true</PublishSelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
+    <PublishSingleFile>true</PublishSingleFile>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <RootNamespace>GetStoreAppWebView</RootNamespace>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
@@ -36,7 +36,8 @@
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
     <UseRidGraph>true</UseRidGraph>
-    <UseUwp>true</UseUwp>
+    <UseUwpTools>true</UseUwpTools>
+    <WebView2EnableCsWinRTProjection>true</WebView2EnableCsWinRTProjection>
     <Win32Resource>GetStoreAppWebView.res</Win32Resource>
     <WindowsSdkPackageVersion>10.0.26100.42</WindowsSdkPackageVersion>
   </PropertyGroup>
@@ -76,8 +77,9 @@
     <None Remove="Styles\UWP\TextBlock.xaml" />
 
     <PackageReference Include="DisposableMemory.ModernNetUAP.XamlCompiler" Version="0.2.2" />
+
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2817-prerelease" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
-    <ProjectReference Include="..\Microsoft.Web.WebView2.Core.Projection\Microsoft.Web.WebView2.Core.Projection.csproj" />
 
     <Page Update="Dialogs\ProcessFailedDialog.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
     <Page Update="Pages\MainPage.xaml" XamlRuntime="$(DefaultXamlRuntime)" />

diff --git a/GetStoreAppWebView/GetStoreAppWebView.res b/GetStoreAppWebView/GetStoreAppWebView.res
diff --git a/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs b/Microsoft.Management.Deployment.Projection/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 [assembly: AssemblyCompany("高怡飞")]
 [assembly: AssemblyCopyright("©Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
 [assembly: AssemblyDescription("获取商店应用 WinGet WinRT 扩展")]
-[assembly: AssemblyFileVersion("4.6.904.0")]
-[assembly: AssemblyInformationalVersion("4.6.904.0")]
+[assembly: AssemblyFileVersion("5.0.905.0")]
+[assembly: AssemblyInformationalVersion("5.0.905.0")]
 [assembly: AssemblyProduct("获取商店应用 WinGet WinRT 扩展")]
 [assembly: AssemblyTitle("获取商店应用 WinGet WinRT 扩展")]
-[assembly: AssemblyVersion("4.6.904.0")]
+[assembly: AssemblyVersion("5.0.905.0")]
 
 // 应用程序默认区域性的资源控制器设置
 [assembly: NeutralResourcesLanguage("en-us")]

diff --git a/Microsoft.Web.WebView2.Core.Projection/Microsoft.Web.WebView2.Core.Projection.csproj b/Microsoft.Web.WebView2.Core.Projection/Microsoft.Web.WebView2.Core.Projection.csproj
diff --git a/Microsoft.Web.WebView2.Core.Projection/Properties/AssemblyInfo.cs b/Microsoft.Web.WebView2.Core.Projection/Properties/AssemblyInfo.cs