Try not resigning WebView2 dlls

Try not publishing
[Build]Fix WebView2 version getting on CI
2026-01-05 20:06:59 +01:00 · 2024-10-31 16:43:26 +00:00 · 2024-10-31 16:39:55 +00:00 · 2024-10-31 12:57:00 +00:00
15 changed files with 26 additions and 6 deletions
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -303,10 +303,6 @@
                "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,13 +57,11 @@ 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 }}
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
@@ -57,6 +57,8 @@
    <!-- 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,6 +62,8 @@

  <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,6 +39,8 @@

  <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,6 +58,8 @@
    <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,6 +61,8 @@

  <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,6 +42,8 @@
    <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,6 +52,8 @@
  </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,6 +25,8 @@
        <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,6 +30,8 @@
  <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,6 +79,8 @@
        <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,6 +36,8 @@
    <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,6 +50,8 @@
    <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,6 +58,8 @@
    <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" />
Author	SHA1	Message	Date
Jaime Bernardo	9f4ca19bed	Try not resigning WebView2 dlls	2024-10-31 16:43:26 +00:00
Jaime Bernardo	b4e239a23e	Try not publishing	2024-10-31 16:39:55 +00:00
Jaime Bernardo	fdb4f14e67	[Build]Fix WebView2 version getting on CI	2024-10-31 12:57:00 +00:00