no parallel build

2026-01-06 20:37:02 +01:00 · 2024-11-01 11:54:14 +01:00
15 changed files with 7 additions and 27 deletions
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -303,6 +303,10 @@
                "Vanara.PInvoke.User32.dll",
                "WinUI3Apps\\clrcompression.dll",
                "WinUI3Apps\\Microsoft.Graphics.Canvas.Interop.dll",
+                "Microsoft.Web.WebView2.Core.dll",
+                "Microsoft.Web.WebView2.WinForms.dll",
+                "Microsoft.Web.WebView2.Wpf.dll",
+                "WebView2Loader.dll",
                "e_sqlite3.dll",
                "LazyCache.dll",
                "SQLitePCLRaw.batteries_v2.dll",
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -57,11 +57,13 @@ parameters:
  - name: csProjectsToPublish
    type: object
    default:
+      - 'src/settings-ui/Settings.UI/PowerToys.Settings.csproj'
      - 'src/modules/launcher/PowerLauncher/PowerLauncher.csproj'
      - 'src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj'
      - 'src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj'
      - 'src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj'
      - 'src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj'
+      - 'src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj'

 jobs:
 - job: ${{ parameters.jobName }}
@@ -205,7 +207,7 @@ jobs:
      platform: $(BuildPlatform)
      configuration: $(BuildConfiguration)
      msbuildArchitecture: x64
-      maximumCpuCount: true
+      maximumCpuCount: false
    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
      env:
        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
@@ -57,8 +57,6 @@
    <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
    <PackageReference Include="MessagePack" />
    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <!-- HACK: To align Microsoft.Bcl.AsyncInterfaces.dll version with Mouse Without Borders version. -->
    <PackageReference Include="Microsoft.Windows.Compatibility" />
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj
@@ -62,8 +62,6 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="WinUIEx" />
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj
@@ -39,8 +39,6 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj
@@ -58,8 +58,6 @@
    <PackageReference Include="CommunityToolkit.WinUI.Converters" />
    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
--- a/src/modules/Hosts/Hosts/Hosts.csproj
+++ b/src/modules/Hosts/Hosts/Hosts.csproj
@@ -61,8 +61,6 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="WinUIEx" />
--- a/src/modules/Hosts/HostsUILib/HostsUILib.csproj
+++ b/src/modules/Hosts/HostsUILib/HostsUILib.csproj
@@ -42,8 +42,6 @@
    <PackageReference Include="CommunityToolkit.WinUI.Converters" />
    <PackageReference Include="CommunityToolkit.WinUI.Collections" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
    <PackageReference Include="System.IO.Abstractions" />
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
+++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
@@ -52,8 +52,6 @@
  </ItemGroup>

  <ItemGroup>
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="WinUIEx" />
--- a/src/modules/peek/Peek.Common/Peek.Common.csproj
+++ b/src/modules/peek/Peek.Common/Peek.Common.csproj
@@ -25,8 +25,6 @@
        <PrivateAssets>all</PrivateAssets>
        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      </PackageReference>
-      <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-      <PackageReference Include="Microsoft.Web.WebView2" />
      <PackageReference Include="Microsoft.WindowsAppSDK" />
      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
  </ItemGroup>
--- a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj
+++ b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj
@@ -30,8 +30,6 @@
  <ItemGroup>
      <PackageReference Include="CommunityToolkit.Mvvm" />
      <PackageReference Include="CommunityToolkit.WinUI.Converters" />
-      <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-      <PackageReference Include="Microsoft.Web.WebView2" />
      <PackageReference Include="Microsoft.WindowsAppSDK" />
      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
      <PackageReference Include="SharpCompress" />
--- a/src/modules/peek/Peek.UI/Peek.UI.csproj
+++ b/src/modules/peek/Peek.UI/Peek.UI.csproj
@@ -79,8 +79,6 @@
        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="WinUIEx" />
--- a/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj
+++ b/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj
@@ -36,8 +36,6 @@
    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" />
    <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" />
    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="WinUIEx" />
--- a/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj
+++ b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj
@@ -50,8 +50,6 @@
    <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" />
    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -58,8 +58,6 @@
    <PackageReference Include="WinUIEx" />
    <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
    <PackageReference Include="MessagePack" />
-    <!-- HACK: Building WinAppSDK apps in release CI is causing crashes in ARM64 due to depending on an older WebView2 version. This forces versions all around. -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />