From 24bcfafc6cd91899cc5665bbc3190066df71de8e Mon Sep 17 00:00:00 2001 From: "T. Thiery" Date: Tue, 2 Jan 2024 23:01:05 +0100 Subject: [PATCH] .NET 8 - Update to .NET 8 framework and fix dependencies - Update Build Script #191 & #192 --- .github/workflows/build-ci.yml | 10 +++++----- .github/workflows/build-release.yml | 18 +++++++++--------- .../SharpBrick.PoweredUp.Examples.csproj | 18 +++++++++--------- .../SharpBrick.PoweredUp.BlueGigaBLE.csproj | 12 ++++++------ .../SharpBrick.PoweredUp.Cli.csproj | 18 +++++++++--------- .../SharpBrick.PoweredUp.Mobile.csproj | 2 +- .../XamarinPoweredUpBluetoothCharacteristic.cs | 2 +- .../SharpBrick.PoweredUp.WinRT.csproj | 2 +- .../SharpBrick.PoweredUp.csproj | 8 ++++---- .../SharpBrick.PoweredUp.Test.csproj | 14 +++++++------- .../SharpBrick.PoweredUp.TestScript.csproj | 16 ++++++++-------- 11 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 7f0a72c..50a5f31 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -18,11 +18,11 @@ jobs: build: runs-on: windows-latest steps: - - uses: actions/checkout@v1 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.100 + dotnet-version: 8.0.100 - name: Build SharpBrick.PoweredUp run: dotnet build --configuration Release - name: Test SharpBrick.PoweredUp @@ -43,7 +43,7 @@ jobs: verbosity: 'Info' # The verbosity level of the log messages. Values: Verbose, Info, Warning, Error, Off title: '' # Optional title. tag: '${{ github.run_number }}_${{ github.run_id }}' # Optional tag or build version. - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: artifacts path: ./artifacts \ No newline at end of file diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 8158af5..4698f2b 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -12,10 +12,10 @@ jobs: env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 steps: - - uses: actions/checkout@v1 - - uses: actions/setup-dotnet@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.100 + dotnet-version: 8.0.100 - name: Build Version # run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:11}) // deprecated run: echo "RELEASE_VERSION=$($env:GITHUB_REF.SubString(11))" >> $env:GITHUB_ENV @@ -25,7 +25,7 @@ jobs: run: dotnet test --no-build --configuration Release --logger trx - name: Pack Project run: dotnet pack --no-build --output ./artifacts --configuration Release -p:Version=$env:RELEASE_VERSION - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: artifacts path: ./artifacts @@ -37,13 +37,13 @@ jobs: DOTNET_CLI_TELEMETRY_OPTOUT: 1 NUGET_AUTH_TOKEN: ${{ secrets.NUGET_APIKEY }} steps: - - uses: actions/checkout@v1 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.100 + dotnet-version: 8.0.100 source-url: https://api.nuget.org/v3/index.json - - uses: actions/download-artifact@v1 + - uses: actions/download-artifact@v4 with: name: artifacts path: ./artifacts diff --git a/examples/SharpBrick.PoweredUp.Examples/SharpBrick.PoweredUp.Examples.csproj b/examples/SharpBrick.PoweredUp.Examples/SharpBrick.PoweredUp.Examples.csproj index 8616b93..c6460a9 100644 --- a/examples/SharpBrick.PoweredUp.Examples/SharpBrick.PoweredUp.Examples.csproj +++ b/examples/SharpBrick.PoweredUp.Examples/SharpBrick.PoweredUp.Examples.csproj @@ -2,8 +2,8 @@ Exe - net6.0-windows10.0.19041.0;net6.0 - net6.0 + net8.0-windows10.0.19041.0;net8.0 + net8.0 false @@ -11,21 +11,21 @@ - + - + - - - - - + + + + + diff --git a/src/SharpBrick.PoweredUp.BlueGigaBLE/SharpBrick.PoweredUp.BlueGigaBLE.csproj b/src/SharpBrick.PoweredUp.BlueGigaBLE/SharpBrick.PoweredUp.BlueGigaBLE.csproj index 6b40205..8b03357 100644 --- a/src/SharpBrick.PoweredUp.BlueGigaBLE/SharpBrick.PoweredUp.BlueGigaBLE.csproj +++ b/src/SharpBrick.PoweredUp.BlueGigaBLE/SharpBrick.PoweredUp.BlueGigaBLE.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true @@ -12,11 +12,11 @@ - - - - - + + + + + diff --git a/src/SharpBrick.PoweredUp.Cli/SharpBrick.PoweredUp.Cli.csproj b/src/SharpBrick.PoweredUp.Cli/SharpBrick.PoweredUp.Cli.csproj index 0343eff..4ce78ad 100644 --- a/src/SharpBrick.PoweredUp.Cli/SharpBrick.PoweredUp.Cli.csproj +++ b/src/SharpBrick.PoweredUp.Cli/SharpBrick.PoweredUp.Cli.csproj @@ -2,8 +2,8 @@ Exe - net6.0-windows10.0.19041.0;net6.0 - net6.0 + net8.0-windows10.0.19041.0;net8.0 + net8.0 true false poweredup @@ -13,21 +13,21 @@ - + - + - - - - - + + + + + diff --git a/src/SharpBrick.PoweredUp.Mobile/SharpBrick.PoweredUp.Mobile.csproj b/src/SharpBrick.PoweredUp.Mobile/SharpBrick.PoweredUp.Mobile.csproj index 57c94f9..93e4862 100644 --- a/src/SharpBrick.PoweredUp.Mobile/SharpBrick.PoweredUp.Mobile.csproj +++ b/src/SharpBrick.PoweredUp.Mobile/SharpBrick.PoweredUp.Mobile.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/SharpBrick.PoweredUp.Mobile/XamarinPoweredUpBluetoothCharacteristic.cs b/src/SharpBrick.PoweredUp.Mobile/XamarinPoweredUpBluetoothCharacteristic.cs index 7d8811b..3eb806c 100644 --- a/src/SharpBrick.PoweredUp.Mobile/XamarinPoweredUpBluetoothCharacteristic.cs +++ b/src/SharpBrick.PoweredUp.Mobile/XamarinPoweredUpBluetoothCharacteristic.cs @@ -45,7 +45,7 @@ public async Task WriteValueAsync(byte[] data) throw new ArgumentNullException(nameof(data)); } - return await _characteristic.WriteAsync(data); + return await _characteristic.WriteAsync(data) == 0; } } } diff --git a/src/SharpBrick.PoweredUp.WinRT/SharpBrick.PoweredUp.WinRT.csproj b/src/SharpBrick.PoweredUp.WinRT/SharpBrick.PoweredUp.WinRT.csproj index ab82c8e..e38d610 100644 --- a/src/SharpBrick.PoweredUp.WinRT/SharpBrick.PoweredUp.WinRT.csproj +++ b/src/SharpBrick.PoweredUp.WinRT/SharpBrick.PoweredUp.WinRT.csproj @@ -1,7 +1,7 @@ - net6.0-windows10.0.19041.0 + net8.0-windows10.0.19041.0 diff --git a/src/SharpBrick.PoweredUp/SharpBrick.PoweredUp.csproj b/src/SharpBrick.PoweredUp/SharpBrick.PoweredUp.csproj index d8d21dc..2575d66 100644 --- a/src/SharpBrick.PoweredUp/SharpBrick.PoweredUp.csproj +++ b/src/SharpBrick.PoweredUp/SharpBrick.PoweredUp.csproj @@ -1,14 +1,14 @@ - netstandard2.1;net6.0 + netstandard2.1;net8.0 10.0 - - - + + + diff --git a/test/SharpBrick.PoweredUp.Test/SharpBrick.PoweredUp.Test.csproj b/test/SharpBrick.PoweredUp.Test/SharpBrick.PoweredUp.Test.csproj index 3e83f2c..23d1160 100644 --- a/test/SharpBrick.PoweredUp.Test/SharpBrick.PoweredUp.Test.csproj +++ b/test/SharpBrick.PoweredUp.Test/SharpBrick.PoweredUp.Test.csproj @@ -1,21 +1,21 @@ - net6.0 + net8.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + + + + + diff --git a/test/SharpBrick.PoweredUp.TestScript/SharpBrick.PoweredUp.TestScript.csproj b/test/SharpBrick.PoweredUp.TestScript/SharpBrick.PoweredUp.TestScript.csproj index 4f54e91..7da95f3 100644 --- a/test/SharpBrick.PoweredUp.TestScript/SharpBrick.PoweredUp.TestScript.csproj +++ b/test/SharpBrick.PoweredUp.TestScript/SharpBrick.PoweredUp.TestScript.csproj @@ -2,8 +2,8 @@ Exe - net6.0-windows10.0.19041.0;net6.0 - net6.0 + net8.0-windows10.0.19041.0;net8.0 + net8.0 false @@ -12,20 +12,20 @@ - + - + - - - - + + + +