From bccb232ae7d3a11c92aa20ee9c24f02be05a17f8 Mon Sep 17 00:00:00 2001
From: "Erik A. Brandstadmoen" <erik@brandstadmoen.net>
Date: Sat, 16 Sep 2023 16:15:01 +0200
Subject: [PATCH] Fix RIDs for .net 8 (#30)

* Fix RIDs for .net 8
* Fix RIDs in github workflows
* Removed arm64 linux builds - they don't run on the github hosted agents
---
 .github/workflows/build-and-publish.yml | 17 +++--------------
 smink/smink.csproj                      |  5 ++---
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index f9fbc87..1d122a2 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -74,10 +74,6 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        # arch: [ "win-x64", "win-x86", "win-arm", "win-arm64", 
-        #         "alpine-x64", "linux-x64", "linux-arm", "linux-arm64",
-        #         "osx-x64", "osx.11.0-x64", "osx.11.0-arm64", "osx.12-x64", "osx.12-arm64", "osx.13-x64", "osx.13-arm64"
-        #       ]
         arch: [ "win-x64", "win-arm64" ]
 
     steps:
@@ -106,11 +102,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # arch: [ "win-x64", "win-x86", "win-arm", "win-arm64", 
-        #         "alpine-x64", "linux-x64", "linux-arm", "linux-arm64",
-        #         "osx-x64", "osx.11.0-x64", "osx.11.0-arm64", "osx.12-x64", "osx.12-arm64", "osx.13-x64", "osx.13-arm64"
-        #       ]
-        arch: [ "linux-x64" ]
+        #arch: [ "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ]
+        arch: [ "linux-x64", "linux-musl-x64" ]
 
     steps:
     - uses: actions/checkout@v4
@@ -138,11 +131,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        # arch: [ "win-x64", "win-x86", "win-arm", "win-arm64", 
-        #         "alpine-x64", "linux-x64", "linux-arm", "linux-arm64",
-        #         "osx-x64", "osx.11.0-x64", "osx.11.0-arm64", "osx.12-x64", "osx.12-arm64", "osx.13-x64", "osx.13-arm64"
-        #       ]
-        arch: [ "osx-x64", "osx.11.0-x64", "osx.11.0-arm64", "osx.12-x64", "osx.12-arm64", "osx.13-x64", "osx.13-arm64" ]
+        arch: [ "osx-x64", "osx-arm64" ]
 
     steps:
     - uses: actions/checkout@v4
diff --git a/smink/smink.csproj b/smink/smink.csproj
index 36b711a..2a53287 100644
--- a/smink/smink.csproj
+++ b/smink/smink.csproj
@@ -13,9 +13,8 @@
 
    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DebugType>None</DebugType>
-    <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">osx.13-x64</RuntimeIdentifier>
-<!--    <RuntimeIdentifiers>win-x64;win-x86;win-arm;win-arm64;alpine-x64;linux-x64;linux-arm64;osx.11.0-x64;osx.10.12-x64;osx-x64;osx.13-x64;osx.13-arm64;osx.12-arm64;osx.11.0-arm64</RuntimeIdentifiers>-->
-    <RuntimeIdentifiers>win-x64;win-x86;win-arm64;alpine-x64;linux-x64;linux-arm64;osx-x64;osx.13-x64;osx.13-arm64;osx.12-arm64;osx.11.0-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">osx-arm64</RuntimeIdentifier>
+    <RuntimeIdentifiers>win-x64;win-x86;win-arm64;linux-musl-x64;linux-musl-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <PublishAot>true</PublishAot>
    </PropertyGroup>