Skip to content

Commit

Permalink
Finish task and publish 5.1.1004.0 version
Browse files Browse the repository at this point in the history
1.Finish task and publish 5.1.1004.0 version
2.Update dependencies
  • Loading branch information
Gaoyifei1011 committed Oct 4, 2024
1 parent a3fb81d commit 679471c
Show file tree
Hide file tree
Showing 22 changed files with 35 additions and 37 deletions.
4 changes: 2 additions & 2 deletions GetStoreApp/GetStoreApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<Win32Resource>GetStoreApp.res</Win32Resource>
<WindowsAppSDKDeploymentManagerInitialize>false</WindowsAppSDKDeploymentManagerInitialize>
<WindowsAppSDKSingleFileVerifyConfiguration>false</WindowsAppSDKSingleFileVerifyConfiguration>
<WindowsSdkPackageVersion>10.0.26100.45</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion>10.0.26100.47</WindowsSdkPackageVersion>
<XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
</PropertyGroup>

Expand Down Expand Up @@ -165,7 +165,7 @@
<None Remove="WinUIApp.xaml" />

<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2839-prerelease" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.5" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />

<Page Update="Styles\WinUI\AppBarButton.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
Expand Down
Binary file modified GetStoreApp/GetStoreApp.res
Binary file not shown.
6 changes: 3 additions & 3 deletions GetStoreApp/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("获取商店应用")]
[assembly: AssemblyFileVersion("5.0.1001.0")]
[assembly: AssemblyInformationalVersion("5.0.1001.0")]
[assembly: AssemblyFileVersion("5.1.1004.0")]
[assembly: AssemblyInformationalVersion("5.1.1004.0")]
[assembly: AssemblyProduct("获取商店应用")]
[assembly: AssemblyTitle("获取商店应用")]
[assembly: AssemblyVersion("5.0.1001.0")]
[assembly: AssemblyVersion("5.1.1004.0")]

// 应用程序默认区域性的资源控制器设置
[assembly: NeutralResourcesLanguage("en-us")]
Expand Down
2 changes: 1 addition & 1 deletion GetStoreApp/Views/Pages/SettingsPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ private void OnWinGetConfigToggled(object sender, RoutedEventArgs args)
/// </summary>
private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs args)
{
if (sender is ToggleSwitch toggleSwitch)
if (sender is ToggleSwitch)
{
AlwaysShowBackdropService.SetAlwaysShowBackdrop(false);
AlwaysShowBackdropValue = false;
Expand Down
1 change: 1 addition & 0 deletions GetStoreApp/Views/Windows/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using GetStoreApp.WindowsAPI.PInvoke.Comctl32;
using GetStoreApp.WindowsAPI.PInvoke.User32;
using GetStoreApp.WindowsAPI.PInvoke.Uxtheme;
using Microsoft.UI;
using Microsoft.UI.Composition.SystemBackdrops;
using Microsoft.UI.Content;
using Microsoft.UI.Dispatching;
Expand Down
4 changes: 2 additions & 2 deletions GetStoreAppInstaller/GetStoreAppInstaller.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<UseUwpTools>true</UseUwpTools>
<UseWindowsForms>true</UseWindowsForms>
<Win32Resource>GetStoreAppInstaller.res</Win32Resource>
<WindowsSdkPackageVersion>10.0.26100.45</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion>10.0.26100.47</WindowsSdkPackageVersion>
<XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
</PropertyGroup>

Expand Down Expand Up @@ -68,7 +68,7 @@
<Page Remove="XamlIslandsApp.xaml" />

<PackageReference Include="DisposableMemory.ModernNetUAP.XamlCompiler" Version="0.2.2" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.5" />
<PackageReference Include="Mile.Xaml" Version="2.3.1064" GeneratePathProperty="True" />
</ItemGroup>

Expand Down
Binary file modified GetStoreAppInstaller/GetStoreAppInstaller.res
Binary file not shown.
2 changes: 1 addition & 1 deletion GetStoreAppInstaller/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static void Main()

public partial class Form1 : Form
{
WindowsXamlHost xamlHost = new WindowsXamlHost();
private readonly WindowsXamlHost xamlHost = new();

public Form1()
{
Expand Down
6 changes: 3 additions & 3 deletions GetStoreAppInstaller/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("获取商店应用 应用安装器")]
[assembly: AssemblyFileVersion("5.0.1001.0")]
[assembly: AssemblyInformationalVersion("5.0.1001.0")]
[assembly: AssemblyFileVersion("5.1.1004.0")]
[assembly: AssemblyInformationalVersion("5.1.1004.0")]
[assembly: AssemblyProduct("获取商店应用 应用安装器")]
[assembly: AssemblyTitle("获取商店应用 应用安装器")]
[assembly: AssemblyVersion("5.0.1001.0")]
[assembly: AssemblyVersion("5.1.1004.0")]

// 应用程序默认区域性的资源控制器设置
[assembly: NeutralResourcesLanguage("en-us")]
Expand Down
5 changes: 1 addition & 4 deletions GetStoreAppInstaller/TestPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ namespace GetStoreAppInstaller
public sealed partial class MainPage : Page
{
public MainPage()
=> this.InitializeComponent();

private void ClickHandler(object sender, RoutedEventArgs _)
{
(sender as Button).Content = "Clicked";
InitializeComponent();
}
}
}
1 change: 0 additions & 1 deletion GetStoreAppInstaller/UI/Backdrop/DesktopAcrylicBackdrop.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public sealed partial class DesktopAcrylicBackdrop : SystemBackdrop
private bool isInitialized;
private bool isWindowClosed;
private bool isActivated = true;
private bool useMicaBrush;
private bool useDesktopAcrylicBackdrop;

private readonly IntPtr windowHandle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.Marshalling;

namespace WindowsTools.WindowsAPI.ComTypes
{
[ComImport, Guid("29E691FA-4567-4DCA-B319-D0F207EB6807"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
public interface ICompositorDesktopInterop
[GeneratedComInterface, Guid("29E691FA-4567-4DCA-B319-D0F207EB6807"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
public partial interface ICompositorDesktopInterop
{
[PreserveSig]
int CreateDesktopWindowTarget(IntPtr hwndTarget, [MarshalAs(UnmanagedType.Bool)] bool isTopmost, out IntPtr result);
Expand Down
2 changes: 1 addition & 1 deletion GetStoreAppPackage/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Identity
Name="Gaoyifei1011.GetStoreApp"
Publisher="CN=高怡飞"
Version="5.0.1001.0" />
Version="5.1.1004.0" />

<Properties>
<DisplayName>ms-resource:PackageDisplayName</DisplayName>
Expand Down
4 changes: 2 additions & 2 deletions GetStoreAppShellExtension/GetStoreAppShellExtension.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<WindowsSdkPackageVersion>10.0.26100.45</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion>10.0.26100.48</WindowsSdkPackageVersion>
<XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
</PropertyGroup>

Expand All @@ -44,7 +44,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.5" />
</ItemGroup>

<!-- 测试 AOT 发布后的文件 -->
Expand Down
6 changes: 3 additions & 3 deletions GetStoreAppShellExtension/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("获取商店应用 右键菜单扩展")]
[assembly: AssemblyFileVersion("5.0.1001.0")]
[assembly: AssemblyInformationalVersion("5.0.1001.0")]
[assembly: AssemblyFileVersion("5.1.1004.0")]
[assembly: AssemblyInformationalVersion("5.1.1004.0")]
[assembly: AssemblyProduct("获取商店应用 右键菜单扩展")]
[assembly: AssemblyTitle("获取商店应用 右键菜单扩展")]
[assembly: AssemblyVersion("5.0.1001.0")]
[assembly: AssemblyVersion("5.1.1004.0")]

// 应用程序默认区域性的资源控制器设置
[assembly: NeutralResourcesLanguage("en-us")]
Expand Down
4 changes: 2 additions & 2 deletions GetStoreAppWebView/GetStoreAppWebView.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<WebView2NeverCopyLoaderDllToOutputDirectory>true</WebView2NeverCopyLoaderDllToOutputDirectory>
<WebView2EnableCsWinRTProjection>true</WebView2EnableCsWinRTProjection>
<Win32Resource>GetStoreAppWebView.res</Win32Resource>
<WindowsSdkPackageVersion>10.0.26100.45</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion>10.0.26100.48</WindowsSdkPackageVersion>
<XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
</PropertyGroup>

Expand Down Expand Up @@ -68,7 +68,7 @@

<PackageReference Include="DisposableMemory.ModernNetUAP.XamlCompiler" Version="0.2.2" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2839-prerelease" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.5" />
<PackageReference Include="Mile.Xaml" Version="2.3.1064" GeneratePathProperty="True" IncludeAssets="none" PrivateAssets="all" />

<Page Update="Dialogs\ProcessFailedDialog.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
Expand Down
Binary file modified GetStoreAppWebView/GetStoreAppWebView.res
Binary file not shown.
4 changes: 2 additions & 2 deletions GetStoreAppWidget/GetStoreAppWidget.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Win32Resource>GetStoreAppWidget.res</Win32Resource>
<WindowsAppSDKDeploymentManagerInitialize>false</WindowsAppSDKDeploymentManagerInitialize>
<WindowsAppSDKSingleFileVerifyConfiguration>false</WindowsAppSDKSingleFileVerifyConfiguration>
<WindowsSdkPackageVersion>10.0.26100.45</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion>10.0.26100.47</WindowsSdkPackageVersion>
<XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
</PropertyGroup>

Expand All @@ -49,7 +49,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2839-prerelease" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.5" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
</ItemGroup>

Expand Down
Binary file modified GetStoreAppWidget/GetStoreAppWidget.res
Binary file not shown.
6 changes: 3 additions & 3 deletions GetStoreAppWidget/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("获取商店应用 小组件")]
[assembly: AssemblyFileVersion("5.0.1001.0")]
[assembly: AssemblyInformationalVersion("5.0.1001.0")]
[assembly: AssemblyFileVersion("5.1.1004.0")]
[assembly: AssemblyInformationalVersion("5.1.1004.0")]
[assembly: AssemblyProduct("获取商店应用 小组件")]
[assembly: AssemblyTitle("获取商店应用 小组件")]
[assembly: AssemblyVersion("5.0.1001.0")]
[assembly: AssemblyVersion("5.1.1004.0")]

// 应用程序默认区域性的资源控制器设置
[assembly: NeutralResourcesLanguage("en-us")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<WindowsSdkPackageVersion>10.0.26100.45</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion>10.0.26100.48</WindowsSdkPackageVersion>
<XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
</PropertyGroup>

Expand All @@ -49,7 +49,7 @@
<Content Include="$(TargetDir)\winrtact.dll" ExcludeFromSingleFile="true" Link="winrtact.dll" CopyToOutputDirectory="Always" />

<PackageReference Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.8.1911" GeneratePathProperty="true" IncludeAssets="none" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.5" />
</ItemGroup>

<!-- 复制 Microsoft.WindowsPackageManager.ComInterop 所需要的文件到输出根目录 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("©Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("获取商店应用 WinGet WinRT 扩展")]
[assembly: AssemblyFileVersion("5.0.1001.0")]
[assembly: AssemblyInformationalVersion("5.0.1001.0")]
[assembly: AssemblyFileVersion("5.1.1004.0")]
[assembly: AssemblyInformationalVersion("5.1.1004.0")]
[assembly: AssemblyProduct("获取商店应用 WinGet WinRT 扩展")]
[assembly: AssemblyTitle("获取商店应用 WinGet WinRT 扩展")]
[assembly: AssemblyVersion("5.0.1001.0")]
[assembly: AssemblyVersion("5.1.1004.0")]

// 应用程序默认区域性的资源控制器设置
[assembly: NeutralResourcesLanguage("en-us")]
Expand Down

0 comments on commit 679471c

Please sign in to comment.