A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Upgraded to .NET 7.0
Etienne Baudoux6604e17a5294
diff --git a/.vscode/launch.json b/.vscode/launch.jsonindex 687403c81..17d559ca5 100644--- a/.vscode/launch.json+++ b/.vscode/launch.json@@ -32,12 +32,12 @@"request": "launch","preLaunchTask": "build-macos",// If you have changed target frameworks, make sure to update the program path.- "program": "${workspaceFolder}/bin/Debug/AnyCPU/DevToys.MacOS/net6.0-maccatalyst/maccatalyst-x64/DevToys.MacOS.app",+ "program": "${workspaceFolder}/bin/Debug/AnyCPU/DevToys.MacOS/net7.0-maccatalyst/maccatalyst-x64/DevToys.MacOS.app","args": [],"env": {"DOTNET_MODIFIABLE_ASSEMBLIES": "debug"},- "cwd": "${workspaceFolder}/bin/Debug/AnyCPU/DevToys.MacOS/net6.0-maccatalyst/maccatalyst-x64/DevToys.MacOS.app",+ "cwd": "${workspaceFolder}/bin/Debug/AnyCPU/DevToys.MacOS/net7.0-maccatalyst/maccatalyst-x64/DevToys.MacOS.app",// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console"console": "internalConsole","stopAtEntry": falsediff --git a/CONTRIBUTING.md b/CONTRIBUTING.mdindex 3c5a1c6fe..8e7fe3e52 100644--- a/CONTRIBUTING.md+++ b/CONTRIBUTING.md@@ -42,7 +42,7 @@ You can contribute to DevToys app by:1. Make sure your machine is running on macOS Ventura 13.1 or later.1. [**Visual Studio Code**](https://code.visualstudio.com/) or [**Visual Studio for Mac**](https://visualstudio.microsoft.com/vs/mac/) or [**JetBrains Rider**](https://www.jetbrains.com/rider/)1. **.NET SDK**- * [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0) (**version 6.0 (SDK 6.0.403)** or later)+ * [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/7.0) (**version 7.0 (SDK 7.0.101)** or later)> Use `dotnet --version` from the terminal to get the version installed.1. [Node.js](https://nodejs.org/).@@ -81,7 +81,7 @@ You can contribute to DevToys app by:1. Open the repository in Visual Studio Code to edit the code.1. In a Terminal prompt, run the following command to build and run DevToys for Mac:```- sudo dotnet run --project src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj --framework net6.0-maccatalyst+ sudo dotnet run --project src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj --framework net7.0-maccatalyst```# Internationalization and localizationdiff --git a/global.json b/global.jsonindex 349f70043..b6038be01 100644--- a/global.json+++ b/global.json@@ -1,6 +1,6 @@{"sdk": {- "version": "6.0.403",+ "version": "7.0.101","rollForward": "latestFeature"},"msbuild-sdks": {diff --git a/src/DevToys-Windows.sln b/src/DevToys-Windows.slnindex fa2d86cc6..97575be7e 100644--- a/src/DevToys-Windows.sln+++ b/src/DevToys-Windows.sln@@ -221,8 +221,8 @@ Global{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|x64.Build.0 = Debug|x64{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|x86.ActiveCfg = Debug|x86{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Debug|x86.Build.0 = Debug|x86- {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|AnyCPU.ActiveCfg = Release|x86- {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|AnyCPU.Build.0 = Release|x86+ {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|AnyCPU.ActiveCfg = Release|Any CPU+ {723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|AnyCPU.Build.0 = Release|Any CPU{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|ARM64.ActiveCfg = Release|arm64{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|ARM64.Build.0 = Release|arm64{723A3D71-2425-49EE-B669-1A0DF3A8B486}.Release|x64.ActiveCfg = Release|x64@@ -237,8 +237,8 @@ Global{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|x64.Build.0 = Debug|x64{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|x86.ActiveCfg = Debug|x86{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Debug|x86.Build.0 = Debug|x86- {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|AnyCPU.ActiveCfg = Release|x86- {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|AnyCPU.Build.0 = Release|x86+ {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|AnyCPU.ActiveCfg = Release|Any CPU+ {104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|AnyCPU.Build.0 = Release|Any CPU{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|ARM64.ActiveCfg = Release|arm64{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|ARM64.Build.0 = Release|arm64{104F1E4B-E0D3-4D87-9DA0-3FE82FE2573A}.Release|x64.ActiveCfg = Release|x64@@ -253,8 +253,8 @@ Global{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|x64.Build.0 = Debug|x64{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|x86.ActiveCfg = Debug|x86{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Debug|x86.Build.0 = Debug|x86- {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|AnyCPU.ActiveCfg = Release|x86- {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|AnyCPU.Build.0 = Release|x86+ {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|AnyCPU.ActiveCfg = Release|Any CPU+ {CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|AnyCPU.Build.0 = Release|Any CPU{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|ARM64.ActiveCfg = Release|arm64{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|ARM64.Build.0 = Release|arm64{CDD8B469-ACA6-4A7D-91A0-66ADB0563AE8}.Release|x64.ActiveCfg = Release|x64diff --git a/src/Directory.Build.props b/src/Directory.Build.propsindex 00b1d53f2..990287fd8 100644--- a/src/Directory.Build.props+++ b/src/Directory.Build.props@@ -11,10 +11,11 @@<!-- Can't support 2.1 because UWP is dead and doesn't support it --><NetStandard>netstandard2.0</NetStandard>- <NetCore>net6.0</NetCore>+ <NetCore>net7.0</NetCore><NetCoreWindows>$(NetCore)-windows$(Windows10MinSDKVersionTrimmed)</NetCoreWindows><NetMacCatalyst>$(NetCore)-maccatalyst</NetMacCatalyst>+ <NetMacOS>$(NetCore)-macos</NetMacOS><UAP>uap$(Windows10MinSDKVersionTrimmed)</UAP><!-- Define default build configuration -->diff --git a/src/app/dev/DevToys.Api/DevToys.Api.csproj b/src/app/dev/DevToys.Api/DevToys.Api.csprojindex 8449456df..f6b89926a 100644--- a/src/app/dev/DevToys.Api/DevToys.Api.csproj+++ b/src/app/dev/DevToys.Api/DevToys.Api.csproj@@ -1,6 +1,6 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFrameworks>$(NetStandard)</TargetFrameworks>+ <TargetFrameworks>$(NetStandard);$(NetCore)</TargetFrameworks></PropertyGroup><ItemGroup>diff --git a/src/app/dev/DevToys.Core/DevToys.Core.csproj b/src/app/dev/DevToys.Core/DevToys.Core.csprojindex 510c71463..b035a851b 100644--- a/src/app/dev/DevToys.Core/DevToys.Core.csproj+++ b/src/app/dev/DevToys.Core/DevToys.Core.csproj@@ -1,6 +1,6 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFrameworks>$(NetStandard)</TargetFrameworks>+ <TargetFrameworks>$(NetStandard);$(NetCore)</TargetFrameworks></PropertyGroup><ItemGroup><ProjectReference Include="..\DevToys.Api\DevToys.Api.csproj" />diff --git a/src/app/dev/DevToys.MonacoEditor/CodeEditor/CodeEditor.cs b/src/app/dev/DevToys.MonacoEditor/CodeEditor/CodeEditor.csindex f19ed318b..d7d0df5c4 100644--- a/src/app/dev/DevToys.MonacoEditor/CodeEditor/CodeEditor.cs+++ b/src/app/dev/DevToys.MonacoEditor/CodeEditor/CodeEditor.cs@@ -5,8 +5,6 @@ using DevToys.MonacoEditor.Extensions;using DevToys.MonacoEditor.Monaco;using DevToys.MonacoEditor.Monaco.Editor;using DevToys.MonacoEditor.WebInterop;-using DevToys.MonacoEditor.WebInterop.Parent;-using DevToys.MonacoEditor.WebInterop.Theme;using DevToys.UI.Framework.Threading;using Microsoft.Web.WebView2.Core;using Windows.Foundation;diff --git a/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj b/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csprojindex 33c61a20d..9421cb2e2 100644--- a/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj+++ b/src/app/dev/DevToys.MonacoEditor/DevToys.MonacoEditor.csproj@@ -12,6 +12,7 @@<IsUWP>false</IsUWP><IsWasm>false</IsWasm>+ <IsMacCatalyst>false</IsMacCatalyst><EnableWindowsTargeting>true</EnableWindowsTargeting></PropertyGroup>@@ -103,6 +104,7 @@<Content Include="ts-helpermethods\ts-helpermethods-Wasm\tsconfig.json" /><None Include="ts-helpermethods\ts-helpermethods-Windows\tsconfig.json" /><EmbeddedResource Include="WasmScripts\uno-monaco-helpers.js" />+ <None Include="highlightjs\**" /></ItemGroup></When>@@ -132,6 +134,7 @@<TypeScriptCompile Remove="ts-helpermethods\ts-helpermethods-Wasm\**\*.*" /><Content Include="ts-helpermethods\ts-helpermethods-Windows\tsconfig.json" /><None Include="ts-helpermethods\ts-helpermethods-Wasm\tsconfig.json" />+ <None Include="highlightjs\**" /></ItemGroup></When></Choose>diff --git a/src/app/dev/DevToys.MonacoEditor/WebInterop/Logger/DebugLogger.cs b/src/app/dev/DevToys.MonacoEditor/WebInterop/Logger/DebugLogger.csindex 3637121f7..73eae6f78 100644--- a/src/app/dev/DevToys.MonacoEditor/WebInterop/Logger/DebugLogger.cs+++ b/src/app/dev/DevToys.MonacoEditor/WebInterop/Logger/DebugLogger.cs@@ -17,6 +17,7 @@ internal sealed partial class DebugLoggerpublic void Log(string message){- _debugLogger?.LogDebug(message);+ Console.WriteLine(message);+ _debugLogger?.LogInformation(message);}}diff --git a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/IParentAccessorAcceptor.cs b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/IParentAccessorAcceptor.csindex 075a59358..e93f1a896 100644--- a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/IParentAccessorAcceptor.cs+++ b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/IParentAccessorAcceptor.cs@@ -1,4 +1,4 @@-namespace DevToys.MonacoEditor.WebInterop.Parent;+namespace DevToys.MonacoEditor.WebInterop;//// TODO: Find better approach than this./// <summary>diff --git a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.csindex 8a66b30ca..50a47da7d 100644--- a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs+++ b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs@@ -3,7 +3,7 @@ using System.Runtime.InteropServices.WindowsRuntime;using Newtonsoft.Json;using Windows.Foundation.Metadata;-namespace DevToys.MonacoEditor.WebInterop.Parent;+namespace DevToys.MonacoEditor.WebInterop;/// <summary>/// Class to help in accessing .NET values from JavaScript.diff --git a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.wasm.cs b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.wasm.csindex 40e1f6344..54c916ae5 100644--- a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.wasm.cs+++ b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.wasm.cs@@ -5,7 +5,7 @@ using Uno.Extensions.Specialized;using Uno.Foundation;using Uno.Foundation.Interop;-namespace DevToys.MonacoEditor.WebInterop.Parent;+namespace DevToys.MonacoEditor.WebInterop;internal partial class ParentAccessor : IJSObject{diff --git a/src/app/dev/DevToys.MonacoEditor/WebInterop/Theme/ThemeListener.cs b/src/app/dev/DevToys.MonacoEditor/WebInterop/Theme/ThemeListener.csindex 1ee5d44c3..892acfe63 100644--- a/src/app/dev/DevToys.MonacoEditor/WebInterop/Theme/ThemeListener.cs+++ b/src/app/dev/DevToys.MonacoEditor/WebInterop/Theme/ThemeListener.cs@@ -13,7 +13,7 @@ using Microsoft.UI.Xaml;using Microsoft.UI.Xaml.Media;#endif-namespace DevToys.MonacoEditor.WebInterop.Theme;+namespace DevToys.MonacoEditor.WebInterop;internal delegate void ThemeChangedEvent(ThemeListener sender);diff --git a/src/app/dev/DevToys.MonacoEditor/WebInterop/Theme/ThemeListener.wasm.cs b/src/app/dev/DevToys.MonacoEditor/WebInterop/Theme/ThemeListener.wasm.csindex 08564fd8f..1751c44f1 100644--- a/src/app/dev/DevToys.MonacoEditor/WebInterop/Theme/ThemeListener.wasm.cs+++ b/src/app/dev/DevToys.MonacoEditor/WebInterop/Theme/ThemeListener.wasm.cs@@ -1,12 +1,11 @@#if __WASM__-using DevToys.MonacoEditor.WebInterop.Parent;using Newtonsoft.Json;using Uno;using Uno.Foundation;using Uno.Foundation.Interop;-namespace DevToys.MonacoEditor.WebInterop.Theme;+namespace DevToys.MonacoEditor.WebInterop;internal partial class ThemeListener : IJSObject{diff --git a/src/app/dev/DevToys.MonacoEditor/ts-helpermethods/ts-helpermethods-Wasm/tsconfig.json b/src/app/dev/DevToys.MonacoEditor/ts-helpermethods/ts-helpermethods-Wasm/tsconfig.jsonindex 2854c440c..534cf6864 100644--- a/src/app/dev/DevToys.MonacoEditor/ts-helpermethods/ts-helpermethods-Wasm/tsconfig.json+++ b/src/app/dev/DevToys.MonacoEditor/ts-helpermethods/ts-helpermethods-Wasm/tsconfig.json@@ -2,9 +2,9 @@"compileOnSave": true,"compilerOptions": {"emitBOM": false,- "target": "es2018",- "lib": [ "es2018", "DOM" ],- "sourceMap": false,+ "target": "es2015", // Warning: Monaco editor breaks when using something else than es2015+ "lib": [ "es2015", "DOM" ], // Warning: Monaco editor breaks when using something else than es2015+ "sourceMap": true,"outFile": "..\\..\\WasmScripts\\uno-monaco-helpers.js"},"include": [diff --git a/src/app/dev/DevToys.MonacoEditor/ts-helpermethods/ts-helpermethods-Windows/tsconfig.json b/src/app/dev/DevToys.MonacoEditor/ts-helpermethods/ts-helpermethods-Windows/tsconfig.jsonindex 6921602c3..5899d987c 100644--- a/src/app/dev/DevToys.MonacoEditor/ts-helpermethods/ts-helpermethods-Windows/tsconfig.json+++ b/src/app/dev/DevToys.MonacoEditor/ts-helpermethods/ts-helpermethods-Windows/tsconfig.json@@ -1,7 +1,7 @@{"compileOnSave": true,"compilerOptions": {- "target": "es2018",+ "target": "es2015","sourceMap": false},"include": [diff --git a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj b/src/app/dev/DevToys.Tools/DevToys.Tools.csprojindex 776c2475b..9ce165c2d 100644--- a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj+++ b/src/app/dev/DevToys.Tools/DevToys.Tools.csproj@@ -1,6 +1,6 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFrameworks>$(NetStandard)</TargetFrameworks>+ <TargetFrameworks>$(NetStandard);$(NetCore)</TargetFrameworks><!-- See https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enabledynamicloading --><EnableDynamicLoading>true</EnableDynamicLoading>diff --git a/src/app/dev/DevToys.UI/Views/MainPage.xaml b/src/app/dev/DevToys.UI/Views/MainPage.xamlindex f0b7ad401..b2c0086e5 100644--- a/src/app/dev/DevToys.UI/Views/MainPage.xaml+++ b/src/app/dev/DevToys.UI/Views/MainPage.xaml@@ -24,11 +24,11 @@Grid.Row="0"Grid.Column="0"/>- <monaco:CodeEditor x:Name="Editor2"+ <!--<monaco:CodeEditor x:Name="Editor2"Grid.Row="0"Grid.Column="1"ReadOnly="True"- IsDiffViewMode="True"/>+ IsDiffViewMode="True"/>--><ToggleSwitchGrid.Row="1"Grid.Column="0"diff --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 0ce095c8e..a8c5fd18d 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@@ -2,22 +2,22 @@<PropertyGroup><TargetFrameworks>$(NetMacCatalyst)</TargetFrameworks><!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401-->- <!-- <TargetFrameworks>$(TargetFrameworks);net6.0-macos</TargetFrameworks> -->+ <!-- <TargetFrameworks>$(TargetFrameworks);$(NetMacOS)</TargetFrameworks> --><SingleProject>true</SingleProject><OutputType>Exe</OutputType><!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 --><!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == '$(NetMacCatalyst)">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs>--><!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->- <UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != '$(NetMacCatalyst)' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>+ <UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != '$(NetMacCatalyst)' and '$(TargetFramework)' != '$(NetMacOS)'">True</UseInterpreter><IsUnoHead>true</IsUnoHead><SupportedOSPlatformVersion Condition="'$(TargetFramework)' == '$(NetMacCatalyst)'">16.0</SupportedOSPlatformVersion>- <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-macos'">10.14</SupportedOSPlatformVersion>+ <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == '$(NetMacOS)'">10.14</SupportedOSPlatformVersion><ApplicationId>com.etiennebaudoux.devtoys</ApplicationId></PropertyGroup><PropertyGroup Condition="'$(RuntimeIdentifier)'==''"><!-- Default values for command line builds --><RuntimeIdentifier Condition="'$(TargetFramework)' == '$(NetMacCatalyst)'">maccatalyst-arm64</RuntimeIdentifier>- <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>+ <RuntimeIdentifier Condition="'$(TargetFramework)' == '$(NetMacOS)'">osx-x64</RuntimeIdentifier></PropertyGroup><PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "><CreatePackage>false</CreatePackage>@@ -50,7 +50,7 @@<PackageReference Include="Uno.Extensions.Logging.OSLog"/></ItemGroup></When>- <When Condition="'$(TargetFramework)' == 'net6.0-macos'">+ <When Condition="'$(TargetFramework)' == '$(NetMacOS)'"><PropertyGroup><TrimMode Condition="'$(Configuration)'=='Release'">link</TrimMode></PropertyGroup>diff --git a/vs2022.vsconfig b/vs2022.vsconfigindex 1639c4c6f..ca7b429ef 100644--- a/vs2022.vsconfig+++ b/vs2022.vsconfig@@ -23,7 +23,7 @@"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard","Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging","Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",- "Microsoft.NetCore.Component.Runtime.6.0",+ "Microsoft.NetCore.Component.Runtime.7.0","Microsoft.NetCore.Component.SDK","Microsoft.Component.MSBuild","Microsoft.Component.NetFX.Native",