From 0de3d1ed5cac2fadd46da37a947e463bed11ba3e Mon Sep 17 00:00:00 2001 From: nil4 Date: Wed, 12 Feb 2025 10:19:03 +0100 Subject: [PATCH 1/2] Switch to `.slnx` format With .NET SDK 9.0.200, the legacy GUID goop in solution files is no longer necessary. Replace it with a concise, human-readable (and editable) XML format. Also update `publish.yml` to: - use latest `setup-dotnet` action - install latest .NET 9 SDK, for `.slnx` support --- .github/workflows/publish.yml | 6 +-- src/RoyalApps.Community.Avalonia.sln | 55 --------------------------- src/RoyalApps.Community.Avalonia.slnx | 15 ++++++++ 3 files changed, 18 insertions(+), 58 deletions(-) delete mode 100644 src/RoyalApps.Community.Avalonia.sln create mode 100644 src/RoyalApps.Community.Avalonia.slnx diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c593a56..81d496f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -56,7 +56,7 @@ jobs: # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on env: - Solution_Name: RoyalApps.Community.Avalonia.Windows.sln # Replace with your solution name, i.e. MyWpfApp.sln. + Solution_Name: RoyalApps.Community.Avalonia.Windows.slnx # Replace with your solution name, i.e. MyWpfApp.sln. # Test_Project_Path: your-test-project-path # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. # Wap_Project_Directory: your-wap-project-directory-name # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. # Wap_Project_Path: your-wap-project-path # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. @@ -72,9 +72,9 @@ jobs: # Install the .NET Core workload - name: Install .NET Core - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.101 + dotnet-version: '9.0.x' # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe diff --git a/src/RoyalApps.Community.Avalonia.sln b/src/RoyalApps.Community.Avalonia.sln deleted file mode 100644 index aaedc34..0000000 --- a/src/RoyalApps.Community.Avalonia.sln +++ /dev/null @@ -1,55 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoyalApps.Community.Avalonia.Common", "RoyalApps.Community.Avalonia.Common\RoyalApps.Community.Avalonia.Common.csproj", "{785B7C0E-76F1-490E-92C1-D49D73865A27}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoyalApps.Community.Avalonia.Windows", "RoyalApps.Community.Avalonia.Windows\RoyalApps.Community.Avalonia.Windows.csproj", "{41E5DE98-FBB8-401E-849E-C4E99D31AFB6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InteropDemo", "InteropDemo", "{554C9939-BB72-4B27-AB7B-C18758071539}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropDemo", "RoyalApps.Community.Avalonia.InteropDemo\InteropDemo\InteropDemo.csproj", "{675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropDemo.WinForms", "RoyalApps.Community.Avalonia.InteropDemo\InteropDemo.WinForms\InteropDemo.WinForms.csproj", "{F5BD743E-4CF9-4025-BF0F-0C316C026A89}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{27BCA4E9-9897-470E-ADFA-1A571498CF37}" - ProjectSection(SolutionItems) = preProject - ..\README.md = ..\README.md - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|ARM64 = Debug|ARM64 - Release|x64 = Release|x64 - Release|ARM64 = Release|ARM64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|ARM64.Build.0 = Debug|ARM64 - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|x64.ActiveCfg = Debug|x64 - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Debug|x64.Build.0 = Debug|x64 - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|ARM64.ActiveCfg = Release|ARM64 - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|ARM64.Build.0 = Release|ARM64 - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|x64.ActiveCfg = Release|x64 - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7}.Release|x64.Build.0 = Release|x64 - {F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|ARM64.Build.0 = Debug|ARM64 - {F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|x64.ActiveCfg = Debug|x64 - {F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Debug|x64.Build.0 = Debug|x64 - {F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|ARM64.ActiveCfg = Release|ARM64 - {F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|ARM64.Build.0 = Release|ARM64 - {F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|x64.ActiveCfg = Release|x64 - {F5BD743E-4CF9-4025-BF0F-0C316C026A89}.Release|x64.Build.0 = Release|x64 - {41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|ARM64.Build.0 = Debug|ARM64 - {41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|x64.ActiveCfg = Debug|x64 - {41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Debug|x64.Build.0 = Debug|x64 - {41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|ARM64.ActiveCfg = Release|ARM64 - {41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|ARM64.Build.0 = Release|ARM64 - {41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|x64.ActiveCfg = Release|x64 - {41E5DE98-FBB8-401E-849E-C4E99D31AFB6}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {675038DC-5E38-4F2E-9EE7-2FD0D8E45EF7} = {554C9939-BB72-4B27-AB7B-C18758071539} - {F5BD743E-4CF9-4025-BF0F-0C316C026A89} = {554C9939-BB72-4B27-AB7B-C18758071539} - EndGlobalSection -EndGlobal diff --git a/src/RoyalApps.Community.Avalonia.slnx b/src/RoyalApps.Community.Avalonia.slnx new file mode 100644 index 0000000..df04ad4 --- /dev/null +++ b/src/RoyalApps.Community.Avalonia.slnx @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file From e3458f6a3b237b138bd5be0d785b3dafbef3ac1b Mon Sep 17 00:00:00 2001 From: nil4 Date: Wed, 12 Feb 2025 10:24:01 +0100 Subject: [PATCH 2/2] bump `upload-artifact` to current version ref. https://github.com/royalapplications/royalapps-community-avalonia/actions/runs/13282014567/job/37082243998?pr=3#step:1:36 > Error: This request has been automatically failed because it uses a deprecated version of `actions/upload-artifact: v3`. > Learn more: https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/ --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 81d496f..35376f3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -94,7 +94,7 @@ jobs: # Upload packages - name: Upload managed components - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Avalonia-nupkg path: ./*.nupkg