From 108b881fd6328f1f90c0828403cce86f8fa9ce67 Mon Sep 17 00:00:00 2001 From: RobertBeekman Date: Fri, 23 Feb 2024 22:18:58 +0100 Subject: [PATCH 1/4] CI - Fix Windows RID --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 58c7ffed6..5633f29e6 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -35,7 +35,7 @@ jobs: matrix: include: - os: windows-latest - rid: win10-x64 + rid: win-x64 csproj: Windows - os: ubuntu-latest From e5edc97077077773ecf92e5c256020ea982e2331 Mon Sep 17 00:00:00 2001 From: RobertBeekman Date: Fri, 23 Feb 2024 22:39:49 +0100 Subject: [PATCH 2/4] Trial and error paths on CIs yaaaay --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 5633f29e6..63b15cc9c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -68,7 +68,7 @@ jobs: New-Item -ItemType "Directory" -Path build/${{ matrix.rid }}/Plugins/ Get-ChildItem -File -Recurse -Filter *.csproj Artemis.Plugins/src/ | Foreach-Object -Parallel { - dotnet publish --configuration Release --runtime ${{ matrix.rid }} --output build-plugins/$($_.BaseName) --no-self-contained $($_.FullName); + dotnet publish --configuration Release -p:SolutionDir=${{ github.workspace }}/Artemis/Artemis.Plugins/src --runtime ${{ matrix.rid }} --output build-plugins/$($_.BaseName) --no-self-contained $($_.FullName); Compress-Archive -Path "build-plugins/$($_.BaseName)" -DestinationPath "build/${{ matrix.rid }}/Plugins/$($_.BaseName).zip"; } shell: pwsh From aaaae5be5210981382a93ca863a668302a40aa2c Mon Sep 17 00:00:00 2001 From: RobertBeekman Date: Fri, 23 Feb 2024 22:42:31 +0100 Subject: [PATCH 3/4] Revert "Trial and error paths on CIs yaaaay" This reverts commit e5edc97077077773ecf92e5c256020ea982e2331. --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 63b15cc9c..5633f29e6 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -68,7 +68,7 @@ jobs: New-Item -ItemType "Directory" -Path build/${{ matrix.rid }}/Plugins/ Get-ChildItem -File -Recurse -Filter *.csproj Artemis.Plugins/src/ | Foreach-Object -Parallel { - dotnet publish --configuration Release -p:SolutionDir=${{ github.workspace }}/Artemis/Artemis.Plugins/src --runtime ${{ matrix.rid }} --output build-plugins/$($_.BaseName) --no-self-contained $($_.FullName); + dotnet publish --configuration Release --runtime ${{ matrix.rid }} --output build-plugins/$($_.BaseName) --no-self-contained $($_.FullName); Compress-Archive -Path "build-plugins/$($_.BaseName)" -DestinationPath "build/${{ matrix.rid }}/Plugins/$($_.BaseName).zip"; } shell: pwsh From 110b6b90a0dfb5485a97b37a3b660a0507de1b01 Mon Sep 17 00:00:00 2001 From: RobertBeekman Date: Fri, 23 Feb 2024 23:25:22 +0100 Subject: [PATCH 4/4] Work around idiotic .NET 8 breaking change --- src/Artemis.UI.Shared/nuget.config | 11 ----------- src/Artemis.sln | 1 + src/Directory.Build.props | 5 +++++ 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 src/Artemis.UI.Shared/nuget.config create mode 100644 src/Directory.Build.props diff --git a/src/Artemis.UI.Shared/nuget.config b/src/Artemis.UI.Shared/nuget.config deleted file mode 100644 index 6a3e3c056..000000000 --- a/src/Artemis.UI.Shared/nuget.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/src/Artemis.sln b/src/Artemis.sln index 3839be2bc..e7643caba 100644 --- a/src/Artemis.sln +++ b/src/Artemis.sln @@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Artemis.sln.DotSettings = Artemis.sln.DotSettings Artemis.sln.DotSettings.user = Artemis.sln.DotSettings.user Directory.Packages.props = Directory.Packages.props + Directory.Build.props = Directory.Build.props EndProjectSection EndProject Global diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 000000000..d74e73af3 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,5 @@ + + + false + + \ No newline at end of file