From a916d5f6e509e402dc8cc3260c137af9edd74eea Mon Sep 17 00:00:00 2001 From: Andrei Krasutski Date: Wed, 2 Oct 2024 19:46:50 +0300 Subject: [PATCH 1/7] Changed the priority of opening project --- DesktopWindowSample.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DesktopWindowSample.sln b/DesktopWindowSample.sln index 844ccae..cb1e8e4 100644 --- a/DesktopWindowSample.sln +++ b/DesktopWindowSample.sln @@ -3,10 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32414.248 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowExtensions", "WindowExtensions\WindowExtensions.csproj", "{6FB3A02C-2E51-446D-A1D6-82BA9DCC7C53}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopWindowDemo", "DesktopWindowDemo\DesktopWindowDemo.csproj", "{06336E8A-1942-4F75-A8B0-6720786EA45E}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowExtensions", "WindowExtensions\WindowExtensions.csproj", "{6FB3A02C-2E51-446D-A1D6-82BA9DCC7C53}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From 3628a37f82edf81799268c114251fc52b32761de Mon Sep 17 00:00:00 2001 From: Andrei Krasutski Date: Wed, 2 Oct 2024 19:53:08 +0300 Subject: [PATCH 2/7] Migrate to .NET 8.0 Added Publish Profiles --- .gitignore | 2 +- DesktopWindowDemo/DesktopWindowDemo.csproj | 6 +++--- .../Properties/PublishProfiles/win-arm64.pubxml | 13 +++++++++++++ .../Properties/PublishProfiles/win-x64.pubxml | 13 +++++++++++++ .../Properties/PublishProfiles/win-x86.pubxml | 13 +++++++++++++ WindowExtensions/WindowExtensions.csproj | 4 ++-- 6 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 DesktopWindowDemo/Properties/PublishProfiles/win-arm64.pubxml create mode 100644 DesktopWindowDemo/Properties/PublishProfiles/win-x64.pubxml create mode 100644 DesktopWindowDemo/Properties/PublishProfiles/win-x86.pubxml diff --git a/.gitignore b/.gitignore index 9491a2f..a662b69 100644 --- a/.gitignore +++ b/.gitignore @@ -184,7 +184,7 @@ publish/ *.azurePubxml # Note: Comment the next line if you want to checkin your web deploy settings, # but database connection strings (with potential passwords) will be unencrypted -*.pubxml +#*.pubxml *.publishproj # Microsoft Azure Web App publish settings. Comment the next line if you want to diff --git a/DesktopWindowDemo/DesktopWindowDemo.csproj b/DesktopWindowDemo/DesktopWindowDemo.csproj index d69809a..2da0cac 100644 --- a/DesktopWindowDemo/DesktopWindowDemo.csproj +++ b/DesktopWindowDemo/DesktopWindowDemo.csproj @@ -1,13 +1,13 @@ WinExe - net6.0-windows10.0.19041.0 + net8.0-windows10.0.19041.0 10.0.17763.0 DesktopWindowDemo app.manifest x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 - win10-$(Platform).pubxml + win-x86;win-x64;win-arm64 + Properties\PublishProfiles\win-$(Platform).pubxml true true diff --git a/DesktopWindowDemo/Properties/PublishProfiles/win-arm64.pubxml b/DesktopWindowDemo/Properties/PublishProfiles/win-arm64.pubxml new file mode 100644 index 0000000..62e6e15 --- /dev/null +++ b/DesktopWindowDemo/Properties/PublishProfiles/win-arm64.pubxml @@ -0,0 +1,13 @@ + + + + FileSystem + arm64 + win-arm64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + True + False + False + True + + diff --git a/DesktopWindowDemo/Properties/PublishProfiles/win-x64.pubxml b/DesktopWindowDemo/Properties/PublishProfiles/win-x64.pubxml new file mode 100644 index 0000000..071f57c --- /dev/null +++ b/DesktopWindowDemo/Properties/PublishProfiles/win-x64.pubxml @@ -0,0 +1,13 @@ + + + + FileSystem + x64 + win-x64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + True + False + False + True + + diff --git a/DesktopWindowDemo/Properties/PublishProfiles/win-x86.pubxml b/DesktopWindowDemo/Properties/PublishProfiles/win-x86.pubxml new file mode 100644 index 0000000..6de977a --- /dev/null +++ b/DesktopWindowDemo/Properties/PublishProfiles/win-x86.pubxml @@ -0,0 +1,13 @@ + + + + FileSystem + x86 + win-x86 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + True + False + False + True + + diff --git a/WindowExtensions/WindowExtensions.csproj b/WindowExtensions/WindowExtensions.csproj index 4a54e4e..a94cd22 100644 --- a/WindowExtensions/WindowExtensions.csproj +++ b/WindowExtensions/WindowExtensions.csproj @@ -1,9 +1,9 @@  - net6.0-windows10.0.19041.0 + net8.0-windows10.0.19041.0 10.0.17763.0 WindowExtensions - win10-x86;win10-x64;win10-arm64 + win-x86;win-x64;win-arm64 true From 0c17e67699062e003a5046f3a8b3f374ba4a3578 Mon Sep 17 00:00:00 2001 From: Andrei Krasutski Date: Wed, 2 Oct 2024 20:00:50 +0300 Subject: [PATCH 3/7] Update packages --- DesktopWindowDemo/DesktopWindowDemo.csproj | 5 ++--- WindowExtensions/WindowExtensions.csproj | 14 +++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/DesktopWindowDemo/DesktopWindowDemo.csproj b/DesktopWindowDemo/DesktopWindowDemo.csproj index 2da0cac..8fa08db 100644 --- a/DesktopWindowDemo/DesktopWindowDemo.csproj +++ b/DesktopWindowDemo/DesktopWindowDemo.csproj @@ -1,8 +1,9 @@ - + WinExe net8.0-windows10.0.19041.0 10.0.17763.0 + 10.0.19041.38 DesktopWindowDemo app.manifest x86;x64;arm64 @@ -26,8 +27,6 @@ - - diff --git a/WindowExtensions/WindowExtensions.csproj b/WindowExtensions/WindowExtensions.csproj index a94cd22..c052d68 100644 --- a/WindowExtensions/WindowExtensions.csproj +++ b/WindowExtensions/WindowExtensions.csproj @@ -2,6 +2,7 @@ net8.0-windows10.0.19041.0 10.0.17763.0 + 10.0.19041.38 WindowExtensions win-x86;win-x64;win-arm64 true @@ -12,16 +13,15 @@ - - - + + - - - - + + + + From 8039e659d1962e1a4d7b5244bca7b39300e8670c Mon Sep 17 00:00:00 2001 From: Andrei Krasutski Date: Wed, 2 Oct 2024 20:27:18 +0300 Subject: [PATCH 4/7] Mica Effect --- DesktopWindowDemo/MainWindow.xaml | 78 ++++++++++++++-------------- DesktopWindowDemo/MainWindow.xaml.cs | 2 +- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/DesktopWindowDemo/MainWindow.xaml b/DesktopWindowDemo/MainWindow.xaml index 0a47107..e706e3d 100644 --- a/DesktopWindowDemo/MainWindow.xaml +++ b/DesktopWindowDemo/MainWindow.xaml @@ -5,46 +5,46 @@ xmlns:local="using:DesktopWindowDemo" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:WinUI="using:WinUIExtensions.Desktop" + xmlns:WinUI="using:WinUIExtensions.Desktop" mc:Ignorable="d"> - - - - - - + - - - - -