Minor fix on unnecessary change during testing

2025-12-16 11:48:06 +01:00 · 2025-12-06 22:02:55 +08:00
parent 3cf6ba10f8
commit af9d9436f4
9 changed files with 20 additions and 40 deletions
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -42,10 +42,11 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Make angle-bracket includes external -->
+      <!-- Make angle-bracket includes external and turn off code analysis for them -->
      <TreatAngleIncludeAsExternal>true</TreatAngleIncludeAsExternal>
      <ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
      <DisableAnalyzeExternal>true</DisableAnalyzeExternal>
+
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Use</PrecompiledHeader>
      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -115,13 +116,11 @@
  </PropertyGroup>

  <!-- Debug/Release props -->
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'"
-    Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
    <UseDebugLibraries>true</UseDebugLibraries>
    <LinkIncremental>true</LinkIncremental>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'"
-    Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <LinkIncremental>false</LinkIncremental>
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -11,11 +11,6 @@
    <NuGetTargetPlatformIdentifier>Windows</NuGetTargetPlatformIdentifier>
    <NuGetTargetPlatformVersion>$(WindowsTargetPlatformVersion)</NuGetTargetPlatformVersion>
  </PropertyGroup>
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);81010002</NoWarn>
-    <!-- Skip code analysis for all files in NuGet cache -->
-    <CodeAnalysisExcludePaths>$(NuGetPackageRoot)**\*</CodeAnalysisExcludePaths>
-  </PropertyGroup>
  <PropertyGroup Label="Globals">
    <CppWinRTOptimized>true</CppWinRTOptimized>
    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -41,7 +36,7 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.WindowsAppSDK" GeneratePathProperty="true" />
    <PackageReference Include="Microsoft.Windows.CppWinRT" GeneratePathProperty="true" />
-		<PackageReference Include="Microsoft.Windows.ImplementationLibrary" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Windows.ImplementationLibrary" GeneratePathProperty="true" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
+++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
@@ -3,12 +3,6 @@
  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
  <Import Project="..\..\..\Common.SelfContained.props" />

-    <PropertyGroup>
-    <NoWarn>$(NoWarn);81010002</NoWarn>
-    <!-- Skip code analysis for all files in NuGet cache -->
-    <CodeAnalysisExcludePaths>$(NuGetPackageRoot)**\*</CodeAnalysisExcludePaths>
-  </PropertyGroup>
-
  <PropertyGroup>
    <AssemblyTitle>PowerToys.MeasureTool</AssemblyTitle>
    <AssemblyDescription>PowerToys MeasureTool</AssemblyDescription>
@@ -79,7 +73,7 @@
    <ProjectReference Include="..\..\..\common\interop\PowerToys.Interop.vcxproj" />
    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
    <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
-    <ProjectReference Include="..\MeasureToolCore\PowerToys.MeasureToolCore.vcxproj" >
+    <ProjectReference Include="..\MeasureToolCore\PowerToys.MeasureToolCore.vcxproj">
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
      <BuildProject>true</BuildProject>
    </ProjectReference>
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
@@ -138,7 +138,7 @@
    <ItemGroup>
      <!-- Remove ALL injected versions of the file -->
      <ClCompile Remove="@(ClCompile)" Condition="'%(Filename)' == 'WindowsAppRuntimeAutoInitializer'" />
-    
+
      <!-- Add ONE copy back manually -->
      <ClCompile Include="$(PkgMicrosoft_WindowsAppSDK_Foundation)\include\WindowsAppRuntimeAutoInitializer.cpp">
        <PrecompiledHeader>NotUsing</PrecompiledHeader>
--- a/src/modules/cmdpal/CoreCommonProps.props
+++ b/src/modules/cmdpal/CoreCommonProps.props
@@ -11,7 +11,7 @@
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
    <!-- MRT from windows app sdk will search for a pri file with the same name of the module before defaulting to resources.pri -->
    <ProjectPriFileName>$(RootNamespace).pri</ProjectPriFileName>
-    
+
    <!-- Disable SA1313 for Primary Constructor fields conflict https://learn.microsoft.com/dotnet/csharp/programming-guide/classes-and-structs/instance-constructors#primary-constructors  -->
    <NoWarn>SA1313;</NoWarn>

@@ -42,5 +42,5 @@
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
-		
+
 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.Branding.props
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.Branding.props
@@ -35,14 +35,10 @@

    <!-- In the future, when we actually want to support "preview" and "canary",
         add a Package-Pre.appxmanifest, etc. -->
-    <AppxManifest Include="Package.appxmanifest"
-                  Condition="'$(CommandPaletteBranding)'=='Release'" />
-    <AppxManifest Include="Package.appxmanifest"
-                  Condition="'$(CommandPaletteBranding)'=='Preview'" />
-    <AppxManifest Include="Package.appxmanifest"
-                  Condition="'$(CommandPaletteBranding)'=='Canary'" />
-    <AppxManifest Include="Package-Dev.appxmanifest"
-                  Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'" />
+    <AppxManifest Include="Package.appxmanifest" Condition="'$(CommandPaletteBranding)'=='Release'" />
+    <AppxManifest Include="Package.appxmanifest" Condition="'$(CommandPaletteBranding)'=='Preview'" />
+    <AppxManifest Include="Package.appxmanifest" Condition="'$(CommandPaletteBranding)'=='Canary'" />
+    <AppxManifest Include="Package-Dev.appxmanifest" Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'" />
  </ItemGroup>

 </Project>
--- 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 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-  <LangVersion>preview</LangVersion>
+    <LangVersion>preview</LangVersion>

    <Version>$(CmdPalVersion)</Version>

@@ -25,12 +25,12 @@
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
    <UseWinRT>true</UseWinRT>
  </PropertyGroup>
-  
+
  <!-- For debugging purposes, uncomment this block to enable AOT builds -->
-   <!--<PropertyGroup>
+  <!--<PropertyGroup>
    <EnableCmdPalAOT>true</EnableCmdPalAOT>
    <GeneratePackageLocally>true</GeneratePackageLocally>
-  </PropertyGroup>--> 
+  </PropertyGroup>-->

  <PropertyGroup Condition="'$(EnableCmdPalAOT)' == 'true'">
    <SelfContained>true</SelfContained>
@@ -46,10 +46,9 @@
  </PropertyGroup>

  <PropertyGroup>
-    <!-- This lets us actually reference types from CmdPalKeyboardService -->
+    <!-- This lets us actually reference types from Microsoft.Terminal.UI and CmdPalKeyboardService -->
    <CsWinRTIncludes>Microsoft.Terminal.UI;CmdPalKeyboardService</CsWinRTIncludes>
    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
-    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
  </PropertyGroup>

  <PropertyGroup>
@@ -152,7 +151,7 @@
    <!-- Native implementation DLL -->
    <None Include="$(OutputPath)\Microsoft.Terminal.UI.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>    
+    </None>
    <ProjectReference Include="..\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj">
      <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
      <Private>True</Private>
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -12,7 +12,6 @@
  <PropertyGroup>
  </PropertyGroup>
  <PropertyGroup Label="Globals">
-    <PlatformToolset>v143</PlatformToolset>
    <CppWinRTOptimized>true</CppWinRTOptimized>
    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
    <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
--- a/src/runner/runner.vcxproj
+++ b/src/runner/runner.vcxproj
@@ -5,8 +5,6 @@
  </Target>
  <PropertyGroup>
    <NoWarn>81010002</NoWarn>
-    <!-- Skip code analysis for all files in NuGet cache -->
-    <CodeAnalysisExcludePaths>$(NuGetPackageRoot)**\*</CodeAnalysisExcludePaths>
  </PropertyGroup>
  <PropertyGroup Label="NuGet">
    <!-- Tell NuGet this is PackageReference style -->
@@ -150,7 +148,7 @@
    <ItemGroup>
      <!-- Remove ALL injected versions of the file -->
      <ClCompile Remove="@(ClCompile)" Condition="'%(Filename)' == 'WindowsAppRuntimeAutoInitializer'" />
-    
+
      <!-- Add ONE copy back manually -->
      <ClCompile Include="$(PkgMicrosoft_WindowsAppSDK_Foundation)\include\WindowsAppRuntimeAutoInitializer.cpp">
        <PrecompiledHeader>NotUsing</PrecompiledHeader>