From baf189e6a9f19c647a671d47079a43b09fa6a189 Mon Sep 17 00:00:00 2001 From: BlossomiShymae <87099578+BlossomiShymae@users.noreply.github.com> Date: Sun, 18 Aug 2024 19:03:47 -0500 Subject: [PATCH] Refactor workspace name --- .github/workflows/release.yml | 6 +++--- Needlework.Net.sln | 2 +- .../App.axaml | 6 +++--- .../App.axaml.cs | 6 +++--- .../Assets/Icons/home.png | Bin .../Assets/Icons/info-circle.png | Bin .../Assets/Icons/list-alt.png | Bin .../Assets/Icons/plug.png | Bin .../Assets/Icons/terminal.png | Bin .../Assets/about.png | Bin .../Assets/app.ico | Bin .../Assets/app.png | Bin .../Controls/BusyArea.axaml | 4 ++-- .../Controls/BusyArea.axaml.cs | 2 +- .../Controls/Card.axaml | 2 +- .../Controls/Card.axaml.cs | 2 +- .../Converters/EnumerableBoolConverter.cs | 2 +- .../Converters/NullBoolConverter.cs | 2 +- .../Extensions/TextEditorExtensions.cs | 2 +- .../GithubRelease.cs | 2 +- .../Messages/ContentRequestMessage.cs | 2 +- .../Messages/DataReadyMessage.cs | 2 +- .../Messages/DataRequestMessage.cs | 2 +- .../Messages/EditorUpdateMessage.cs | 2 +- .../Messages/HostDocumentRequestMessage.cs | 2 +- .../Messages/InfoBarUpdateMessage.cs | 4 ++-- .../Messages/OopsiesWindowCanceledMessage.cs | 2 +- .../Messages/OopsiesWindowRequestedMessage.cs | 2 +- .../Messages/ResponseUpdatedMessage.cs | 2 +- .../Needlework.Net.csproj | 0 .../Program.cs | 6 +++--- .../Services/WindowService.cs | 8 ++++---- .../ViewLocator.cs | 2 +- .../ViewModels/AboutViewModel.cs | 2 +- .../ViewModels/ConsoleViewModel.cs | 6 +++--- .../ViewModels/EndpointViewModel.cs | 4 ++-- .../ViewModels/EndpointsContainerViewModel.cs | 2 +- .../ViewModels/EndpointsViewModel.cs | 4 ++-- .../ViewModels/HomeViewModel.cs | 2 +- .../ViewModels/InfoBarViewModel.cs | 2 +- .../ViewModels/MainWindowViewModel.cs | 6 +++--- .../ViewModels/OopsiesWindowViewModel.cs | 4 ++-- .../ViewModels/OperationViewModel.cs | 4 ++-- .../ViewModels/PageBase.cs | 2 +- .../ViewModels/ParameterViewModel.cs | 2 +- .../ViewModels/PathOperationViewModel.cs | 4 ++-- .../ViewModels/PropertyClassViewModel.cs | 2 +- .../ViewModels/PropertyEnumViewModel.cs | 2 +- .../ViewModels/PropertyFieldViewModel.cs | 2 +- .../ViewModels/WebsocketViewModel.cs | 6 +++--- .../Views/AboutView.axaml | 6 +++--- .../Views/AboutView.axaml.cs | 2 +- .../Views/ConsoleView.axaml | 6 +++--- .../Views/ConsoleView.axaml.cs | 8 ++++---- .../Views/EndpointView.axaml | 6 +++--- .../Views/EndpointView.axaml.cs | 8 ++++---- .../Views/EndpointsContainerView.axaml | 4 ++-- .../Views/EndpointsContainerView.axaml.cs | 2 +- .../Views/EndpointsView.axaml | 6 +++--- .../Views/EndpointsView.axaml.cs | 2 +- .../Views/HomeView.axaml | 6 +++--- .../Views/HomeView.axaml.cs | 2 +- .../Views/MainWindow.axaml | 4 ++-- .../Views/MainWindow.axaml.cs | 2 +- .../Views/OopsiesWindow.axaml | 4 ++-- .../Views/OopsiesWindow.axaml.cs | 2 +- .../Views/WebsocketView.axaml | 4 ++-- .../Views/WebsocketView.axaml.cs | 8 ++++---- {Needlework.Net.Desktop => Needlework.Net}/app.ico | Bin .../app.manifest | 2 +- 70 files changed, 107 insertions(+), 107 deletions(-) rename {Needlework.Net.Desktop => Needlework.Net}/App.axaml (87%) rename {Needlework.Net.Desktop => Needlework.Net}/App.axaml.cs (91%) rename {Needlework.Net.Desktop => Needlework.Net}/Assets/Icons/home.png (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Assets/Icons/info-circle.png (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Assets/Icons/list-alt.png (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Assets/Icons/plug.png (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Assets/Icons/terminal.png (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Assets/about.png (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Assets/app.ico (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Assets/app.png (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Controls/BusyArea.axaml (94%) rename {Needlework.Net.Desktop => Needlework.Net}/Controls/BusyArea.axaml.cs (94%) rename {Needlework.Net.Desktop => Needlework.Net}/Controls/Card.axaml (89%) rename {Needlework.Net.Desktop => Needlework.Net}/Controls/Card.axaml.cs (68%) rename {Needlework.Net.Desktop => Needlework.Net}/Converters/EnumerableBoolConverter.cs (93%) rename {Needlework.Net.Desktop => Needlework.Net}/Converters/NullBoolConverter.cs (91%) rename {Needlework.Net.Desktop => Needlework.Net}/Extensions/TextEditorExtensions.cs (97%) rename {Needlework.Net.Desktop => Needlework.Net}/GithubRelease.cs (89%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/ContentRequestMessage.cs (75%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/DataReadyMessage.cs (82%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/DataRequestMessage.cs (79%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/EditorUpdateMessage.cs (90%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/HostDocumentRequestMessage.cs (80%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/InfoBarUpdateMessage.cs (67%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/OopsiesWindowCanceledMessage.cs (79%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/OopsiesWindowRequestedMessage.cs (79%) rename {Needlework.Net.Desktop => Needlework.Net}/Messages/ResponseUpdatedMessage.cs (78%) rename Needlework.Net.Desktop/Needlework.Net.Desktop.csproj => Needlework.Net/Needlework.Net.csproj (100%) rename {Needlework.Net.Desktop => Needlework.Net}/Program.cs (93%) rename {Needlework.Net.Desktop => Needlework.Net}/Services/WindowService.cs (89%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewLocator.cs (95%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/AboutViewModel.cs (75%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/ConsoleViewModel.cs (97%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/EndpointViewModel.cs (95%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/EndpointsContainerViewModel.cs (95%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/EndpointsViewModel.cs (95%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/HomeViewModel.cs (91%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/InfoBarViewModel.cs (95%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/MainWindowViewModel.cs (97%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/OopsiesWindowViewModel.cs (90%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/OperationViewModel.cs (99%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/PageBase.cs (89%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/ParameterViewModel.cs (92%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/PathOperationViewModel.cs (98%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/PropertyClassViewModel.cs (97%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/PropertyEnumViewModel.cs (90%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/PropertyFieldViewModel.cs (84%) rename {Needlework.Net.Desktop => Needlework.Net}/ViewModels/WebsocketViewModel.cs (97%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/AboutView.axaml (89%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/AboutView.axaml.cs (77%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/ConsoleView.axaml (93%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/ConsoleView.axaml.cs (91%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/EndpointView.axaml (98%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/EndpointView.axaml.cs (92%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/EndpointsContainerView.axaml (90%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/EndpointsContainerView.axaml.cs (80%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/EndpointsView.axaml (88%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/EndpointsView.axaml.cs (82%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/HomeView.axaml (94%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/HomeView.axaml.cs (81%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/MainWindow.axaml (96%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/MainWindow.axaml.cs (83%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/OopsiesWindow.axaml (94%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/OopsiesWindow.axaml.cs (84%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/WebsocketView.axaml (93%) rename {Needlework.Net.Desktop => Needlework.Net}/Views/WebsocketView.axaml.cs (92%) rename {Needlework.Net.Desktop => Needlework.Net}/app.ico (100%) rename {Needlework.Net.Desktop => Needlework.Net}/app.manifest (91%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 286a5c8..530c9d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,14 +20,14 @@ jobs: fetch-depth: 0 ref: release - name: Build - run: dotnet build Needlework.Net.Desktop -c Release + run: dotnet build Needlework.Net -c Release - name: Publish - run: dotnet publish Needlework.Net.Desktop -c Release -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:DebugType=None -p:DebugSymbols=false -o publish -r win-x64 --self-contained=false + run: dotnet publish Needlework.Net -c Release -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:DebugType=None -p:DebugSymbols=false -o publish -r win-x64 --self-contained=false - name: Get Version id: version shell: powershell run: | - $xml=[xml](Get-Content .\Needlework.Net.Desktop\Needlework.Net.Desktop.csproj) + $xml=[xml](Get-Content .\Needlework.Net\Needlework.Net.csproj) $ver=($xml.Project.PropertyGroup).AssemblyVersion $ver="VERSION=$ver" $ver=$ver -replace '\s','' diff --git a/Needlework.Net.sln b/Needlework.Net.sln index 03b71a2..44bbbb1 100644 --- a/Needlework.Net.sln +++ b/Needlework.Net.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net.Core", "Needlework.Net.Core\Needlework.Net.Core.csproj", "{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net.Desktop", "Needlework.Net.Desktop\Needlework.Net.Desktop.csproj", "{7388B579-2DC0-46D6-957A-6683D0FCF5D3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net", "Needlework.Net\Needlework.Net.csproj", "{7388B579-2DC0-46D6-957A-6683D0FCF5D3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net.Core.Tests", "Needlework.Net.Core.Tests\Needlework.Net.Core.Tests.csproj", "{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}" EndProject diff --git a/Needlework.Net.Desktop/App.axaml b/Needlework.Net/App.axaml similarity index 87% rename from Needlework.Net.Desktop/App.axaml rename to Needlework.Net/App.axaml index 55e49e6..02d7a64 100644 --- a/Needlework.Net.Desktop/App.axaml +++ b/Needlework.Net/App.axaml @@ -1,8 +1,8 @@ diff --git a/Needlework.Net.Desktop/App.axaml.cs b/Needlework.Net/App.axaml.cs similarity index 91% rename from Needlework.Net.Desktop/App.axaml.cs rename to Needlework.Net/App.axaml.cs index 2ec30c9..2ee5261 100644 --- a/Needlework.Net.Desktop/App.axaml.cs +++ b/Needlework.Net/App.axaml.cs @@ -3,12 +3,12 @@ using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; using Microsoft.Extensions.DependencyInjection; -using Needlework.Net.Desktop.ViewModels; -using Needlework.Net.Desktop.Views; +using Needlework.Net.ViewModels; +using Needlework.Net.Views; using System; using System.Text.Json; -namespace Needlework.Net.Desktop; +namespace Needlework.Net; public partial class App(IServiceProvider serviceProvider) : Application { diff --git a/Needlework.Net.Desktop/Assets/Icons/home.png b/Needlework.Net/Assets/Icons/home.png similarity index 100% rename from Needlework.Net.Desktop/Assets/Icons/home.png rename to Needlework.Net/Assets/Icons/home.png diff --git a/Needlework.Net.Desktop/Assets/Icons/info-circle.png b/Needlework.Net/Assets/Icons/info-circle.png similarity index 100% rename from Needlework.Net.Desktop/Assets/Icons/info-circle.png rename to Needlework.Net/Assets/Icons/info-circle.png diff --git a/Needlework.Net.Desktop/Assets/Icons/list-alt.png b/Needlework.Net/Assets/Icons/list-alt.png similarity index 100% rename from Needlework.Net.Desktop/Assets/Icons/list-alt.png rename to Needlework.Net/Assets/Icons/list-alt.png diff --git a/Needlework.Net.Desktop/Assets/Icons/plug.png b/Needlework.Net/Assets/Icons/plug.png similarity index 100% rename from Needlework.Net.Desktop/Assets/Icons/plug.png rename to Needlework.Net/Assets/Icons/plug.png diff --git a/Needlework.Net.Desktop/Assets/Icons/terminal.png b/Needlework.Net/Assets/Icons/terminal.png similarity index 100% rename from Needlework.Net.Desktop/Assets/Icons/terminal.png rename to Needlework.Net/Assets/Icons/terminal.png diff --git a/Needlework.Net.Desktop/Assets/about.png b/Needlework.Net/Assets/about.png similarity index 100% rename from Needlework.Net.Desktop/Assets/about.png rename to Needlework.Net/Assets/about.png diff --git a/Needlework.Net.Desktop/Assets/app.ico b/Needlework.Net/Assets/app.ico similarity index 100% rename from Needlework.Net.Desktop/Assets/app.ico rename to Needlework.Net/Assets/app.ico diff --git a/Needlework.Net.Desktop/Assets/app.png b/Needlework.Net/Assets/app.png similarity index 100% rename from Needlework.Net.Desktop/Assets/app.png rename to Needlework.Net/Assets/app.png diff --git a/Needlework.Net.Desktop/Controls/BusyArea.axaml b/Needlework.Net/Controls/BusyArea.axaml similarity index 94% rename from Needlework.Net.Desktop/Controls/BusyArea.axaml rename to Needlework.Net/Controls/BusyArea.axaml index 51056a7..4b6ad74 100644 --- a/Needlework.Net.Desktop/Controls/BusyArea.axaml +++ b/Needlework.Net/Controls/BusyArea.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Needlework.Net.Desktop.Controls" + xmlns:controls="using:Needlework.Net.Controls" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Needlework.Net.Desktop.Controls.BusyArea"> + x:Class="Needlework.Net.Controls.BusyArea">