A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Moved Settings and FluentSystemIcon font to DevToys.Blazor
Etienne Baudouxe1b8e018c489
diff --git a/src/app/dev/DevToys.Core/Assets/Fonts/FluentSystemIcons-Regular.ttf b/src/app/dev/DevToys.Blazor/Assets/fonts/FluentSystemIcons-Regular.ttfsimilarity index 100%rename from src/app/dev/DevToys.Core/Assets/Fonts/FluentSystemIcons-Regular.ttfrename to src/app/dev/DevToys.Blazor/Assets/fonts/FluentSystemIcons-Regular.ttfdiff --git a/src/app/dev/DevToys.Core/BuiltInTools/DevToysCoreResourceManagerAssemblyIdentifier.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/DevToysBlazorResourceManagerAssemblyIdentifier.cssimilarity index 59%rename from src/app/dev/DevToys.Core/BuiltInTools/DevToysCoreResourceManagerAssemblyIdentifier.csrename to src/app/dev/DevToys.Blazor/BuiltInTools/DevToysBlazorResourceManagerAssemblyIdentifier.csindex 3c8ebb566..88b8b1d1f 100644--- a/src/app/dev/DevToys.Core/BuiltInTools/DevToysCoreResourceManagerAssemblyIdentifier.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/DevToysBlazorResourceManagerAssemblyIdentifier.cs@@ -1,15 +1,15 @@using System.Reflection;-namespace DevToys.Core.BuiltInTools;+namespace DevToys.Blazor.BuiltInTools;[Export(typeof(IResourceAssemblyIdentifier))]-[Name(nameof(DevToysCoreResourceManagerAssemblyIdentifier))]-public sealed class DevToysCoreResourceManagerAssemblyIdentifier : IResourceAssemblyIdentifier+[Name(nameof(DevToysBlazorResourceManagerAssemblyIdentifier))]+public sealed class DevToysBlazorResourceManagerAssemblyIdentifier : IResourceAssemblyIdentifier{public ValueTask<FontDefinition[]> GetFontDefinitionsAsync(){var assembly = Assembly.GetExecutingAssembly();- string resourceName = "DevToys.Core.Assets.Fonts.FluentSystemIcons-Regular.ttf";+ string resourceName = "DevToys.Blazor.Assets.fonts.FluentSystemIcons-Regular.ttf";Stream stream = assembly.GetManifestResourceStream(resourceName)!;return new ValueTask<FontDefinition[]>(new[]diff --git a/src/app/dev/DevToys.Core/BuiltInTools/Settings/Settings.Designer.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cssimilarity index 95%rename from src/app/dev/DevToys.Core/BuiltInTools/Settings/Settings.Designer.csrename to src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.csindex 9cfdc136a..5c74964a3 100644--- a/src/app/dev/DevToys.Core/BuiltInTools/Settings/Settings.Designer.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs@@ -8,7 +8,7 @@// </auto-generated>//-------------------------------------------------------------------------------namespace DevToys.Core.BuiltInTools.Settings {+namespace DevToys.Blazor.BuiltInTools.Settings {using System;@@ -39,7 +39,7 @@ namespace DevToys.Core.BuiltInTools.Settings {internal static global::System.Resources.ResourceManager ResourceManager {get {if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Core.BuiltInTools.Settings.Settings", typeof(Settings).Assembly);+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Blazor.BuiltInTools.Settings.Settings", typeof(Settings).Assembly);resourceMan = temp;}return resourceMan;diff --git a/src/app/dev/DevToys.Core/BuiltInTools/Settings/Settings.resx b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resxsimilarity index 100%rename from src/app/dev/DevToys.Core/BuiltInTools/Settings/Settings.resxrename to src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resxdiff --git a/src/app/dev/DevToys.Core/BuiltInTools/Settings/SettingsGuiTool.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cssimilarity index 92%rename from src/app/dev/DevToys.Core/BuiltInTools/Settings/SettingsGuiTool.csrename to src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.csindex 521a448ac..e7df96d4c 100644--- a/src/app/dev/DevToys.Core/BuiltInTools/Settings/SettingsGuiTool.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs@@ -1,14 +1,14 @@using DevToys.Core.Settings;-namespace DevToys.Core.BuiltInTools.Settings;+namespace DevToys.Blazor.BuiltInTools.Settings;[Export(typeof(IGuiTool))][Name("Settings")][ToolDisplayInformation(IconFontName = "FluentSystemIcons",IconGlyph = '\uF6A9',- ResourceManagerAssemblyIdentifier = nameof(DevToysCoreResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Core.BuiltInTools.Settings.Settings",+ ResourceManagerAssemblyIdentifier = nameof(DevToysBlazorResourceManagerAssemblyIdentifier),+ ResourceManagerBaseName = "DevToys.Blazor.BuiltInTools.Settings.Settings",ShortDisplayTitleResourceName = nameof(Settings.ShortDisplayTitle),DescriptionResourceName = nameof(Settings.Description),AccessibleNameResourceName = nameof(Settings.AccessibleName))]diff --git a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csprojindex dc17ab0e1..f6169c904 100644--- a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj+++ b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj@@ -40,6 +40,22 @@<TypeScriptCompile Remove="wwwroot\lib\monaco-editor\**\*.*" /></ItemGroup>+ <ItemGroup>+ <EmbeddedResource Include="Assets\fonts\FluentSystemIcons-Regular.ttf">+ <ExcludeFromSingleFile>true</ExcludeFromSingleFile>+ <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>+ </EmbeddedResource>+ <EmbeddedResource Update="BuiltInTools\Settings\Settings.resx">+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>+ <Generator>ResXFileCodeGenerator</Generator>+ </EmbeddedResource>+ <Compile Update="BuiltInTools\Settings\Settings.Designer.cs">+ <DependentUpon>Settings.resx</DependentUpon>+ <DesignTime>True</DesignTime>+ <AutoGen>True</AutoGen>+ </Compile>+ </ItemGroup>+<!-- Target ran on `dotnet restore -p:RestoreNpm=true` --><Target Name="NodeJsRestoreTarget" AfterTargets="_GenerateRestoreProjectSpec" Condition="$(RestoreNpm) == 'true'"><!-- Verify that Node.JS is installed. -->diff --git a/src/app/dev/DevToys.Blazor/Properties/AdditionGlobalUsings.cs b/src/app/dev/DevToys.Blazor/Properties/AdditionGlobalUsings.csindex 8f1d1079b..f76a8c460 100644--- a/src/app/dev/DevToys.Blazor/Properties/AdditionGlobalUsings.cs+++ b/src/app/dev/DevToys.Blazor/Properties/AdditionGlobalUsings.cs@@ -6,3 +6,4 @@ global using Microsoft.JSInterop;global using DevToys.Api;global using DevToys.Blazor.Core.Helpers;global using DevToys.Blazor.Core.Extensions;+global using static DevToys.Api.GUI;diff --git a/src/app/dev/DevToys.Core/DevToys.Core.csproj b/src/app/dev/DevToys.Core/DevToys.Core.csprojindex 7336c630e..544968672 100644--- a/src/app/dev/DevToys.Core/DevToys.Core.csproj+++ b/src/app/dev/DevToys.Core/DevToys.Core.csproj@@ -17,21 +17,4 @@<PackageReference Include="Uno.Core.Extensions.Logging" /><PackageReference Include="Uno.Core.Extensions.Logging.Singleton" /></ItemGroup>- <ItemGroup>- <EmbeddedResource Include="Assets\Fonts\FluentSystemIcons-Regular.ttf">- <ExcludeFromSingleFile>true</ExcludeFromSingleFile>- <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>- </EmbeddedResource>- <Compile Update="BuiltInTools\Settings\Settings.Designer.cs">- <DependentUpon>Settings.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- </ItemGroup>- <ItemGroup>- <EmbeddedResource Update="BuiltInTools\Settings\Settings.resx">- <LastGenOutput>Settings.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- </ItemGroup></Project>\ No newline at end of filediff --git a/src/app/dev/DevToys.Core/Properties/AdditionGlobalUsings.cs b/src/app/dev/DevToys.Core/Properties/AdditionGlobalUsings.csindex b6402eb11..892e58f54 100644--- a/src/app/dev/DevToys.Core/Properties/AdditionGlobalUsings.cs+++ b/src/app/dev/DevToys.Core/Properties/AdditionGlobalUsings.cs@@ -1,2 +1 @@global using DevToys.Api;-global using static DevToys.Api.GUI;diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.csindex b82a70bcf..68b6b2af7 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs@@ -1,8 +1,8 @@using DevToys.Api;+using DevToys.Blazor.BuiltInTools;using DevToys.Blazor.Core.Languages;using DevToys.Blazor.Core.Services;using DevToys.Business.ViewModels;-using DevToys.Core.BuiltInTools;using DevToys.Core.Logging;using DevToys.Core.Mef;using DevToys.MacOS.Core;diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.csindex b57ce4fa0..57f8e6cbf 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs@@ -1,9 +1,9 @@using DevToys.Api;+using DevToys.Blazor.BuiltInTools;using DevToys.Blazor.Core.Languages;using DevToys.Blazor.Core.Services;using DevToys.Business.ViewModels;using DevToys.Core;-using DevToys.Core.BuiltInTools;using DevToys.Core.Logging;using DevToys.Core.Mef;using DevToys.Windows.Controls;@@ -44,7 +44,7 @@ public partial class MainWindow : MicaWindowWithOverlay= new MefComposer(new[] {typeof(MainWindowViewModel).Assembly,- typeof(DevToysCoreResourceManagerAssemblyIdentifier).Assembly+ typeof(DevToysBlazorResourceManagerAssemblyIdentifier).Assembly});LogInitialization((DateTime.Now - startTime).TotalMilliseconds);