Self-contained .NET (#22217)

* dotnet sc * MD preview - C# app - working self-contained * Gcode preview - C# app * DevFiles preview - C# app * Fix passing path with spaces as cmd arg and monacocpp proj file * Pdf preview - C# app * Svg preview - C# app * Fix comment * Gcode thumbnail - C# app TODO: - installer - why IThumbnailProvider and IIntializeWithFile doesn't work? * Pdf thumbnail - C# app TODO: - installer - why IThumbnailProvider and IIntializeWithFile doesn't work? * Pdf thumbnail - C# app TODO: - installer - why IThumbnailProvider and IIntializeWithFile doesn't work? * Fix GcodeThumbnailProviderCpp.vcxproj * Svg thumbnail - C# app TODO: - installer - why IThumbnailProvider and IIntializeWithFile doesn't work? * Fix Svg tests * Thumbnail providers - installer * Self-contained Hosts and FileLocksmith * Fix hardcoded <RuntimeIdentifier> * Remove unneeded files * Try to fix Nuget in PR CI * Prefix new dlls with PowerToys. Sign new dlls and exes * Add new .exe files to ProcessList * ci: debug by listing all env vars * ci: try setting variable in the right ci file * Bring back hardcoded RuntimeIdentifier * ci: Add comment and remove debug action * Remove unneeded lib * [WIP] Platform conditional dotnet files & hardlinks * Cleanup * Update expect.txt * Test fix - ARM installer * Fix uninstall bug * Update docs * Fix failing test * Add dll details * Minor cleanup * Improve resizing * Add some logs * Test fix - release build * Remove InvokeOnControlThread * Test fix: logger initialization * Fix arm64 installer Co-authored-by: Jaime Bernardo <jaime@janeasystems.com> Co-authored-by: Dustin L. Howett <dustin@howett.net>
2026-04-04 18:26:39 +02:00 · 2022-12-14 13:37:23 +01:00
parent a2c0febccc
commit 6ac508fb93
215 changed files with 9060 additions and 2328 deletions
--- a/src/modules/previewpane/SvgPreviewHandler/Program.cs
+++ b/src/modules/previewpane/SvgPreviewHandler/Program.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.PowerToys.PreviewHandler.Svg
+{
+    using System.Globalization;
+    using System.Windows.Threading;
+    using Common.UI;
+    using interop;
+
+    internal static class Program
+    {
+        private static CancellationTokenSource _tokenSource = new CancellationTokenSource();
+
+        private static SvgPreviewControl _previewHandlerControl;
+
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        public static void Main(string[] args)
+        {
+            ApplicationConfiguration.Initialize();
+            if (args != null)
+            {
+                if (args.Length == 6)
+                {
+                    string filePath = args[0];
+                    int hwnd = Convert.ToInt32(args[1], 16);
+
+                    Rectangle s = default(Rectangle);
+                    int left = Convert.ToInt32(args[2], 10);
+                    int right = Convert.ToInt32(args[3], 10);
+                    int top = Convert.ToInt32(args[4], 10);
+                    int bottom = Convert.ToInt32(args[5], 10);
+
+                    _previewHandlerControl = new SvgPreviewControl();
+                    _previewHandlerControl.SetWindow((IntPtr)hwnd, s);
+                    _previewHandlerControl.DoPreview(filePath);
+
+                    NativeEventWaiter.WaitForEventLoop(
+                        Constants.SvgPreviewResizeEvent(),
+                        () =>
+                        {
+                            Rectangle s = default(Rectangle);
+                            _previewHandlerControl.SetRect(s);
+                        },
+                        Dispatcher.CurrentDispatcher,
+                        _tokenSource.Token);
+                }
+                else
+                {
+                    MessageBox.Show("Wrong number of args: " + args.Length.ToString(CultureInfo.InvariantCulture));
+                }
+            }
+
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            Application.Run();
+        }
+    }
+}
--- a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\modules\FileExplorerPreview</PublishDir>
    <RuntimeIdentifier>win10-$(Platform)</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
    <PublishSingleFile>False</PublishSingleFile>
    <PublishReadyToRun>False</PublishReadyToRun>
    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
--- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs
+++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs
@@ -2,16 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
-using System.Drawing;
-using System.IO;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices.ComTypes;
-using System.Windows.Forms;
 using Common;
 using Common.Utilities;
-using Microsoft.PowerToys.PreviewHandler.Svg.Properties;
 using Microsoft.PowerToys.PreviewHandler.Svg.Telemetry.Events;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.Web.WebView2.Core;
@@ -86,13 +80,10 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
            if (global::PowerToys.GPOWrapper.GPOWrapper.GetConfiguredSvgPreviewEnabledValue() == global::PowerToys.GPOWrapper.GpoRuleConfigured.Disabled)
            {
                // GPO is disabling this utility. Show an error message instead.
-                InvokeOnControlThread(() =>
-                {
-                    _infoBarAdded = true;
-                    AddTextBoxControl(Properties.Resource.GpoDisabledErrorText);
-                    Resize += FormResized;
-                    base.DoPreview(dataSource);
-                });
+                _infoBarAdded = true;
+                AddTextBoxControl(Properties.Resource.GpoDisabledErrorText);
+                Resize += FormResized;
+                base.DoPreview(dataSource);

                return;
            }
@@ -104,7 +95,12 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg

            try
            {
-                using (var stream = new ReadonlyStream(dataSource as IStream))
+                if (!(dataSource is string filePath))
+                {
+                    throw new ArgumentException($"{nameof(dataSource)} for {nameof(SvgPreviewControl)} must be a string but was a '{typeof(T)}'");
+                }
+
+                using (var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read))
                {
                    using (var reader = new StreamReader(stream))
                    {
@@ -133,29 +129,26 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
                PowerToysTelemetry.Log.WriteEvent(new SvgFilePreviewError { Message = ex.Message });
            }

-            InvokeOnControlThread(() =>
+            try
            {
-                try
-                {
-                    _infoBarAdded = false;
+                _infoBarAdded = false;

-                    // Add a info bar on top of the Preview if any blocked element is present.
-                    if (blocked)
-                    {
-                        _infoBarAdded = true;
-                        AddTextBoxControl(Properties.Resource.BlockedElementInfoText);
-                    }
-
-                    AddWebViewControl(svgData);
-                    Resize += FormResized;
-                    base.DoPreview(dataSource);
-                    PowerToysTelemetry.Log.WriteEvent(new SvgFilePreviewed());
-                }
-                catch (Exception ex)
+                // Add a info bar on top of the Preview if any blocked element is present.
+                if (blocked)
                {
-                    PreviewError(ex, dataSource);
+                    _infoBarAdded = true;
+                    AddTextBoxControl(Properties.Resource.BlockedElementInfoText);
                }
-            });
+
+                AddWebViewControl(svgData);
+                Resize += FormResized;
+                base.DoPreview(dataSource);
+                PowerToysTelemetry.Log.WriteEvent(new SvgFilePreviewed());
+            }
+            catch (Exception ex)
+            {
+                PreviewError(ex, dataSource);
+            }
        }

        /// <summary>
@@ -207,49 +200,46 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
               webView2EnvironmentAwaiter = CoreWebView2Environment
                   .CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)
                   .ConfigureAwait(true).GetAwaiter();
-            webView2EnvironmentAwaiter.OnCompleted(() =>
+            webView2EnvironmentAwaiter.OnCompleted(async () =>
            {
-                InvokeOnControlThread(async () =>
+                try
                {
-                    try
+                    _webView2Environment = webView2EnvironmentAwaiter.GetResult();
+                    await _browser.EnsureCoreWebView2Async(_webView2Environment).ConfigureAwait(true);
+                    _browser.CoreWebView2.SetVirtualHostNameToFolderMapping(VirtualHostName, AssemblyDirectory, CoreWebView2HostResourceAccessKind.Deny);
+                    _browser.CoreWebView2.Settings.AreDefaultScriptDialogsEnabled = false;
+                    _browser.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
+                    _browser.CoreWebView2.Settings.AreDevToolsEnabled = false;
+                    _browser.CoreWebView2.Settings.AreHostObjectsAllowed = false;
+                    _browser.CoreWebView2.Settings.IsGeneralAutofillEnabled = false;
+                    _browser.CoreWebView2.Settings.IsPasswordAutosaveEnabled = false;
+                    _browser.CoreWebView2.Settings.IsScriptEnabled = false;
+                    _browser.CoreWebView2.Settings.IsWebMessageEnabled = false;
+
+                    // Don't load any resources.
+                    _browser.CoreWebView2.AddWebResourceRequestedFilter("*", CoreWebView2WebResourceContext.All);
+                    _browser.CoreWebView2.WebResourceRequested += CoreWebView2_BlockExternalResources;
+
+                    // WebView2.NavigateToString() limitation
+                    // See https://learn.microsoft.com/dotnet/api/microsoft.web.webview2.core.corewebview2.navigatetostring?view=webview2-dotnet-1.0.864.35#remarks
+                    // While testing the limit, it turned out it is ~1.5MB, so to be on a safe side we go for 1.5m bytes
+                    if (svgData.Length > 1_500_000)
                    {
-                        _webView2Environment = webView2EnvironmentAwaiter.GetResult();
-                        await _browser.EnsureCoreWebView2Async(_webView2Environment).ConfigureAwait(true);
-                        _browser.CoreWebView2.SetVirtualHostNameToFolderMapping(VirtualHostName, AssemblyDirectory, CoreWebView2HostResourceAccessKind.Deny);
-                        _browser.CoreWebView2.Settings.AreDefaultScriptDialogsEnabled = false;
-                        _browser.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
-                        _browser.CoreWebView2.Settings.AreDevToolsEnabled = false;
-                        _browser.CoreWebView2.Settings.AreHostObjectsAllowed = false;
-                        _browser.CoreWebView2.Settings.IsGeneralAutofillEnabled = false;
-                        _browser.CoreWebView2.Settings.IsPasswordAutosaveEnabled = false;
-                        _browser.CoreWebView2.Settings.IsScriptEnabled = false;
-                        _browser.CoreWebView2.Settings.IsWebMessageEnabled = false;
-
-                        // Don't load any resources.
-                        _browser.CoreWebView2.AddWebResourceRequestedFilter("*", CoreWebView2WebResourceContext.All);
-                        _browser.CoreWebView2.WebResourceRequested += CoreWebView2_BlockExternalResources;
-
-                        // WebView2.NavigateToString() limitation
-                        // See https://learn.microsoft.com/dotnet/api/microsoft.web.webview2.core.corewebview2.navigatetostring?view=webview2-dotnet-1.0.864.35#remarks
-                        // While testing the limit, it turned out it is ~1.5MB, so to be on a safe side we go for 1.5m bytes
-                        if (svgData.Length > 1_500_000)
-                        {
-                            string filename = _webView2UserDataFolder + "\\" + Guid.NewGuid().ToString() + ".html";
-                            File.WriteAllText(filename, svgData);
-                            _localFileURI = new Uri(filename);
-                            _browser.Source = _localFileURI;
-                        }
-                        else
-                        {
-                            _browser.NavigateToString(svgData);
-                        }
-
-                        Controls.Add(_browser);
+                        string filename = _webView2UserDataFolder + "\\" + Guid.NewGuid().ToString() + ".html";
+                        File.WriteAllText(filename, svgData);
+                        _localFileURI = new Uri(filename);
+                        _browser.Source = _localFileURI;
                    }
-                    catch (Exception)
+                    else
                    {
+                        _browser.NavigateToString(svgData);
                    }
-                });
+
+                    Controls.Add(_browser);
+                }
+                catch (Exception)
+                {
+                }
            });
        }

--- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.cs
+++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.cs
@@ -1,71 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-using Common;
-using Microsoft.PowerToys.Telemetry;
-
-namespace Microsoft.PowerToys.PreviewHandler.Svg
-{
-    /// <summary>
-    /// Extends <see cref="StreamBasedPreviewHandler"/> for Svg Preview Handler.
-    /// </summary>
-    [Guid("ddee2b8a-6807-48a6-bb20-2338174ff779")]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComVisible(true)]
-    public class SvgPreviewHandler : StreamBasedPreviewHandler, IDisposable
-    {
-        private SvgPreviewControl _svgPreviewControl;
-        private bool disposedValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SvgPreviewHandler"/> class.
-        /// </summary>
-        public SvgPreviewHandler()
-        {
-            Initialize();
-        }
-
-        /// <inheritdoc/>
-        public override void DoPreview()
-        {
-            _svgPreviewControl.DoPreview(Stream);
-        }
-
-        /// <inheritdoc/>
-        protected override IPreviewHandlerControl CreatePreviewHandlerControl()
-        {
-            PowerToysTelemetry.Log.WriteEvent(new Telemetry.Events.SvgFileHandlerLoaded());
-            _svgPreviewControl = new SvgPreviewControl();
-
-            return _svgPreviewControl;
-        }
-
-        /// <summary>
-        /// Disposes objects
-        /// </summary>
-        /// <param name="disposing">Is Disposing</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!disposedValue)
-            {
-                if (disposing)
-                {
-                    _svgPreviewControl.Dispose();
-                }
-
-                disposedValue = true;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}
--- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj
+++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj
@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UseWindowsForms>true</UseWindowsForms>
    <UseWindowsForms>true</UseWindowsForms>
    <AssemblyTitle>PowerToys.SvgPreviewHandler</AssemblyTitle>
    <AssemblyDescription>PowerToys SvgPreviewHandler</AssemblyDescription>
@@ -12,12 +14,20 @@
    <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <SelfContained>true</SelfContained>
+  </PropertyGroup>
+
+  <!-- SelfContained=true requires RuntimeIdentifier to be set -->
+  <PropertyGroup Condition="'$(Platform)'=='x64'">
+    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)'=='ARM64'">
+    <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
  </PropertyGroup>

  <PropertyGroup>
    <ProjectGuid>{DA425894-6E13-404F-8DCB-78584EC0557A}</ProjectGuid>
    <RootNamespace>Microsoft.PowerToys.PreviewHandler.Svg</RootNamespace>
-    <EnableComHosting>true</EnableComHosting>
    <AssemblyName>PowerToys.SvgPreviewHandler</AssemblyName>
  </PropertyGroup>

@@ -41,10 +51,13 @@
  <PropertyGroup>
    <!-- Disable missing comment warning. WinRT/C++ libraries added won't have comments on their reflections. -->
    <NoWarn>$(NoWarn);1591</NoWarn>
+    <OutputType>WinExe</OutputType>
  </PropertyGroup>

  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
    <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
+    <ProjectReference Include="..\..\..\common\interop\PowerToys.Interop.vcxproj" />
    <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
    <ProjectReference Include="..\common\PreviewHandlerCommon.csproj" />
  </ItemGroup>