A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixed Windows build
Etienne Baudoux39986674f332
diff --git a/src/DevToys-Windows.sln b/src/DevToys-Windows.slnindex 9bf65bff2..fa2d86cc6 100644--- a/src/DevToys-Windows.sln+++ b/src/DevToys-Windows.sln@@ -213,8 +213,8 @@ Global{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Release|x64.Build.0 = Release|Any CPU{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Release|x86.ActiveCfg = Release|Any CPU{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Release|x86.Build.0 = Release|Any CPU- {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|AnyCPU.ActiveCfg = Debug|x86- {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|AnyCPU.Build.0 = Debug|x86+ {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU+ {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|AnyCPU.Build.0 = Debug|Any CPU{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|ARM64.ActiveCfg = Debug|arm64{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|ARM64.Build.0 = Debug|arm64{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|x64.ActiveCfg = Debug|x64@@ -229,8 +229,8 @@ Global{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|x64.Build.0 = Release|x64{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|x86.ActiveCfg = Release|x86{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|x86.Build.0 = Release|x86- {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|AnyCPU.ActiveCfg = Debug|x86- {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|AnyCPU.Build.0 = Debug|x86+ {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU+ {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|AnyCPU.Build.0 = Debug|Any CPU{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|ARM64.ActiveCfg = Debug|arm64{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|ARM64.Build.0 = Debug|arm64{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|x64.ActiveCfg = Debug|x64@@ -245,8 +245,8 @@ Global{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|x64.Build.0 = Release|x64{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|x86.ActiveCfg = Release|x86{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|x86.Build.0 = Release|x86- {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|AnyCPU.ActiveCfg = Debug|x86- {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|AnyCPU.Build.0 = Debug|x86+ {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU+ {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|AnyCPU.Build.0 = Debug|Any CPU{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|ARM64.ActiveCfg = Debug|arm64{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|ARM64.Build.0 = Debug|arm64{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|x64.ActiveCfg = Debug|x64diff --git a/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj b/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csprojindex ae3c69bf1..41b10045a 100644--- a/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj+++ b/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj@@ -6,7 +6,7 @@<PropertyGroup><TargetFrameworks>$(NetCore)</TargetFrameworks><TargetFrameworks Condition="$(IsMac)">$(TargetFrameworks);$(NetMacCatalyst)</TargetFrameworks>- <TargetFrameworks Condition="$(IsWindows)">$(TargetFrameworks);$(UAP)</TargetFrameworks>+ <TargetFrameworks Condition="$(IsWindows)">$(UAP);$(TargetFrameworks)</TargetFrameworks><!-- Ensures the .xr.xml files are generated in a proper layout folder --><GenerateLibraryLayout>true</GenerateLibraryLayout>diff --git a/src/app/dev/DevToys.UI.EntryPoint/App.xaml.cs b/src/app/dev/DevToys.UI.EntryPoint/App.xaml.csindex d79f0f616..9b0ffc30c 100644--- a/src/app/dev/DevToys.UI.EntryPoint/App.xaml.cs+++ b/src/app/dev/DevToys.UI.EntryPoint/App.xaml.cs@@ -57,10 +57,12 @@ public sealed partial class App : Application#if NET6_0_OR_GREATER && WINDOWS && !HAS_UNO_window = new Window();_window.Activate();-#else+#elif __MAC__// Important! Keep the full name `Microsoft.UI.Xaml.Window.Current` otherwise the Mac app won't build.// See https://blog.mzikmund.com/2020/04/resolving-uno-platform-uiwindow-does-not-contain-a-definition-for-current-issue/_window = Microsoft.UI.Xaml.Window.Current;+#else+ _window = Window.Current;#endif#if WINDOWS_UWPdiff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csprojindex fdfe18835..c56dc777a 100644--- a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj@@ -10,9 +10,11 @@</PropertyGroup><PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "><CreatePackage>false</CreatePackage>+ <DefineConstants>DEBUG;TRACE;__MAC__</DefineConstants></PropertyGroup><PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "><CreatePackage>false</CreatePackage>+ <DefineConstants>TRACE;__MAC__</DefineConstants></PropertyGroup><ItemGroup><PackageReference Include="Uno.WinUI" />diff --git a/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj b/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csprojindex 2aca52fe2..b3743d7ff 100644--- a/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj+++ b/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj@@ -5,6 +5,7 @@<ImplicitUsings>disable</ImplicitUsings><NoWarn>NU1701</NoWarn><WasmPWAManifestFile>manifest.json</WasmPWAManifestFile>+ <DefineConstants>__WASM__</DefineConstants></PropertyGroup><PropertyGroup Condition="'$(Configuration)'=='Debug'">