diff --git a/Cpp.Build.props b/Cpp.Build.props index 7b988f0d6f..f146a4d770 100644 --- a/Cpp.Build.props +++ b/Cpp.Build.props @@ -42,11 +42,6 @@ - - true - TurnOffAllWarnings - true - true Use pch.h @@ -116,11 +111,13 @@ - + true true - + false true false diff --git a/Directory.Packages.props b/Directory.Packages.props index eb04903b7e..60567e30b8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,8 +7,6 @@ - - @@ -72,12 +70,10 @@ This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail. --> - - - - - + + + @@ -116,7 +112,6 @@ - diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj index c71c81acec..6de7c50b55 100644 --- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj +++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj @@ -1,16 +1,14 @@  - - - PackageReference - - - native,Version=v0.0 - - - Windows - $(WindowsTargetPlatformVersion) - + + + + + + + + + true true @@ -33,11 +31,6 @@ true true - - - - - DynamicLibrary @@ -45,6 +38,7 @@ true + @@ -124,6 +118,9 @@ true + + + {caba8dfb-823b-4bf2-93ac-3f31984150d9} @@ -145,5 +142,42 @@ - + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config new file mode 100644 index 0000000000..6416ca5b16 --- /dev/null +++ b/src/modules/MeasureTool/MeasureToolCore/packages.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj index 3e92bd42f3..434ff088b2 100644 --- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj +++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj @@ -73,13 +73,6 @@ - - false - true - - - - PreserveNewest - + diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj index bfed4af15d..d127de245e 100644 --- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj +++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj @@ -1,16 +1,13 @@ - - - PackageReference - - - native,Version=v0.0 - - - Windows - $(WindowsTargetPlatformVersion) - + + + + + + + + 15.0 {e94fd11c-0591-456f-899f-efc0ca548336} @@ -23,12 +20,9 @@ false true false + + packages.config - - - - - DynamicLibrary @@ -133,18 +127,18 @@ + + + - - - - - - - - NotUsing - - - + + + + + + NotUsing + + <_ToDelete Include="$(OutDir)Microsoft.Web.WebView2.Core.dll" /> @@ -154,4 +148,38 @@ + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/MouseUtils/FindMyMouse/packages.config b/src/modules/MouseUtils/FindMyMouse/packages.config new file mode 100644 index 0000000000..cff3aa8705 --- /dev/null +++ b/src/modules/MouseUtils/FindMyMouse/packages.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/modules/cmdpal/CoreCommonProps.props b/src/modules/cmdpal/CoreCommonProps.props index 438d044e2a..aa091d435e 100644 --- a/src/modules/cmdpal/CoreCommonProps.props +++ b/src/modules/cmdpal/CoreCommonProps.props @@ -6,12 +6,12 @@ preview - ..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\ + $(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\ false false $(RootNamespace).pri - + SA1313; @@ -42,5 +42,5 @@ Resources.Designer.cs - + diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.Branding.props b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.Branding.props index 298bcbd787..d99688c081 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.Branding.props +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.Branding.props @@ -24,7 +24,7 @@ - + true Assets\%(RecursiveDir)%(FileName)%(Extension) @@ -35,10 +35,14 @@ - - - - + + + + diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props index d65b4a2cc2..21c2e7d8d1 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props @@ -7,7 +7,7 @@ - ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\CmdPal + $(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal $(OutputPath)\AppPackages\ diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 54961a5828..7a413d316c 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -15,7 +15,7 @@ enable enable true - preview + preview $(CmdPalVersion) @@ -23,14 +23,13 @@ false false - true - + - + --> true @@ -46,7 +45,7 @@ - + Microsoft.Terminal.UI;CmdPalKeyboardService $(OutDir) @@ -102,7 +101,7 @@ - + all runtime; build; native; contentfiles; analyzers @@ -148,16 +147,12 @@ - - False - True + + True + True + True - - - - - PreserveNewest - + True True diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp b/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp index e6cb46457b..bc3496a542 100644 --- a/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp @@ -12,9 +12,9 @@ namespace winrt::Microsoft::Terminal::UI::implementation // Check if the code point is in the Private Use Area range used by Fluent UI icons. [[nodiscard]] constexpr bool _isFluentIconPua(const UChar32 cp) noexcept { - constexpr UChar32 fluentIconsPrivateUseAreaStart = 0xE700; - constexpr UChar32 fluentIconsPrivateUseAreaEnd = 0xF8FF; - return cp >= fluentIconsPrivateUseAreaStart && cp <= fluentIconsPrivateUseAreaEnd; + static constexpr UChar32 _fluentIconsPrivateUseAreaStart = 0xE700; + static constexpr UChar32 _fluentIconsPrivateUseAreaEnd = 0xF8FF; + return cp >= _fluentIconsPrivateUseAreaStart && cp <= _fluentIconsPrivateUseAreaEnd; } // Determine if the given text (as a sequence of UChar code units) is emoji diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj index 676d7297ba..6e474cf5f3 100644 --- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj @@ -1,16 +1,17 @@  - - - PackageReference - - native,Version=v0.0 - - Windows - $(WindowsTargetPlatformVersion) - + + ..\..\..\..\ + $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250907003 + + + + + + + true true @@ -27,11 +28,6 @@ 10.0.26100.0 10.0.19041.0 - - - - - @@ -51,6 +47,10 @@ x64 + + $(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal + obj\$(Platform)\$(Configuration)\ + DynamicLibrary v143 @@ -200,11 +200,43 @@ + - - ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\CmdPal - obj\$(Platform)\$(Configuration)\ - - \ No newline at end of file + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config new file mode 100644 index 0000000000..2fb34c8fed --- /dev/null +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj index de71eb2188..eb21a94049 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj @@ -1,16 +1,18 @@  - - - PackageReference - - - native,Version=v0.0 - - - Windows - $(WindowsTargetPlatformVersion) - + + + + + + + + + + + + + true true @@ -35,17 +37,9 @@ true PowerToys.PowerRename.pri - win10-x64;win10-arm64 - false - - - - - - - + Application v143 @@ -218,10 +212,54 @@ - + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/runner/packages.config b/src/runner/packages.config new file mode 100644 index 0000000000..74d5ef5747 --- /dev/null +++ b/src/runner/packages.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj index 35a68e220f..1eae5a3573 100644 --- a/src/runner/runner.vcxproj +++ b/src/runner/runner.vcxproj @@ -1,34 +1,27 @@  - + 81010002 - - - PackageReference - - native,Version=v0.0 - - Windows - $(WindowsTargetPlatformVersion) - 15.0 {9412D5C6-2CF2-4FC2-A601-B55508EA9B27} powertoys runner - - - - - - + + + + + + + + Application @@ -38,6 +31,10 @@ true + + + + @@ -143,16 +140,39 @@ - - - - - - - - - NotUsing - - + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + + + + + + + \ No newline at end of file