Upgrade to .Net 8 (#78)

* Upgrade to net8 * WiX upgrade to 3.14
Azure · Feb 26, 2024 · 50aaf4c · 50aaf4c
1 parent d630d51
commit 50aaf4c
Show file tree

Hide file tree

Showing 30 changed files with 109 additions and 130 deletions.
diff --git a/.github/workflows/main-ci-build.yml b/.github/workflows/main-ci-build.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
 
     - name: Restore dependencies
       run: dotnet restore
@@ -49,58 +49,43 @@ jobs:
          docker save azbridge:${{ env.PRODVERSION }} > artifacts/build/images/azbridge-oci-image-${{ env.PRODVERSION }}.${{ env.PATCHVERSION }}.tar
       if: matrix.os == 'ubuntu-latest'
 
-    - name: Build for Windows 10-x64
-      run: dotnet msbuild /t:Package /p:WindowsOnly=true /p:RuntimeIdentifier=win10-x64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
+    - name: Build for Windows-x64
+      run: dotnet msbuild /t:Package /p:WindowsOnly=true /p:RuntimeIdentifier=win-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
       if: matrix.os == 'windows-latest'
-    - name: Build for Windows 10-arm64
-      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=win10-arm /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
+    - name: Build for Windows-arm64
+      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=win-arm /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
       if: matrix.os == 'windows-latest'
-    - name: Build for Windows 10-x86
-      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=win10-x86 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
+    - name: Build for Windows-x86
+      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=win-x86 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
       if: matrix.os == 'windows-latest'
     - name: Build for macOS-x64
-      run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=osx-x64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
+      run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=osx-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
       if: matrix.os == 'ubuntu-latest'
-    - name: Build for Ubuntu 18-x64
-      run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=ubuntu.18.04-x64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
+    - name: Build for macOS-arm64
+      run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=osx-arm64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
       if: matrix.os == 'ubuntu-latest'
-    - name: Build for Ubuntu 18-arm64
-      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=ubuntu.18.04-arm64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
+    - name: Build for Linux-x64
+      run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=linux-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
       if: matrix.os == 'ubuntu-latest'
-    - name: Build for Ubuntu 20-x64
-      run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=ubuntu.20.04-x64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
-      if: matrix.os == 'ubuntu-latest'
-    - name: Build for Ubuntu 20-arm64
-      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=ubuntu.20.04-arm64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
-      if: matrix.os == 'ubuntu-latest'
-    - name: Build for Debian 10-x64
-      run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=debian.10-x64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
-      if: matrix.os == 'ubuntu-latest'
-    - name: Build for OpenSUSE 15-x64
-      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=opensuse.15.0-x64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
-      if: matrix.os == 'ubuntu-latest'
-    - name: Build for Fedora 30-x64
-      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=fedora.34-x64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
-      if: matrix.os == 'ubuntu-latest'
-    - name: Build for CentOS 9-x64
-      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=centos.9-x64 /p:Configuration=Release /p:TargetFramework=net6.0 /p:VersionSuffix=rel
+    - name: Build for Linux-arm64
+      run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=linux-arm64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
       if: matrix.os == 'ubuntu-latest'
 
     - name: Unit Test Windows x64
       env:
          AZBRIDGE_TEST_CXNSTRING: ${{ secrets.AZBRIDGE_TEST_CXNSTRING }}
-      run: dotnet test /p:TargetFramework=net6.0 /p:RuntimeIdentifier=win10-x64 /p:Configuration=Debug
+      run: dotnet test /p:TargetFramework=net8.0 /p:RuntimeIdentifier=win-x64 /p:Configuration=Debug
       if: matrix.os == 'windows-latest'
-    - name: Unit Test Ubuntu 20.04
+    - name: Unit Test Linux x64
       env:
          AZBRIDGE_TEST_CXNSTRING: ${{ secrets.AZBRIDGE_TEST_CXNSTRING }}
-      run: dotnet test /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.20.04-x64 /p:Configuration=Debug
+      run: dotnet test /p:TargetFramework=net8.0 /p:RuntimeIdentifier=linux-x64 /p:Configuration=Debug
       if: matrix.os == 'ubuntu-latest'
 
     - uses: actions/upload-artifact@v2
       with:
         name: XBuild
-        path: artifacts/build/net6.0
+        path: artifacts/build/net8.0
 
     - uses: actions/upload-artifact@v2
       with:
@@ -125,7 +110,7 @@ jobs:
       uses: ncipollo/release-action@v1
       if: startsWith(github.ref, 'refs/tags/v')
       with:
-        artifacts: "artifacts/build/net6.0/*,artifacts/build/images/*"
+        artifacts: "artifacts/build/net8.0/*,artifacts/build/images/*"
         generateReleaseNotes: true
         allowUpdates: true
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'net6.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'net8.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>

diff --git a/Dockerfile b/Dockerfile
@@ -1,21 +1,21 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 as publish
+FROM mcr.microsoft.com/dotnet/sdk:8.0 as publish
 
 # ENV http_proxy=http://proxy.corporation.example:8080
 # ENV https_proxy=http://proxy.corporation.example:8080
 COPY . /azure-relay-bridge/
 WORKDIR /azure-relay-bridge/src/azbridge
-RUN dotnet publish azbridge.csproj -c Release -f net6.0 -p:SelfContained=false -r ubuntu-x64  -p:PublishTrimmed=false -o /app
+RUN dotnet publish azbridge.csproj -c Release -f net8.0 -p:SelfContained=false -r linux-x64  -p:PublishTrimmed=false -o /app
 
-FROM mcr.microsoft.com/dotnet/runtime:6.0
-ARG REVISION=0.6.0
-ARG VERSION=0.6
+FROM mcr.microsoft.com/dotnet/runtime:8.0
+ARG REVISION=0.9.0
+ARG VERSION=0.9
 LABEL org.opencontainers.image.documentation="https://github.com/Azure/azure-relay-bridge/blob/master/README.md"
 LABEL org.opencontainers.image.source="https://github.com/Azure/azure-relay-bridge"
 LABEL org.opencontainers.image.url="https://github.com/Azure/azure-relay-bridge"
 LABEL org.opencontainers.image.authors="[email protected]"
 LABEL org.opencontainers.image.title="Microsoft Azure Relay Bridge"
 LABEL org.opencontainers.image.description="CLI tool to create TCP, UDP, Sockets, and HTTP tunnels via proxies and firewalls using the Azure Relay service."
-LABEL org.opencontainers.image.base.name="mcr.microsoft.com/dotnet/runtime:6.0"
+LABEL org.opencontainers.image.base.name="mcr.microsoft.com/dotnet/runtime:8.0"
 LABEL org.opencontainers.image.revision=${REVISION}
 LABEL org.opencontainers.image.revision=${VERSION}
 WORKDIR /app

diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
@@ -5,7 +5,7 @@
             "azbridge": {
                 "Exclusions": {
                   "DOC_MISSING": {
-                    "lib/net6.0/azbridge.dll": "no public API"
+                    "lib/net8.0/azbridge.dll": "no public API"
                   }
                 }
               }

diff --git a/OVERVIEW.md b/OVERVIEW.md
@@ -225,7 +225,7 @@ The package install will put the tool into `/usr/share/azbridge`.
 
 You can also install the tool from respective platform *.tar.gz archive. For
 Linux, you need to [explicitly install Linux prerequisites for .NET
-6.0](https://docs.microsoft.com/en-us/dotnet/core/install/linux) for your
+8.0](https://docs.microsoft.com/en-us/dotnet/core/install/linux) for your
 respective distribution. For macOS, you need to [install prerequisites from this
 list](https://docs.microsoft.com/en-us/dotnet/core/install/macos).
 
@@ -238,12 +238,12 @@ built on Windows. You will at least need the "Build Tools for Visual Studio
 2022", and ideally a local install of Visual Studio 2022 with desktop C#
 support.
 
-All other versions are built with the .NET 6.0 SDK. The DEB and
+All other versions are built with the .NET 8.0 SDK. The DEB and
 RPM packages are only created when building on a Unix (i.e. Linux or macOS) host.
 
 The ideal build environment is a Windows host with Docker for Windows installed.
 The `package-all.cmd` script will first build and package all Windows targets,
-and then launch a docker-based build with the official Microsoft .NET Core 6.0
+and then launch a docker-based build with the official Microsoft .NET Core 8.0
 SDK image for the remaining targets. The `package.sh` script will only build and
 package the Unix targets, the `package.cmd` script only Windows targets. The
 `build.cmd` and `build.sh` scripts only build the project without packaging.

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -4,10 +4,10 @@
   </PropertyGroup>
   <PropertyGroup Label="Package Versions">
     <PackagingTargetsPackageVersion>0.1.220</PackagingTargetsPackageVersion>
-    <WixPackageVersion>3.11.2</WixPackageVersion>
+    <WixPackageVersion>3.14.0</WixPackageVersion>
     <MicrosoftDiagnosticsTracingEventSourcePackageVersion>1.1.28</MicrosoftDiagnosticsTracingEventSourcePackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.66</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>6.0.0</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>8.0.0</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNetHttpHeadersPackageVersion>2.2.8</MicrosoftNetHttpHeadersPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>17.3.0</MicrosoftNETTestSdkPackageVersion>
     <SystemNetNetworkInformationPackageVersion>4.3.0</SystemNetNetworkInformationPackageVersion>
@@ -16,7 +16,7 @@
     <SystemIOPackageVersion>4.3.0</SystemIOPackageVersion>
     <SystemMemoryPackageVersion>4.5.5</SystemMemoryPackageVersion>
     <SystemDiagnosticsTracingPackageVersion>4.3.0</SystemDiagnosticsTracingPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
     <SystemNetNameResolutionPackageVersion>4.3.0</SystemNetNameResolutionPackageVersion>
     <YamlDotNetPackageVersion>12.0.0</YamlDotNetPackageVersion>

diff --git a/build/repo.props b/build/repo.props
@@ -1,17 +1,17 @@
 <Project>
 	<PropertyGroup>
 		<WindowsOnly>false</WindowsOnly>
-		<CoreFrameworks>net6.0</CoreFrameworks>
+		<CoreFrameworks>net8.0</CoreFrameworks>
 		<TargetFrameworks>$(CoreFrameworks)</TargetFrameworks>
-		<TargetFramework Condition="'$(TargetFramework)'==''">net6.0</TargetFramework>
-		<WindowsRuntimeIdentifiers Condition="'$(OS)'=='Windows_NT'">win10-x64;win10-x86;win10-arm64;</WindowsRuntimeIdentifiers>
-		<UnixRuntimeIdentifiers Condition="'$(WindowsOnly)'=='false'">osx-x64;debian.10-x64;ubuntu.18.04-x64;ubuntu.18.04-arm64;ubuntu.20.04-x64;ubuntu.20.04-arm64;opensuse.15.0-x64;fedora.34-x64;centos.9-x64</UnixRuntimeIdentifiers>
+		<TargetFramework Condition="'$(TargetFramework)'==''">net8.0</TargetFramework>
+		<WindowsRuntimeIdentifiers Condition="'$(OS)'=='Windows_NT'">win-x64;win-x86;win-arm64;</WindowsRuntimeIdentifiers>
+		<UnixRuntimeIdentifiers Condition="'$(WindowsOnly)'=='false'">osx-x64;osx-arm64;linux-x64;linux-arm64</UnixRuntimeIdentifiers>
 		<RuntimeIdentifiers>$(WindowsRuntimeIdentifiers)$(UnixRuntimeIdentifiers)</RuntimeIdentifiers>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(OS)' == 'Windows_NT' OR $(RuntimeIdentifier.StartsWith('win'))">
 		<DefineConstants>_WINDOWS</DefineConstants>
 	</PropertyGroup>
-	<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith('ubuntu')) OR $(RuntimeIdentifier.StartsWith('debian')) OR $(RuntimeIdentifier.StartsWith('rhel')) OR $(RuntimeIdentifier.StartsWith('centos')) OR $(RuntimeIdentifier.StartsWith('fedora')) ">
+	<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith('linux'))">
 		<DefineConstants>_SYSTEMD</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup>

diff --git a/package-all.cmd b/package-all.cmd
@@ -10,27 +10,22 @@ echo *** Building and packaging Windows Targets
 
 if %_DOCKER_BUILD% == "true" (
    echo *** Windows only
-   dotnet msbuild /t:restore,package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net6.0 /p:RuntimeIdentifier=win10-x64 %*
-   dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net6.0 /p:RuntimeIdentifier=win10-arm64 %*
-   dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net6.0 /p:RuntimeIdentifier=win10-x86 %*
+   dotnet msbuild /t:restore,package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net8.0 /p:RuntimeIdentifier=win-x64 %*
+   dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net8.0 /p:RuntimeIdentifier=win-arm64 %*
+   dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net8.0 /p:RuntimeIdentifier=win-x86 %*
 ) else (
     echo *** All platforms
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net6.0 /p:RuntimeIdentifier=win10-x64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net6.0 /p:RuntimeIdentifier=win10-arm64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net6.0 /p:RuntimeIdentifier=win10-x86 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=osx-x64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=debian.10-x64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.18.04-x64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.18.04-arm64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.20.04-x64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.20.04-arm64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=opensuse.15.0-x64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=fedora.34-x64 %*
-    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=centos.9-x64 %*
+    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net8.0 /p:RuntimeIdentifier=win-x64 %*
+    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net8.0 /p:RuntimeIdentifier=win-arm64 %*
+    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=true /p:TargetFramework=net8.0 /p:RuntimeIdentifier=win-x86 %*
+    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net8.0 /p:RuntimeIdentifier=osx-x64 %*
+    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net8.0 /p:RuntimeIdentifier=osx-arm64 %*
+    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net8.0 /p:RuntimeIdentifier=linux-x64 %*
+    dotnet msbuild /t:restore,Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net8.0 /p:RuntimeIdentifier=linux-arm64 %*
 )
 
 if not errorlevel 0 exit /b 1
 if %_DOCKER_BUILD% == "true" (
   echo *** Building and packaging Unix/Linux Targets
-  docker run --rm -v %cd%:/build mcr.microsoft.com/dotnet/sdk:6.0 /build/package.sh %*
+  docker run --rm -v %cd%:/build mcr.microsoft.com/dotnet/sdk:8.0 /build/package.sh %*
 )
diff --git a/package.sh b/package.sh
@@ -2,14 +2,8 @@
 pushd "${0%/*}" > /dev/null 
 if [ ! -z $BUILDVERSION ]; then _VersionProp="/p:VersionPrefix=$BUILDVERSION"; fi
 dotnet restore
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=osx-x64 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=debian.10-x64 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.18.04-x64 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.18.04-arm64 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.20.04-x64 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=ubuntu.20.04-arm64 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=opensuse.15.0-x64 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=fedora.34-x64 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net6.0 /p:RuntimeIdentifier=centos.9-x64 $_BuildProp $_VersionProp $@
-
+dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net8.0 /p:RuntimeIdentifier=osx-x64 $_BuildProp $_VersionProp $@
+dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net8.0 /p:RuntimeIdentifier=osx-arm64 $_BuildProp $_VersionProp $@
+dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net8.0 /p:RuntimeIdentifier=linux-x64 $_BuildProp $_VersionProp $@
+dotnet msbuild /t:Package /p:Configuration=Release /p:WindowsOnly=false /p:TargetFramework=net8.0 /p:RuntimeIdentifier=linux-arm64 $_BuildProp $_VersionProp $@
 popd
diff --git a/src/Microsoft.Azure.Relay.Bridge/Configuration/ConfigException.cs b/src/Microsoft.Azure.Relay.Bridge/Configuration/ConfigException.cs
@@ -25,6 +25,7 @@ public ConfigException(string fileName, string message, Exception innerException
             FileName = fileName;
         }
 
+        [Obsolete(DiagnosticId = "SYSLIB0051")]
         protected ConfigException(SerializationInfo info, StreamingContext context) : base(info, context)
         {
         }