Merge branch 'main' into release

BlossomiShymae · Aug 19, 2024 · 8681cd0 · 8681cd0
2 parents e2bfac4 + 641d230
commit 8681cd0
Show file tree

Hide file tree

Showing 91 changed files with 542 additions and 508 deletions.
diff --git 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.Core.Tests/LcuSchemaHandlerTest.cs b/Needlework.Net.Core.Tests/LcuSchemaHandlerTest.cs
diff --git a/Needlework.Net.Core.Tests/Needlework.Net.Core.Tests.csproj b/Needlework.Net.Core.Tests/Needlework.Net.Core.Tests.csproj
diff --git a/Needlework.Net.Core.Tests/ResourcesTest.cs b/Needlework.Net.Core.Tests/ResourcesTest.cs
diff --git a/Needlework.Net.Core/Needlework.Net.Core.csproj b/Needlework.Net.Core/Needlework.Net.Core.csproj
diff --git a/Needlework.Net.Desktop/Messages/DataReadyMessage.cs b/Needlework.Net.Desktop/Messages/DataReadyMessage.cs
diff --git a/Needlework.Net.Desktop/Messages/DataRequestMessage.cs b/Needlework.Net.Desktop/Messages/DataRequestMessage.cs
diff --git a/Needlework.Net.Desktop/Messages/OopsiesWindowCanceledMessage.cs b/Needlework.Net.Desktop/Messages/OopsiesWindowCanceledMessage.cs
diff --git a/Needlework.Net.Desktop/Messages/OopsiesWindowRequestedMessage.cs b/Needlework.Net.Desktop/Messages/OopsiesWindowRequestedMessage.cs
diff --git a/Needlework.Net.Desktop/Services/WindowService.cs b/Needlework.Net.Desktop/Services/WindowService.cs
diff --git a/Needlework.Net.Desktop/ViewModels/AboutViewModel.cs b/Needlework.Net.Desktop/ViewModels/AboutViewModel.cs
diff --git a/Needlework.Net.Desktop/ViewModels/OopsiesWindowViewModel.cs b/Needlework.Net.Desktop/ViewModels/OopsiesWindowViewModel.cs
diff --git a/Needlework.Net.Desktop/Views/AboutView.axaml b/Needlework.Net.Desktop/Views/AboutView.axaml
diff --git a/Needlework.Net.Desktop/Views/OopsiesWindow.axaml b/Needlework.Net.Desktop/Views/OopsiesWindow.axaml
diff --git a/Needlework.Net.Desktop/Views/OopsiesWindow.axaml.cs b/Needlework.Net.Desktop/Views/OopsiesWindow.axaml.cs
diff --git a/Needlework.Net.sln b/Needlework.Net.sln
@@ -3,11 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 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}"
-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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net", "Needlework.Net\Needlework.Net.csproj", "{7388B579-2DC0-46D6-957A-6683D0FCF5D3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,17 +14,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7388B579-2DC0-46D6-957A-6683D0FCF5D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7388B579-2DC0-46D6-957A-6683D0FCF5D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7388B579-2DC0-46D6-957A-6683D0FCF5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7388B579-2DC0-46D6-957A-6683D0FCF5D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal