diff --git a/.github/workflows/managedshell.yml b/.github/workflows/managedshell.yml index 1cbd34ce..871c8159 100644 --- a/.github/workflows/managedshell.yml +++ b/.github/workflows/managedshell.yml @@ -16,7 +16,7 @@ jobs: matrix: buildconfig: [ Release ] - runs-on: windows-2022 + runs-on: windows-2025 env: project: src\ManagedShell\ManagedShell.csproj diff --git a/Directory.Build.props b/Directory.Build.props index 690beb44..a85c08bc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.5.108 + 3.9.50 all diff --git a/README.md b/README.md index 8262eb92..4cc30199 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ManagedShell ![ManagedShell](https://github.com/cairoshell/ManagedShell/workflows/ManagedShell/badge.svg) [![Nuget](https://img.shields.io/nuget/v/ManagedShell?color=informational)](https://www.nuget.org/packages/ManagedShell/) -A library for creating Windows shell replacements using .NET, written in C#. +A library for creating Windows shell replacements using .NET and WPF, written in C#. ## Features - Tasks service that provides taskbar functionality @@ -15,4 +15,5 @@ A library for creating Windows shell replacements using .NET, written in C#. Visit the [ManagedShell Wiki](https://github.com/cairoshell/ManagedShell/wiki) for usage documentation. ## Example implementations +- [Cairo Shell](https://github.com/cairoshell/cairoshell) - [RetroBar](https://github.com/dremin/RetroBar) \ No newline at end of file diff --git a/src/ManagedShell.AppBar/ManagedShell.AppBar.csproj b/src/ManagedShell.AppBar/ManagedShell.AppBar.csproj index 674f46bd..70271076 100644 --- a/src/ManagedShell.AppBar/ManagedShell.AppBar.csproj +++ b/src/ManagedShell.AppBar/ManagedShell.AppBar.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;net471;net6.0-windows + net480;net6.0-windows;net10.0-windows true true diff --git a/src/ManagedShell.Common/Helpers/KeyboardLayoutHelper.cs b/src/ManagedShell.Common/Helpers/KeyboardLayoutHelper.cs index 3a9a93cb..a14afe95 100644 --- a/src/ManagedShell.Common/Helpers/KeyboardLayoutHelper.cs +++ b/src/ManagedShell.Common/Helpers/KeyboardLayoutHelper.cs @@ -42,7 +42,7 @@ public static bool SetKeyboardLayout(int layoutId) return NativeMethods.PostMessage(0xffff, (uint) NativeMethods.WM.INPUTLANGCHANGEREQUEST, 0, - NativeMethods.LoadKeyboardLayout(layoutId.ToString("x8"), (uint)(NativeMethods.KLF.SUBSTITUTE_OK | NativeMethods.KLF.ACTIVATE))); + (long)NativeMethods.LoadKeyboardLayout(layoutId.ToString("x8"), (uint)(NativeMethods.KLF.SUBSTITUTE_OK | NativeMethods.KLF.ACTIVATE))); } } } diff --git a/src/ManagedShell.Common/ManagedShell.Common.csproj b/src/ManagedShell.Common/ManagedShell.Common.csproj index 7998fdff..68f0d2fe 100644 --- a/src/ManagedShell.Common/ManagedShell.Common.csproj +++ b/src/ManagedShell.Common/ManagedShell.Common.csproj @@ -1,14 +1,14 @@  - netcoreapp3.1;net471;net6.0-windows + net480;net6.0-windows;net10.0-windows true true 12 - + diff --git a/src/ManagedShell.Interop/ManagedShell.Interop.csproj b/src/ManagedShell.Interop/ManagedShell.Interop.csproj index 206e29dd..5ef23504 100644 --- a/src/ManagedShell.Interop/ManagedShell.Interop.csproj +++ b/src/ManagedShell.Interop/ManagedShell.Interop.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1;net471;net6.0-windows + net480;net6.0-windows;net10.0-windows - + diff --git a/src/ManagedShell.ShellFolders/ManagedShell.ShellFolders.csproj b/src/ManagedShell.ShellFolders/ManagedShell.ShellFolders.csproj index 2cceacea..66950fbe 100644 --- a/src/ManagedShell.ShellFolders/ManagedShell.ShellFolders.csproj +++ b/src/ManagedShell.ShellFolders/ManagedShell.ShellFolders.csproj @@ -1,12 +1,12 @@  - netcoreapp3.1;net471;net6.0-windows + net480;net6.0-windows;net10.0-windows true true - + diff --git a/src/ManagedShell.UWPInterop/ManagedShell.UWPInterop.csproj b/src/ManagedShell.UWPInterop/ManagedShell.UWPInterop.csproj index 0d0536c6..ebea36ca 100644 --- a/src/ManagedShell.UWPInterop/ManagedShell.UWPInterop.csproj +++ b/src/ManagedShell.UWPInterop/ManagedShell.UWPInterop.csproj @@ -1,19 +1,19 @@  - netcoreapp3.1;net471;net6.0-windows + net480;net6.0-windows;net10.0-windows True - 9 + 12 true - 10.0.19041.0 + 10.0.26100.0 - - + + @@ -25,14 +25,28 @@ + Windows.ApplicationModel.AppExecutionContext; Windows.ApplicationModel.AddResourcePackageOptions; Windows.ApplicationModel.AppDisplayInfo; + Windows.ApplicationModel.AppInfo; Windows.ApplicationModel.AppInstallerInfo; + Windows.ApplicationModel.AppInstallerPolicySource; Windows.ApplicationModel.Core.AppDisplayInfo; Windows.ApplicationModel.Core.AppListEntry; Windows.ApplicationModel.Core.IAppListEntry; + Windows.ApplicationModel.FindRelatedPackagesOptions; Windows.ApplicationModel.IAppDisplayInfo; + Windows.ApplicationModel.IAppInfo; + Windows.ApplicationModel.IAppInfo2; + Windows.ApplicationModel.IAppInfo3; + Windows.ApplicationModel.IAppInfo4; + Windows.ApplicationModel.IAppInfoMethods; + Windows.ApplicationModel.IAppInfoStatics; + Windows.ApplicationModel.IAppInfoStaticsMethods; Windows.ApplicationModel.IAppInstallerInfo; + Windows.ApplicationModel.IFindRelatedPackagesOptions; + Windows.ApplicationModel.IFindRelatedPackagesOptionsFactory; + Windows.ApplicationModel.IFindRelatedPackagesOptionsMethods; Windows.ApplicationModel.IPackage; Windows.ApplicationModel.IPackageCatalog; Windows.ApplicationModel.Package; @@ -50,6 +64,7 @@ Windows.Foundation.Diagnostics; Windows.Foundation.PropertyType; + Windows.Foundation.Rect; Windows.Storage.BulkAccess; Windows.Storage.Provider; diff --git a/src/ManagedShell.WindowsTasks/ManagedShell.WindowsTasks.csproj b/src/ManagedShell.WindowsTasks/ManagedShell.WindowsTasks.csproj index 0c0e3f15..cbed660d 100644 --- a/src/ManagedShell.WindowsTasks/ManagedShell.WindowsTasks.csproj +++ b/src/ManagedShell.WindowsTasks/ManagedShell.WindowsTasks.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net471;net6.0-windows + net480;net6.0-windows;net10.0-windows true true diff --git a/src/ManagedShell.WindowsTray/ManagedShell.WindowsTray.csproj b/src/ManagedShell.WindowsTray/ManagedShell.WindowsTray.csproj index f28d7a90..c04d768e 100644 --- a/src/ManagedShell.WindowsTray/ManagedShell.WindowsTray.csproj +++ b/src/ManagedShell.WindowsTray/ManagedShell.WindowsTray.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net471;net6.0-windows + net480;net6.0-windows;net10.0-windows true diff --git a/src/ManagedShell/ManagedShell.csproj b/src/ManagedShell/ManagedShell.csproj index f558e60e..e267136c 100644 --- a/src/ManagedShell/ManagedShell.csproj +++ b/src/ManagedShell/ManagedShell.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net471;net6.0-windows + net480;net6.0-windows;net10.0-windows win-x86;win-x64;win-arm64 true $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage @@ -24,10 +24,10 @@ - + - - + +