From 5f91598c157e0172e2933fcfbb142fbdd7332e7a Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Tue, 6 Sep 2022 10:28:19 -0700
Subject: [PATCH] chore: Add generic linux target (#1164)

---
 .github/workflows/build-test.yml | 4 ++--
 Directory.Build.props            | 2 +-
 README.md                        | 1 +
 azure-pipelines.yml              | 8 ++------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 729e0bcfc..578efb061 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         dotnet-version: 6.0.400
     - name: Build
-      run: ./publish.cmd
+      run: ./publish.cmd Release
     - name: Test
       run: dotnet test --no-restore
 
@@ -56,6 +56,6 @@ jobs:
         with:
           dotnet-version: 6.0.400
       - name: Build
-        run: ./publish.cmd
+        run: ./publish.cmd Release
       - name: Test
         run: dotnet test --no-restore
diff --git a/Directory.Build.props b/Directory.Build.props
index fe39f1668..902442372 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,7 +11,7 @@
         <PublicRelease>true</PublicRelease>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <NoWarn>NU1603</NoWarn>
-        <RuntimeIdentifiers>win-x64;debian.10-x64;debian.11-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;centos.7-x64;centos.8-x64;fedora.32-x64;fedora.33-x64;fedora.34-x64;fedora.35-x64;fedora.36-x64;rhel.7-x64;rhel.8-x64;linuxmint.17-x64;linuxmint.18-x64;linuxmint.19-x64;osx-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;debian.10-x64;debian.11-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;centos.7-x64;centos.8-x64;fedora.32-x64;fedora.33-x64;fedora.34-x64;fedora.35-x64;fedora.36-x64;rhel.7-x64;rhel.8-x64;linuxmint.17-x64;linuxmint.18-x64;linuxmint.19-x64</RuntimeIdentifiers>
         <Configurations>Debug;Release;Analyze</Configurations>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/README.md b/README.md
index ca849c094..a0bd1bb4c 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ Rider 2022.2.2+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
     - `centos.7`, `centos.8` - CentOS
     - `fedora.32`, `fedora.33`, `fedora.34`, `fedora.35`, `fedora.36` - Fedora
     - `rhel.7`, `rhel.8` - Redhat
+    - 'linux' - Other linux distros
     - If blank, the operating system running the build is used. Linux Mint 20 is not supported directly yet, so build explicitly against `ubuntu.20.04` instead.
 
 ## Running the Server
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fa6c77244..0e98e89f1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,7 +20,7 @@ jobs:
       packageType: sdk
       version: 6.0.400
   - task: NuGetAuthenticate@0
-  - script: ./publish.cmd Release win
+  - script: ./publish.cmd Release
     displayName: 'Build'
   - script: dotnet test --no-restore
     displayName: 'Test'
@@ -30,16 +30,12 @@ jobs:
     matrix:
       'CentOS 8':
         containerImage: centos:8
-        os: centos.8
       'CentOS 7':
         containerImage: centos:7
-        os: centos.7
       'Debian 11':
         containerImage: mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim
-        os: debian.11
       'Ubuntu 20':
         containerImage: mcr.microsoft.com/dotnet/sdk:6.0-focal
-        os: ubuntu.20.04
 
   displayName: Linux
 
@@ -55,7 +51,7 @@ jobs:
       packageType: sdk
       version: 6.0.400
   - task: NuGetAuthenticate@0
-  - script: ./publish.cmd Release $(os)
+  - script: ./publish.cmd Release
     displayName: 'Build'
   - script: dotnet test --no-restore
     displayName: 'Test'