diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 6a6258e..ab940ad 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -16,17 +16,34 @@ jobs: outputs: nbgv: ${{ steps.nbgv.outputs.SemVer2 }} steps: + - name: Get Current Visual Studio Information + shell: bash + run: | + dotnet tool update -g dotnet-vs + echo "-- About RELEASE --" + vs where release + + - name: Update Visual Studio Latest Release + shell: bash + run: | + echo "-- Update RELEASE --" + vs update release Enterprise + vs modify release Enterprise +mobile +desktop +uwp +web + echo "-- About RELEASE Updated --" + vs where release + - name: Checkout uses: actions/checkout@v3.2.0 with: fetch-depth: 0 lfs: true - - name: Install .NET 6 + - name: Install .NET 6 & 7 uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x - dotnet-quality: 'preview' + dotnet-version: | + 6.0.x + 7.0.x - name: NBGV id: nbgv @@ -43,14 +60,13 @@ jobs: working-directory: src - name: Run Unit Tests and Generate Coverage - uses: glennawatson/coverlet-msbuild@v2 + uses: glennawatson/coverlet-msbuild@v2.1 with: project-files: '**/*Tests*.csproj' no-build: true exclude-filter: '[${{env.productNamespacePrefix}}.*.Tests.*]*' include-filter: '[${{env.productNamespacePrefix}}*]*' output-format: cobertura - output: '../../artifacts/' configuration: ${{ env.configuration }} - name: Pack @@ -58,12 +74,7 @@ jobs: working-directory: src - name: Upload Code Coverage - shell: bash - run: | - echo $PWD - bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy -t ${{ env.CODECOV_TOKEN }} -s '$PWD/artifacts' -f '*.xml' - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + uses: codecov/codecov-action@v3 - name: Create NuGet Artifacts uses: actions/upload-artifact@master diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33d37ed..09f282c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,17 +16,34 @@ jobs: outputs: nbgv: ${{ steps.nbgv.outputs.SemVer2 }} steps: + - name: Get Current Visual Studio Information + shell: bash + run: | + dotnet tool update -g dotnet-vs + echo "-- About RELEASE --" + vs where release + + - name: Update Visual Studio Latest Release + shell: bash + run: | + echo "-- Update RELEASE --" + vs update release Enterprise + vs modify release Enterprise +mobile +desktop +uwp +web + echo "-- About RELEASE Updated --" + vs where release + - name: Checkout uses: actions/checkout@v3.2.0 with: fetch-depth: 0 lfs: true - - - name: Install .NET 6 + + - name: Install .NET 6 & 7 uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x - dotnet-quality: 'preview' + dotnet-version: | + 6.0.x + 7.0.x - name: NBGV id: nbgv diff --git a/src/ReactiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj b/src/ReactiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj index aa8e1ba..a453fc0 100644 --- a/src/ReactiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj +++ b/src/ReactiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 enable preview diff --git a/src/ReactiveMarbles.CacheDatabase.Core/ReactiveMarbles.CacheDatabase.Core.csproj b/src/ReactiveMarbles.CacheDatabase.Core/ReactiveMarbles.CacheDatabase.Core.csproj index 1b73241..da6c90f 100644 --- a/src/ReactiveMarbles.CacheDatabase.Core/ReactiveMarbles.CacheDatabase.Core.csproj +++ b/src/ReactiveMarbles.CacheDatabase.Core/ReactiveMarbles.CacheDatabase.Core.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 enable preview diff --git a/src/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests.csproj b/src/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests.csproj index e102a14..a87c7f0 100644 --- a/src/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests.csproj +++ b/src/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/ReactiveMarbles.CacheDatabase.EncryptedSettings/ReactiveMarbles.CacheDatabase.EncryptedSettings.csproj b/src/ReactiveMarbles.CacheDatabase.EncryptedSettings/ReactiveMarbles.CacheDatabase.EncryptedSettings.csproj index 980b153..f5bc0f3 100644 --- a/src/ReactiveMarbles.CacheDatabase.EncryptedSettings/ReactiveMarbles.CacheDatabase.EncryptedSettings.csproj +++ b/src/ReactiveMarbles.CacheDatabase.EncryptedSettings/ReactiveMarbles.CacheDatabase.EncryptedSettings.csproj @@ -1,7 +1,7 @@  - net6.0;netstandard2.0 + netstandard2.0;net6.0;net7.0 enable enable ReactiveMarbles.CacheDatabase.EncryptedSettings diff --git a/src/ReactiveMarbles.CacheDatabase.EncryptedSqlite3/ReactiveMarbles.CacheDatabase.EncryptedSqlite3.csproj b/src/ReactiveMarbles.CacheDatabase.EncryptedSqlite3/ReactiveMarbles.CacheDatabase.EncryptedSqlite3.csproj index 986dd5e..8b46cac 100644 --- a/src/ReactiveMarbles.CacheDatabase.EncryptedSqlite3/ReactiveMarbles.CacheDatabase.EncryptedSqlite3.csproj +++ b/src/ReactiveMarbles.CacheDatabase.EncryptedSqlite3/ReactiveMarbles.CacheDatabase.EncryptedSqlite3.csproj @@ -1,15 +1,15 @@  - netstandard2.0;net6.0;net48 + netstandard2.0;net6.0;net7.0 enable preview $(DefineConstants);ENCRYPTED - - + + diff --git a/src/ReactiveMarbles.CacheDatabase.NewtonsoftJson/ReactiveMarbles.CacheDatabase.NewtonsoftJson.csproj b/src/ReactiveMarbles.CacheDatabase.NewtonsoftJson/ReactiveMarbles.CacheDatabase.NewtonsoftJson.csproj index 131b360..788c238 100644 --- a/src/ReactiveMarbles.CacheDatabase.NewtonsoftJson/ReactiveMarbles.CacheDatabase.NewtonsoftJson.csproj +++ b/src/ReactiveMarbles.CacheDatabase.NewtonsoftJson/ReactiveMarbles.CacheDatabase.NewtonsoftJson.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 enable preview diff --git a/src/ReactiveMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj b/src/ReactiveMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj index cacbbbd..12f33a2 100644 --- a/src/ReactiveMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj +++ b/src/ReactiveMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/ReactiveMarbles.CacheDatabase.Settings/ReactiveMarbles.CacheDatabase.Settings.csproj b/src/ReactiveMarbles.CacheDatabase.Settings/ReactiveMarbles.CacheDatabase.Settings.csproj index ce07cf1..f4cff62 100644 --- a/src/ReactiveMarbles.CacheDatabase.Settings/ReactiveMarbles.CacheDatabase.Settings.csproj +++ b/src/ReactiveMarbles.CacheDatabase.Settings/ReactiveMarbles.CacheDatabase.Settings.csproj @@ -1,7 +1,7 @@  - net6.0;netstandard2.0 + netstandard2.0;net6.0;net7.0 enable enable ReactiveMarbles.CacheDatabase.Settings diff --git a/src/ReactiveMarbles.CacheDatabase.Sqlite3/ReactiveMarbles.CacheDatabase.Sqlite3.csproj b/src/ReactiveMarbles.CacheDatabase.Sqlite3/ReactiveMarbles.CacheDatabase.Sqlite3.csproj index 84304d9..f7f5fde 100644 --- a/src/ReactiveMarbles.CacheDatabase.Sqlite3/ReactiveMarbles.CacheDatabase.Sqlite3.csproj +++ b/src/ReactiveMarbles.CacheDatabase.Sqlite3/ReactiveMarbles.CacheDatabase.Sqlite3.csproj @@ -1,14 +1,14 @@  - netstandard2.0;net6.0;net48 + netstandard2.0;net6.0;net7.0 enable preview - - + + diff --git a/src/ReactiveMarbles.CacheDatabase.Tests/ReactiveMarbles.CacheDatabase.Tests.csproj b/src/ReactiveMarbles.CacheDatabase.Tests/ReactiveMarbles.CacheDatabase.Tests.csproj index b625d50..18286f6 100644 --- a/src/ReactiveMarbles.CacheDatabase.Tests/ReactiveMarbles.CacheDatabase.Tests.csproj +++ b/src/ReactiveMarbles.CacheDatabase.Tests/ReactiveMarbles.CacheDatabase.Tests.csproj @@ -1,16 +1,17 @@  - net6.0 + net6.0;net7.0 preview false - win-x64 - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/version.json b/version.json index c585f2b..a0ef1aa 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "1.1", + "version": "1.2", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/main$"