From f584a8d91f043b8210e63fddf567f1c58a412807 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Aug 2021 10:28:47 +0100 Subject: [PATCH 01/66] build(deps): bump ReactiveUI from 14.3.10 to 15.1.1 in /src (#758) Bumps [ReactiveUI](https://github.com/reactiveui/reactiveui) from 14.3.10 to 15.1.1. - [Release notes](https://github.com/reactiveui/reactiveui/releases) - [Commits](https://github.com/reactiveui/reactiveui/compare/14.3.10...15.1.1) --- updated-dependencies: - dependency-name: ReactiveUI dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index fd734ba59..f7405e060 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -43,7 +43,7 @@ - + From bf779a85cae04e6af201ea49d165ead608efe3b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Aug 2021 01:19:37 +0100 Subject: [PATCH 02/66] build(deps): bump FluentAssertions from 6.0.0 to 6.1.0 in /src (#760) Bumps [FluentAssertions](https://github.com/fluentassertions/fluentassertions) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/fluentassertions/fluentassertions/releases) - [Changelog](https://github.com/fluentassertions/fluentassertions/blob/master/AcceptApiChanges.ps1) - [Commits](https://github.com/fluentassertions/fluentassertions/compare/6.0.0...6.1.0) --- updated-dependencies: - dependency-name: FluentAssertions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index fdb8c83c9..a4ea31717 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -38,7 +38,7 @@ - + From 60d8d837bfc1834e5a581ace55ebbe68636936c2 Mon Sep 17 00:00:00 2001 From: Chris Pulman Date: Fri, 3 Sep 2021 00:33:36 +0100 Subject: [PATCH 03/66] fix build and test (#762) --- .../NinjectReactiveUIDependencyTests.cs | 3 --- .../ReactiveUI.DI.Tests.csproj | 15 ++++++--------- .../RaygunFeatureUsageTrackingSession.cs | 6 +++--- src/Splat.Raygun/Splat.Raygun.csproj | 8 ++++---- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/ReactiveUI.DI.Tests/NinjectReactiveUIDependencyTests.cs b/src/ReactiveUI.DI.Tests/NinjectReactiveUIDependencyTests.cs index 363157c41..b1abee4aa 100644 --- a/src/ReactiveUI.DI.Tests/NinjectReactiveUIDependencyTests.cs +++ b/src/ReactiveUI.DI.Tests/NinjectReactiveUIDependencyTests.cs @@ -3,13 +3,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. -using System.Collections.Generic; using System.Linq; -using Autofac; using FluentAssertions; using Ninject; using Splat; -using Splat.Autofac; using Splat.Ninject; using Xunit; diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index f7405e060..5f956d81d 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -1,4 +1,4 @@ - + net462;net472;netcoreapp3;net5.0; @@ -14,6 +14,7 @@ + @@ -22,6 +23,7 @@ + @@ -30,6 +32,7 @@ + @@ -38,19 +41,13 @@ + - - - - - - - - + diff --git a/src/Splat.Raygun/RaygunFeatureUsageTrackingSession.cs b/src/Splat.Raygun/RaygunFeatureUsageTrackingSession.cs index 8153a8806..8b523c6f8 100644 --- a/src/Splat.Raygun/RaygunFeatureUsageTrackingSession.cs +++ b/src/Splat.Raygun/RaygunFeatureUsageTrackingSession.cs @@ -66,10 +66,10 @@ internal RaygunFeatureUsageTrackingSession( // keep an eye on // https://raygun.com/forums/thread/92182 -#if NETSTANDARD2_0 || NET5_0 || NET6_0 - var messageBuilder = RaygunMessageBuilder.New(raygunSettings) -#else +#if NET461 var messageBuilder = RaygunMessageBuilder.New +#else + var messageBuilder = RaygunMessageBuilder.New(raygunSettings) #endif .SetClientDetails() .SetEnvironmentDetails() diff --git a/src/Splat.Raygun/Splat.Raygun.csproj b/src/Splat.Raygun/Splat.Raygun.csproj index dff04d59e..32d892658 100644 --- a/src/Splat.Raygun/Splat.Raygun.csproj +++ b/src/Splat.Raygun/Splat.Raygun.csproj @@ -11,21 +11,21 @@ latest enable - + - + - + - + From 04b81dab3b7310a517c18d298e76db7ad90504ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Sep 2021 12:56:11 +1000 Subject: [PATCH 04/66] build(deps): bump DiffEngine from 7.1.0 to 7.2.1 in /src (#763) Bumps [DiffEngine](https://github.com/VerifyTests/DiffEngine) from 7.1.0 to 7.2.1. - [Release notes](https://github.com/VerifyTests/DiffEngine/releases) - [Commits](https://github.com/VerifyTests/DiffEngine/commits) --- updated-dependencies: - dependency-name: DiffEngine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index a4ea31717..5451c4ccb 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -41,7 +41,7 @@ - + From 8198aa07d663bda60e3436aaaa2b197890d0cc4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Sep 2021 12:56:24 +1000 Subject: [PATCH 05/66] build(deps): bump ReactiveUI from 16.2.1 to 16.2.6 in /src (#765) Bumps [ReactiveUI](https://github.com/reactiveui/reactiveui) from 16.2.1 to 16.2.6. - [Release notes](https://github.com/reactiveui/reactiveui/releases) - [Commits](https://github.com/reactiveui/reactiveui/compare/16.2.1...16.2.6) --- updated-dependencies: - dependency-name: ReactiveUI dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index 5f956d81d..e8c86ebc4 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -47,7 +47,7 @@ - + From c10cd638942e1973e53979386510fe73bc246044 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Sep 2021 12:56:35 +1000 Subject: [PATCH 06/66] build(deps): bump MSBuild.Sdk.Extras from 3.0.23 to 3.0.38 in /src (#764) Bumps [MSBuild.Sdk.Extras](https://github.com/novotnyllc/MSBuildSdkExtras) from 3.0.23 to 3.0.38. - [Release notes](https://github.com/novotnyllc/MSBuildSdkExtras/releases) - [Commits](https://github.com/novotnyllc/MSBuildSdkExtras/compare/v3.0.23...v3.0.38) --- updated-dependencies: - dependency-name: MSBuild.Sdk.Extras dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/global.json b/src/global.json index 400471d45..679841e9c 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "MSBuild.Sdk.Extras": "3.0.23" + "MSBuild.Sdk.Extras": "3.0.38" } } From af60edfb700a7d0a094d9a58a1895966febc3c40 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Tue, 14 Sep 2021 12:57:39 +1000 Subject: [PATCH 07/66] housekeeping: Also update github actions --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9f5844f4e..762879abd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,3 +6,8 @@ updates: interval: daily time: "00:00" open-pull-requests-limit: 10 +- package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "daily" From d46f82be8d8cd2f6ff7d5095a991cad8f649ca51 Mon Sep 17 00:00:00 2001 From: Chris Pulman Date: Mon, 13 Sep 2021 20:10:52 -0700 Subject: [PATCH 08/66] housekeeping fix build stop Visual studio restarting (#766) * fix build and test * update builds to use 2022 * Delete codeql-analysis.yml Co-authored-by: Glenn <5834289+glennawatson@users.noreply.github.com> --- .github/workflows/ci-build.yml | 28 ++++-- .github/workflows/codeql-analysis.yml | 126 -------------------------- 2 files changed, 20 insertions(+), 134 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 71585d5b4..3035a44ba 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -13,10 +13,29 @@ env: jobs: build: - runs-on: windows-latest + runs-on: windows-2022 outputs: nbgv: ${{ steps.nbgv.outputs.SemVer2 }} steps: + - name: Update VS2022 preview + shell: bash + run: | + dotnet tool update -g dotnet-vs + vs modify preview +mobile +xamarin +core +desktop +uwp +web + echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" + + - name: Install Windows SDK 10.0.16299 + shell: pwsh + run: | + Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe + $startInfo = New-Object System.Diagnostics.ProcessStartInfo + $startInfo.FileName = "winsdk.exe" + $startInfo.Arguments = "/norestart /quiet" + $process = New-Object System.Diagnostics.Process + $process.StartInfo = $startInfo + $process.Start() + $process.WaitForExit() + - name: Checkout uses: actions/checkout@v2 with: @@ -47,13 +66,6 @@ jobs: dotnet workload install macos dotnet workload install maui - - name: Install VS2019 preview - shell: bash - run: | - dotnet tool update -g dotnet-vs - vs install preview -sku:enterprise --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.NetCrossPlat +Microsoft.VisualStudio.Workload.Universal - echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - - name: Add MSBuild to PATH uses: glennawatson/setup-msbuild@v1.0.3 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 11452443c..000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,126 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# ******** NOTE ******** - -name: "CodeQL" - -on: - push: - branches: [ main ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ main ] - schedule: - - cron: '32 1 * * 0' - -jobs: - analyze: - name: Analyze - runs-on: windows-latest - outputs: - nbgv: ${{ steps.nbgv.outputs.SemVer2 }} - env: - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 - DOTNET_NOLOGO: true - DOTNET_GENERATE_ASPNET_CERTIFICATE: false - SOLUTION_PATH: src\\Splat.sln - - strategy: - fail-fast: false - matrix: - language: [ 'csharp' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more... - # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - - - name: Install .NET Core - uses: actions/setup-dotnet@v1.8.1 - with: - dotnet-version: 3.1.x - - - name: Install .NET 5 - uses: actions/setup-dotnet@v1.8.1 - with: - dotnet-version: 5.0.x - - - name: Install .NET 6 - uses: actions/setup-dotnet@v1.8.1 - with: - dotnet-version: 6.0.x - include-prerelease: true - - - name: Install DotNet workloads - shell: bash - run: | - dotnet workload install android - dotnet workload install ios - dotnet workload install tvos - dotnet workload install macos - dotnet workload install maui - - - name: Install VS2019 preview - shell: bash - run: | - dotnet tool update -g dotnet-vs - vs install preview -sku:enterprise --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.NetCrossPlat +Microsoft.VisualStudio.Workload.Universal - echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - - - name: Add MSBuild to PATH - uses: glennawatson/setup-msbuild@v1.0.3 - with: - prerelease: true - - - name: NBGV - id: nbgv - uses: dotnet/nbgv@master - with: - setAllVars: true - - - name: Restore Packages - run: | - dotnet restore ${{ env.SOLUTION_PATH }} /bl:artifacts\\binlog\\restore.binlog - - - name: Run Build - run: msbuild /t:build /nowarn:MSB4011 /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=Release /p:UseSharedCompilation=false - working-directory: src - - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 From d20f9b8f4443aa34aeacd2ac2d365464321002fb Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Tue, 14 Sep 2021 14:27:31 +1000 Subject: [PATCH 09/66] housekeeping: Use environment for releases (#768) --- .github/workflows/ci-build.yml | 55 +-------------- .github/workflows/release.yml | 120 +++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 3035a44ba..1d6f248c4 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -4,7 +4,6 @@ on: push: branches: [ main ] pull_request: - types: [opened, synchronize, reopened, closed] branches: [ main ] env: @@ -34,7 +33,7 @@ jobs: $process = New-Object System.Diagnostics.Process $process.StartInfo = $startInfo $process.Start() - $process.WaitForExit() + $process.WaitForExit() - name: Checkout uses: actions/checkout@v2 @@ -109,55 +108,3 @@ jobs: with: name: nuget path: '**/*.nupkg' - - release: - runs-on: ubuntu-latest - needs: build - if: contains(github.event.pull_request.labels.*.name, 'release') && github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Download NuGet Packages - uses: actions/download-artifact@v2 - with: - name: nuget - - - name: Save SignClient Configuration - run: 'echo "$SIGN_CLIENT_CONFIG" > SignPackages.json' - shell: bash - env: - SIGN_CLIENT_CONFIG: ${{secrets.SIGN_CLIENT_CONFIG}} - - - name: Sign NuGet Packages - uses: glennawatson/signclient@v1 - with: - input-files: '**/*.nupkg' - sign-client-secret: ${{ secrets.SIGN_CLIENT_SECRET }} - sign-client-user: ${{ secrets.SIGN_CLIENT_USER_ID }} - project-name: reactiveui - description: reactiveui - config-file: SignPackages.json - - - name: Changelog - uses: glennawatson/ChangeLog@v1 - id: changelog - - - name: Create Release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: ${{ needs.build.outputs.nbgv }} - release_name: ${{ needs.build.outputs.nbgv }} - body: | - ${{ steps.changelog.outputs.commitLog }} - - - name: NuGet Push - env: - NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} - SOURCE_URL: https://api.nuget.org/v3/index.json - run: | - dotnet nuget push -s ${{ env.SOURCE_URL }} -k ${{ env.NUGET_AUTH_TOKEN }} **/*.nupkg diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..2b3befd55 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,120 @@ +name: Build and Release + +on: + push: + branches: [ main ] + +env: + configuration: Release + productNamespacePrefix: "Splat" + +jobs: + release: + runs-on: windows-2022 + environment: + name: release + steps: + - name: Update VS2022 preview + shell: bash + run: | + dotnet tool update -g dotnet-vs + vs modify preview +mobile +xamarin +core +desktop +uwp +web + echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" + + - name: Install Windows SDK 10.0.16299 + shell: pwsh + run: | + Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe + $startInfo = New-Object System.Diagnostics.ProcessStartInfo + $startInfo.FileName = "winsdk.exe" + $startInfo.Arguments = "/norestart /quiet" + $process = New-Object System.Diagnostics.Process + $process.StartInfo = $startInfo + $process.Start() + $process.WaitForExit() + + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Install .NET Core + uses: actions/setup-dotnet@v1.8.1 + with: + dotnet-version: 3.1.x + + - name: Install .NET 5 + uses: actions/setup-dotnet@v1.8.1 + with: + dotnet-version: 5.0.x + + - name: Install .NET 6 + uses: actions/setup-dotnet@v1.8.1 + with: + dotnet-version: 6.0.x + include-prerelease: true + + - name: Install DotNet workloads + shell: bash + run: | + dotnet workload install android + dotnet workload install ios + dotnet workload install tvos + dotnet workload install macos + dotnet workload install maui + + - name: Add MSBuild to PATH + uses: glennawatson/setup-msbuild@v1.0.3 + with: + prerelease: true + + - name: NBGV + id: nbgv + uses: dotnet/nbgv@master + with: + setAllVars: true + + - name: NuGet Restore + run: dotnet restore + working-directory: src + + - name: Build + run: msbuild /t:build,pack /nowarn:MSB4011 /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }} + working-directory: src + + - name: Save SignClient Configuration + run: 'echo "$SIGN_CLIENT_CONFIG" > SignPackages.json' + shell: bash + env: + SIGN_CLIENT_CONFIG: ${{secrets.SIGN_CLIENT_CONFIG}} + + - name: Sign NuGet Packages + uses: glennawatson/signclient@v1 + with: + input-files: '**/*.nupkg' + sign-client-secret: ${{ secrets.SIGN_CLIENT_SECRET }} + sign-client-user: ${{ secrets.SIGN_CLIENT_USER_ID }} + project-name: reactiveui + description: reactiveui + config-file: SignPackages.json + + - name: Changelog + uses: glennawatson/ChangeLog@v1 + id: changelog + + - name: Create Release + uses: actions/create-release@v1.1.4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token + with: + tag_name: ${{ steps.nbgv.outputs.SemVer2 }} + release_name: ${{ steps.nbgv.outputs.SemVer2 }} + body: | + ${{ steps.changelog.outputs.commitLog }} + + - name: NuGet Push + env: + NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} + SOURCE_URL: https://api.nuget.org/v3/index.json + run: | + dotnet nuget push -s ${{ env.SOURCE_URL }} -k ${{ env.NUGET_AUTH_TOKEN }} **/*.nupkg From 0184acb90ac193ed9e4c7c66ebbcec5f9cc7032e Mon Sep 17 00:00:00 2001 From: Chris Pulman Date: Mon, 13 Sep 2021 21:54:00 -0700 Subject: [PATCH 10/66] housekeeping Use net6 SDK and code analysis (#767) --- .github/workflows/ci-build.yml | 2 +- .github/workflows/release.yml | 2 +- src/Directory.build.props | 1 - src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj | 4 ++-- src/global.json | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 1d6f248c4..d76df8046 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -20,7 +20,7 @@ jobs: shell: bash run: | dotnet tool update -g dotnet-vs - vs modify preview +mobile +xamarin +core +desktop +uwp +web + vs modify preview +mobile +desktop +uwp +web echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - name: Install Windows SDK 10.0.16299 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b3befd55..64ae20c88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: shell: bash run: | dotnet tool update -g dotnet-vs - vs modify preview +mobile +xamarin +core +desktop +uwp +web + vs modify preview +mobile +desktop +uwp +web echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - name: Install Windows SDK 10.0.16299 diff --git a/src/Directory.build.props b/src/Directory.build.props index 5451c4ccb..0d6265e2a 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -69,7 +69,6 @@ - diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index e8c86ebc4..d76452271 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -1,7 +1,7 @@ - net462;net472;netcoreapp3;net5.0; + net462;net472;netcoreapp3.1;net5.0; $(NoWarn);1591;CA1707;SA1633;CA2000 false latest @@ -26,7 +26,7 @@ - + diff --git a/src/global.json b/src/global.json index 679841e9c..12d3fca0a 100644 --- a/src/global.json +++ b/src/global.json @@ -1,3 +1,4 @@ + { "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.38" From 066e6397f846612a5d1f21941e15df73605fd309 Mon Sep 17 00:00:00 2001 From: David Vreony Date: Fri, 24 Sep 2021 20:48:36 +0100 Subject: [PATCH 11/66] add maui check (#776) this is to try resolve the openjdk build failure --- .github/workflows/ci-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d76df8046..95e6a1fa8 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -64,6 +64,8 @@ jobs: dotnet workload install tvos dotnet workload install macos dotnet workload install maui + dotnet tool install -g Redth.Net.Maui.Check + maui-check --non-interactive --fix - name: Add MSBuild to PATH uses: glennawatson/setup-msbuild@v1.0.3 From 996c418f8d5ca126774563f3b632de118f96116f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 20:06:31 +0000 Subject: [PATCH 12/66] build(deps): bump actions/setup-dotnet from 1.8.1 to 1.8.2 (#770) Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 1.8.1 to 1.8.2. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v1.8.1...v1.8.2) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 95e6a1fa8..3ff5413d6 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -41,17 +41,17 @@ jobs: fetch-depth: 0 - name: Install .NET Core - uses: actions/setup-dotnet@v1.8.1 + uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 3.1.x - name: Install .NET 5 - uses: actions/setup-dotnet@v1.8.1 + uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 5.0.x - name: Install .NET 6 - uses: actions/setup-dotnet@v1.8.1 + uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 6.0.x include-prerelease: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 64ae20c88..15a0451e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,17 +39,17 @@ jobs: fetch-depth: 0 - name: Install .NET Core - uses: actions/setup-dotnet@v1.8.1 + uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 3.1.x - name: Install .NET 5 - uses: actions/setup-dotnet@v1.8.1 + uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 5.0.x - name: Install .NET 6 - uses: actions/setup-dotnet@v1.8.1 + uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 6.0.x include-prerelease: true From d1d322bc6d3ca616bc1027b02aec801db249a81a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 21:37:06 +0100 Subject: [PATCH 13/66] build(deps): bump DiffEngine from 7.2.1 to 7.3.0 in /src (#775) Bumps [DiffEngine](https://github.com/VerifyTests/DiffEngine) from 7.2.1 to 7.3.0. - [Release notes](https://github.com/VerifyTests/DiffEngine/releases) - [Commits](https://github.com/VerifyTests/DiffEngine/commits/7.3.0) --- updated-dependencies: - dependency-name: DiffEngine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 0d6265e2a..c9bd3132a 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -41,7 +41,7 @@ - + From 7623e77791da3d0f8346aa3e61702ea8aec3171b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Sep 2021 08:20:12 +1000 Subject: [PATCH 14/66] build(deps): bump Nerdbank.GitVersioning from 3.4.231 to 3.4.240 in /src (#774) Bumps [Nerdbank.GitVersioning](https://github.com/dotnet/Nerdbank.GitVersioning) from 3.4.231 to 3.4.240. - [Release notes](https://github.com/dotnet/Nerdbank.GitVersioning/releases) - [Commits](https://github.com/dotnet/Nerdbank.GitVersioning/compare/v3.4.231...v3.4.240) --- updated-dependencies: - dependency-name: Nerdbank.GitVersioning dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index c9bd3132a..60c4e71cb 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -63,7 +63,7 @@ - + From cd2cbb807b36dd89b6505e3e699d0784aaf7d976 Mon Sep 17 00:00:00 2001 From: Claire Novotny <1427284+clairernovotny@users.noreply.github.com> Date: Wed, 29 Sep 2021 15:52:13 -0500 Subject: [PATCH 15/66] Add support for reproducible builds (#778) * Add support for reproducible builds * Only put it on non-test projects --- src/Directory.build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 60c4e71cb..c9e773210 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + From a502b596d4c4a45a75a613594866d87680991a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=C3=AFs=20Betts?= Date: Wed, 29 Sep 2021 22:28:04 -0700 Subject: [PATCH 16/66] Revert "Add support for reproducible builds (#778)" (#779) This reverts commit cd2cbb807b36dd89b6505e3e699d0784aaf7d976. --- src/Directory.build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index c9e773210..60c4e71cb 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + From fc5506f943114eb4415d041c3ba4c01f6c8f50e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 17:54:35 +0100 Subject: [PATCH 17/66] build(deps): bump DiffEngine from 7.3.0 to 8.0.0 in /src (#777) Bumps [DiffEngine](https://github.com/VerifyTests/DiffEngine) from 7.3.0 to 8.0.0. - [Release notes](https://github.com/VerifyTests/DiffEngine/releases) - [Commits](https://github.com/VerifyTests/DiffEngine/compare/7.3.0...8.0.0) --- updated-dependencies: - dependency-name: DiffEngine dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 60c4e71cb..e8ad70f5c 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -41,7 +41,7 @@ - + From b88147a988a0c27d1e45958dbded75417826173f Mon Sep 17 00:00:00 2001 From: David Vreony Date: Thu, 30 Sep 2021 18:21:59 +0100 Subject: [PATCH 18/66] housekeeping: Contributing documentation branch conventions updated (#782) * #780 update branches names in splat contributing removed references to master and develop * #780 removed a reference to develop branch --- CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d91ed16b8..f75670c39 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,7 +63,7 @@ Before you submit your pull request consider the following guidelines: * Make your changes in a new git branch: ```shell - git checkout -b my-fix-branch develop + git checkout -b my-fix-branch main ``` * Create your patch, **including appropriate test cases**. @@ -89,7 +89,7 @@ Before you submit your pull request consider the following guidelines: git push origin my-fix-branch ``` -In GitHub, send a pull request to `splat:develop`. +In GitHub, send a pull request to `splat:main`. If we suggest changes, then: @@ -101,7 +101,7 @@ If we suggest changes, then: If the PR gets too outdated we may ask you to rebase and force push to update the PR: ```shell -git rebase master -i +git rebase main -i git push origin my-fix-branch -f ``` @@ -122,10 +122,10 @@ from the main (upstream) repository: git push origin --delete my-fix-branch ``` -* Check out the master branch: +* Check out the main branch: ```shell - git checkout master -f + git checkout main -f ``` * Delete the local branch: @@ -134,10 +134,10 @@ from the main (upstream) repository: git branch -D my-fix-branch ``` -* Update your master with the latest upstream version: +* Update your main with the latest upstream version: ```shell - git pull --ff upstream master + git pull --ff upstream main ``` ## Coding Rules From beccc781d1031d061a44f06f63fd948143b1b2bb Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 1 Oct 2021 13:04:14 +1000 Subject: [PATCH 19/66] housekeeping: Enable deterministic builds (#783) --- src/Directory.build.props | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Directory.build.props b/src/Directory.build.props index e8ad70f5c..a6f72d80e 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -11,11 +11,14 @@ https://github.com/reactiveui/splat/ https://github.com/reactiveui/styleguide/blob/master/logo_splat/logo.png?raw=true A library to make things cross-platform that should be. + true xanaisbettsx;ghuntley drawing;colours;geometry;logging;unit test detection;service location;image handling;portable;xamarin;xamarin ios;xamarin mac;android;monodroid;uwp;net45 https://github.com/reactiveui/splat/releases https://github.com/reactiveui/splat git + true + true nullable @@ -34,6 +37,10 @@ Full + + true + + From 5e82105a053112869f4380c5700d7e152ae39984 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Fri, 1 Oct 2021 13:32:39 +1000 Subject: [PATCH 20/66] housekeeping: move to using Verify (#781) * move to using Verify * use scrubbing * rename snapshots * rename snapshots * apply verify to drawing api test * fix method name * Update Splat.Drawing.csproj * remove regex --- src/Directory.build.props | 2 +- ...ApprovalTests.SplatUIProject..approved.txt | 449 ------------------ ...Tests.SplatUIProject.Core3_1.verified.txt} | 0 ...sts.SplatUIProject.DotNet5_0.verified.txt} | 0 .../API/ApiApprovalTests.cs | 10 +- ...alTests.SplatProject.Core3_1.verified.txt} | 2 +- ...Tests.SplatProject.DotNet5_0.verified.txt} | 2 +- ...Tests.SplatProject.DotNet6_0.verified.txt} | 0 src/Splat.Tests/API/ApiApprovalTests.cs | 9 +- src/Splat.Tests/ApiExtensions.cs | 65 +-- 10 files changed, 26 insertions(+), 513 deletions(-) delete mode 100644 src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject..approved.txt rename src/Splat.Drawing.Tests/API/{ApiApprovalTests.SplatUIProject.netcoreapp3.1.approved.txt => ApiApprovalTests.SplatUIProject.Core3_1.verified.txt} (100%) rename src/Splat.Drawing.Tests/API/{ApiApprovalTests.SplatUIProject.net5.0.approved.txt => ApiApprovalTests.SplatUIProject.DotNet5_0.verified.txt} (100%) rename src/Splat.Tests/API/{ApiApprovalTests.SplatProject.netcoreapp3.1.approved.txt => ApiApprovalTests.SplatProject.Core3_1.verified.txt} (99%) rename src/Splat.Tests/API/{ApiApprovalTests.SplatProject.net5.0.approved.txt => ApiApprovalTests.SplatProject.DotNet5_0.verified.txt} (99%) rename src/Splat.Tests/API/{ApiApprovalTests.SplatProject..approved.txt => ApiApprovalTests.SplatProject.DotNet6_0.verified.txt} (100%) diff --git a/src/Directory.build.props b/src/Directory.build.props index a6f72d80e..b7271bb63 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + diff --git a/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject..approved.txt b/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject..approved.txt deleted file mode 100644 index ff4c5127a..000000000 --- a/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject..approved.txt +++ /dev/null @@ -1,449 +0,0 @@ -[assembly: System.Resources.NeutralResourcesLanguage("en-US")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")] -[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows7.0")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v5.0", FrameworkDisplayName="")] -[assembly: System.Runtime.Versioning.TargetPlatform("Windows7.0")] -namespace Splat -{ - public static class BitmapLoader - { - public static Splat.IBitmapLoader Current { get; set; } - } - [System.Serializable] - public class BitmapLoaderException : System.Exception - { - public BitmapLoaderException() { } - public BitmapLoaderException(string message) { } - protected BitmapLoaderException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } - public BitmapLoaderException(string message, System.Exception innerException) { } - } - public static class BitmapMixins - { - public static Splat.IBitmap FromNative(this System.Windows.Media.Imaging.BitmapSource value) { } - public static System.Windows.Media.Imaging.BitmapSource ToNative(this Splat.IBitmap value) { } - } - public static class ColorExtensions - { - public static System.Drawing.Color FromNative(this System.Windows.Media.Color value) { } - public static System.Windows.Media.Color ToNative(this System.Drawing.Color value) { } - public static System.Windows.Media.SolidColorBrush ToNativeBrush(this System.Drawing.Color value) { } - } - public enum CompressedBitmapFormat - { - Png = 0, - Jpeg = 1, - } - public class DefaultPlatformModeDetector : Splat.IPlatformModeDetector - { - public DefaultPlatformModeDetector() { } - public bool? InDesignMode() { } - } - public interface IBitmap : System.IDisposable - { - float Height { get; } - float Width { get; } - System.Threading.Tasks.Task Save(Splat.CompressedBitmapFormat format, float quality, System.IO.Stream target); - } - public interface IBitmapLoader - { - Splat.IBitmap Create(float width, float height); - System.Threading.Tasks.Task Load(System.IO.Stream sourceStream, float? desiredWidth, float? desiredHeight); - System.Threading.Tasks.Task LoadFromResource(string source, float? desiredWidth, float? desiredHeight); - } - public interface IPlatformModeDetector - { - bool? InDesignMode(); - } - public enum KnownColor - { - ActiveBorder = 1, - ActiveCaption = 2, - ActiveCaptionText = 3, - AppWorkspace = 4, - Control = 5, - ControlDark = 6, - ControlDarkDark = 7, - ControlLight = 8, - ControlLightLight = 9, - ControlText = 10, - Desktop = 11, - GrayText = 12, - Highlight = 13, - HighlightText = 14, - HotTrack = 15, - InactiveBorder = 16, - InactiveCaption = 17, - InactiveCaptionText = 18, - Info = 19, - InfoText = 20, - Menu = 21, - MenuText = 22, - ScrollBar = 23, - Window = 24, - WindowFrame = 25, - WindowText = 26, - Transparent = 27, - AliceBlue = 28, - AntiqueWhite = 29, - Aqua = 30, - Aquamarine = 31, - Azure = 32, - Beige = 33, - Bisque = 34, - Black = 35, - BlanchedAlmond = 36, - Blue = 37, - BlueViolet = 38, - Brown = 39, - BurlyWood = 40, - CadetBlue = 41, - Chartreuse = 42, - Chocolate = 43, - Coral = 44, - CornflowerBlue = 45, - Cornsilk = 46, - Crimson = 47, - Cyan = 48, - DarkBlue = 49, - DarkCyan = 50, - DarkGoldenrod = 51, - DarkGray = 52, - DarkGreen = 53, - DarkKhaki = 54, - DarkMagenta = 55, - DarkOliveGreen = 56, - DarkOrange = 57, - DarkOrchid = 58, - DarkRed = 59, - DarkSalmon = 60, - DarkSeaGreen = 61, - DarkSlateBlue = 62, - DarkSlateGray = 63, - DarkTurquoise = 64, - DarkViolet = 65, - DeepPink = 66, - DeepSkyBlue = 67, - DimGray = 68, - DodgerBlue = 69, - Firebrick = 70, - FloralWhite = 71, - ForestGreen = 72, - Fuchsia = 73, - Gainsboro = 74, - GhostWhite = 75, - Gold = 76, - Goldenrod = 77, - Gray = 78, - Green = 79, - GreenYellow = 80, - Honeydew = 81, - HotPink = 82, - IndianRed = 83, - Indigo = 84, - Ivory = 85, - Khaki = 86, - Lavender = 87, - LavenderBlush = 88, - LawnGreen = 89, - LemonChiffon = 90, - LightBlue = 91, - LightCoral = 92, - LightCyan = 93, - LightGoldenrodYellow = 94, - LightGray = 95, - LightGreen = 96, - LightPink = 97, - LightSalmon = 98, - LightSeaGreen = 99, - LightSkyBlue = 100, - LightSlateGray = 101, - LightSteelBlue = 102, - LightYellow = 103, - Lime = 104, - LimeGreen = 105, - Linen = 106, - Magenta = 107, - Maroon = 108, - MediumAquamarine = 109, - MediumBlue = 110, - MediumOrchid = 111, - MediumPurple = 112, - MediumSeaGreen = 113, - MediumSlateBlue = 114, - MediumSpringGreen = 115, - MediumTurquoise = 116, - MediumVioletRed = 117, - MidnightBlue = 118, - MintCream = 119, - MistyRose = 120, - Moccasin = 121, - NavajoWhite = 122, - Navy = 123, - OldLace = 124, - Olive = 125, - OliveDrab = 126, - Orange = 127, - OrangeRed = 128, - Orchid = 129, - PaleGoldenrod = 130, - PaleGreen = 131, - PaleTurquoise = 132, - PaleVioletRed = 133, - PapayaWhip = 134, - PeachPuff = 135, - Peru = 136, - Pink = 137, - Plum = 138, - PowderBlue = 139, - Purple = 140, - Red = 141, - RosyBrown = 142, - RoyalBlue = 143, - SaddleBrown = 144, - Salmon = 145, - SandyBrown = 146, - SeaGreen = 147, - SeaShell = 148, - Sienna = 149, - Silver = 150, - SkyBlue = 151, - SlateBlue = 152, - SlateGray = 153, - Snow = 154, - SpringGreen = 155, - SteelBlue = 156, - Tan = 157, - Teal = 158, - Thistle = 159, - Tomato = 160, - Turquoise = 161, - Violet = 162, - Wheat = 163, - White = 164, - WhiteSmoke = 165, - Yellow = 166, - YellowGreen = 167, - ButtonFace = 168, - ButtonHighlight = 169, - ButtonShadow = 170, - GradientActiveCaption = 171, - GradientInactiveCaption = 172, - MenuBar = 173, - MenuHighlight = 174, - } - public class PlatformBitmapLoader : Splat.IBitmapLoader - { - public PlatformBitmapLoader() { } - public Splat.IBitmap Create(float width, float height) { } - public System.Threading.Tasks.Task Load(System.IO.Stream sourceStream, float? desiredWidth, float? desiredHeight) { } - public System.Threading.Tasks.Task LoadFromResource(string resource, float? desiredWidth, float? desiredHeight) { } - } - public static class PlatformModeDetector - { - public static bool InDesignMode() { } - public static void OverrideModeDetector(Splat.IPlatformModeDetector modeDetector) { } - } - public static class PointExtensions - { - public static System.Drawing.PointF FromNative(this System.Windows.Point value) { } - public static System.Windows.Point ToNative(this System.Drawing.Point value) { } - public static System.Windows.Point ToNative(this System.Drawing.PointF value) { } - } - public static class RectExtensions - { - public static System.Drawing.RectangleF FromNative(this System.Windows.Rect value) { } - public static System.Windows.Rect ToNative(this System.Drawing.Rectangle value) { } - public static System.Windows.Rect ToNative(this System.Drawing.RectangleF value) { } - } - public static class ServiceLocationDrawingInitialization - { - public static void RegisterPlatformBitmapLoader(this Splat.IMutableDependencyResolver resolver) { } - } - public static class SizeExtensions - { - public static System.Drawing.SizeF FromNative(this System.Windows.Size value) { } - public static System.Windows.Size ToNative(this System.Drawing.Size value) { } - public static System.Windows.Size ToNative(this System.Drawing.SizeF value) { } - } - [System.Runtime.Serialization.DataContract] - public struct SplatColor : System.IEquatable - { - public byte A { get; } - public byte B { get; } - public byte G { get; } - public bool IsEmpty { get; } - public bool IsKnownColor { get; } - public bool IsNamedColor { get; } - public bool IsSystemColor { get; } - public string Name { get; } - public byte R { get; } - public static Splat.SplatColor AliceBlue { get; } - public static Splat.SplatColor AntiqueWhite { get; } - public static Splat.SplatColor Aqua { get; } - public static Splat.SplatColor Aquamarine { get; } - public static Splat.SplatColor Azure { get; } - public static Splat.SplatColor Beige { get; } - public static Splat.SplatColor Bisque { get; } - public static Splat.SplatColor Black { get; } - public static Splat.SplatColor BlanchedAlmond { get; } - public static Splat.SplatColor Blue { get; } - public static Splat.SplatColor BlueViolet { get; } - public static Splat.SplatColor Brown { get; } - public static Splat.SplatColor BurlyWood { get; } - public static Splat.SplatColor CadetBlue { get; } - public static Splat.SplatColor Chartreuse { get; } - public static Splat.SplatColor Chocolate { get; } - public static Splat.SplatColor Coral { get; } - public static Splat.SplatColor CornflowerBlue { get; } - public static Splat.SplatColor Cornsilk { get; } - public static Splat.SplatColor Crimson { get; } - public static Splat.SplatColor Cyan { get; } - public static Splat.SplatColor DarkBlue { get; } - public static Splat.SplatColor DarkCyan { get; } - public static Splat.SplatColor DarkGoldenrod { get; } - public static Splat.SplatColor DarkGray { get; } - public static Splat.SplatColor DarkGreen { get; } - public static Splat.SplatColor DarkKhaki { get; } - public static Splat.SplatColor DarkMagenta { get; } - public static Splat.SplatColor DarkOliveGreen { get; } - public static Splat.SplatColor DarkOrange { get; } - public static Splat.SplatColor DarkOrchid { get; } - public static Splat.SplatColor DarkRed { get; } - public static Splat.SplatColor DarkSalmon { get; } - public static Splat.SplatColor DarkSeaGreen { get; } - public static Splat.SplatColor DarkSlateBlue { get; } - public static Splat.SplatColor DarkSlateGray { get; } - public static Splat.SplatColor DarkTurquoise { get; } - public static Splat.SplatColor DarkViolet { get; } - public static Splat.SplatColor DeepPink { get; } - public static Splat.SplatColor DeepSkyBlue { get; } - public static Splat.SplatColor DimGray { get; } - public static Splat.SplatColor DodgerBlue { get; } - public static Splat.SplatColor Empty { get; } - public static Splat.SplatColor Firebrick { get; } - public static Splat.SplatColor FloralWhite { get; } - public static Splat.SplatColor ForestGreen { get; } - public static Splat.SplatColor Fuchsia { get; } - public static Splat.SplatColor Gainsboro { get; } - public static Splat.SplatColor GhostWhite { get; } - public static Splat.SplatColor Gold { get; } - public static Splat.SplatColor Goldenrod { get; } - public static Splat.SplatColor Gray { get; } - public static Splat.SplatColor Green { get; } - public static Splat.SplatColor GreenYellow { get; } - public static Splat.SplatColor Honeydew { get; } - public static Splat.SplatColor HotPink { get; } - public static Splat.SplatColor IndianRed { get; } - public static Splat.SplatColor Indigo { get; } - public static Splat.SplatColor Ivory { get; } - public static Splat.SplatColor Khaki { get; } - public static Splat.SplatColor Lavender { get; } - public static Splat.SplatColor LavenderBlush { get; } - public static Splat.SplatColor LawnGreen { get; } - public static Splat.SplatColor LemonChiffon { get; } - public static Splat.SplatColor LightBlue { get; } - public static Splat.SplatColor LightCoral { get; } - public static Splat.SplatColor LightCyan { get; } - public static Splat.SplatColor LightGoldenrodYellow { get; } - public static Splat.SplatColor LightGray { get; } - public static Splat.SplatColor LightGreen { get; } - public static Splat.SplatColor LightPink { get; } - public static Splat.SplatColor LightSalmon { get; } - public static Splat.SplatColor LightSeaGreen { get; } - public static Splat.SplatColor LightSkyBlue { get; } - public static Splat.SplatColor LightSlateGray { get; } - public static Splat.SplatColor LightSteelBlue { get; } - public static Splat.SplatColor LightYellow { get; } - public static Splat.SplatColor Lime { get; } - public static Splat.SplatColor LimeGreen { get; } - public static Splat.SplatColor Linen { get; } - public static Splat.SplatColor Magenta { get; } - public static Splat.SplatColor Maroon { get; } - public static Splat.SplatColor MediumAquamarine { get; } - public static Splat.SplatColor MediumBlue { get; } - public static Splat.SplatColor MediumOrchid { get; } - public static Splat.SplatColor MediumPurple { get; } - public static Splat.SplatColor MediumSeaGreen { get; } - public static Splat.SplatColor MediumSlateBlue { get; } - public static Splat.SplatColor MediumSpringGreen { get; } - public static Splat.SplatColor MediumTurquoise { get; } - public static Splat.SplatColor MediumVioletRed { get; } - public static Splat.SplatColor MidnightBlue { get; } - public static Splat.SplatColor MintCream { get; } - public static Splat.SplatColor MistyRose { get; } - public static Splat.SplatColor Moccasin { get; } - public static Splat.SplatColor NavajoWhite { get; } - public static Splat.SplatColor Navy { get; } - public static Splat.SplatColor OldLace { get; } - public static Splat.SplatColor Olive { get; } - public static Splat.SplatColor OliveDrab { get; } - public static Splat.SplatColor Orange { get; } - public static Splat.SplatColor OrangeRed { get; } - public static Splat.SplatColor Orchid { get; } - public static Splat.SplatColor PaleGoldenrod { get; } - public static Splat.SplatColor PaleGreen { get; } - public static Splat.SplatColor PaleTurquoise { get; } - public static Splat.SplatColor PaleVioletRed { get; } - public static Splat.SplatColor PapayaWhip { get; } - public static Splat.SplatColor PeachPuff { get; } - public static Splat.SplatColor Peru { get; } - public static Splat.SplatColor Pink { get; } - public static Splat.SplatColor Plum { get; } - public static Splat.SplatColor PowderBlue { get; } - public static Splat.SplatColor Purple { get; } - public static Splat.SplatColor Red { get; } - public static Splat.SplatColor RosyBrown { get; } - public static Splat.SplatColor RoyalBlue { get; } - public static Splat.SplatColor SaddleBrown { get; } - public static Splat.SplatColor Salmon { get; } - public static Splat.SplatColor SandyBrown { get; } - public static Splat.SplatColor SeaGreen { get; } - public static Splat.SplatColor SeaShell { get; } - public static Splat.SplatColor Sienna { get; } - public static Splat.SplatColor Silver { get; } - public static Splat.SplatColor SkyBlue { get; } - public static Splat.SplatColor SlateBlue { get; } - public static Splat.SplatColor SlateGray { get; } - public static Splat.SplatColor Snow { get; } - public static Splat.SplatColor SpringGreen { get; } - public static Splat.SplatColor SteelBlue { get; } - public static Splat.SplatColor Tan { get; } - public static Splat.SplatColor Teal { get; } - public static Splat.SplatColor Thistle { get; } - public static Splat.SplatColor Tomato { get; } - public static Splat.SplatColor Transparent { get; } - public static Splat.SplatColor Turquoise { get; } - public static Splat.SplatColor Violet { get; } - public static Splat.SplatColor Wheat { get; } - public static Splat.SplatColor White { get; } - public static Splat.SplatColor WhiteSmoke { get; } - public static Splat.SplatColor Yellow { get; } - public static Splat.SplatColor YellowGreen { get; } - public bool Equals(Splat.SplatColor other) { } - public override bool Equals(object obj) { } - public float GetBrightness() { } - public override int GetHashCode() { } - public float GetHue() { } - public float GetSaturation() { } - public int ToArgb() { } - public Splat.KnownColor ToKnownColor() { } - public override string ToString() { } - public static Splat.SplatColor FromArgb(int argb) { } - public static Splat.SplatColor FromArgb(int alpha, Splat.SplatColor baseColor) { } - public static Splat.SplatColor FromArgb(int red, int green, int blue) { } - public static Splat.SplatColor FromArgb(int alpha, int red, int green, int blue) { } - public static Splat.SplatColor FromKnownColor(Splat.KnownColor color) { } - public static Splat.SplatColor FromName(string name) { } - public static bool operator !=(Splat.SplatColor left, Splat.SplatColor right) { } - public static bool operator ==(Splat.SplatColor left, Splat.SplatColor right) { } - } - public static class SplatColorExtensions - { - public static Splat.SplatColor FromNative(this System.Windows.Media.Color value) { } - public static System.Windows.Media.Color ToNative(this Splat.SplatColor value) { } - public static System.Windows.Media.SolidColorBrush ToNativeBrush(this Splat.SplatColor value) { } - } -} \ No newline at end of file diff --git a/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.netcoreapp3.1.approved.txt b/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.Core3_1.verified.txt similarity index 100% rename from src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.netcoreapp3.1.approved.txt rename to src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.Core3_1.verified.txt diff --git a/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.net5.0.approved.txt b/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet5_0.verified.txt similarity index 100% rename from src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.net5.0.approved.txt rename to src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet5_0.verified.txt diff --git a/src/Splat.Drawing.Tests/API/ApiApprovalTests.cs b/src/Splat.Drawing.Tests/API/ApiApprovalTests.cs index 014d41704..0f69a27a5 100644 --- a/src/Splat.Drawing.Tests/API/ApiApprovalTests.cs +++ b/src/Splat.Drawing.Tests/API/ApiApprovalTests.cs @@ -4,23 +4,25 @@ // See the LICENSE file in the project root for full license information. using System.Diagnostics.CodeAnalysis; +using System.Threading.Tasks; +using VerifyXunit; using Xunit; +#pragma warning disable SA1615 // Element return value should be documented + namespace Splat.Tests { /// /// Tests to make sure that the API matches the approved ones. /// [ExcludeFromCodeCoverage] + [UsesVerify] public class ApiApprovalTests { /// /// Tests to make sure the splat project is approved. /// [Fact] - public void SplatUIProject() - { - typeof(IPlatformModeDetector).Assembly.CheckApproval(); - } + public Task SplatUIProject() => typeof(IPlatformModeDetector).Assembly.CheckApproval(); } } diff --git a/src/Splat.Tests/API/ApiApprovalTests.SplatProject.netcoreapp3.1.approved.txt b/src/Splat.Tests/API/ApiApprovalTests.SplatProject.Core3_1.verified.txt similarity index 99% rename from src/Splat.Tests/API/ApiApprovalTests.SplatProject.netcoreapp3.1.approved.txt rename to src/Splat.Tests/API/ApiApprovalTests.SplatProject.Core3_1.verified.txt index 9d1aed7f6..e8f7172e8 100644 --- a/src/Splat.Tests/API/ApiApprovalTests.SplatProject.netcoreapp3.1.approved.txt +++ b/src/Splat.Tests/API/ApiApprovalTests.SplatProject.Core3_1.verified.txt @@ -1,4 +1,4 @@ -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")] diff --git a/src/Splat.Tests/API/ApiApprovalTests.SplatProject.net5.0.approved.txt b/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet5_0.verified.txt similarity index 99% rename from src/Splat.Tests/API/ApiApprovalTests.SplatProject.net5.0.approved.txt rename to src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet5_0.verified.txt index b2fe1c7e7..c7f8e26f2 100644 --- a/src/Splat.Tests/API/ApiApprovalTests.SplatProject.net5.0.approved.txt +++ b/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet5_0.verified.txt @@ -1,4 +1,4 @@ -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")] diff --git a/src/Splat.Tests/API/ApiApprovalTests.SplatProject..approved.txt b/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet6_0.verified.txt similarity index 100% rename from src/Splat.Tests/API/ApiApprovalTests.SplatProject..approved.txt rename to src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet6_0.verified.txt diff --git a/src/Splat.Tests/API/ApiApprovalTests.cs b/src/Splat.Tests/API/ApiApprovalTests.cs index e11b91240..cec27ccd7 100644 --- a/src/Splat.Tests/API/ApiApprovalTests.cs +++ b/src/Splat.Tests/API/ApiApprovalTests.cs @@ -6,7 +6,10 @@ #if !WINDOWS_UWP && !ANDROID using System.Diagnostics.CodeAnalysis; +using System.Threading.Tasks; +using VerifyXunit; using Xunit; +#pragma warning disable SA1615 // Element return value should be documented namespace Splat.Tests { @@ -14,16 +17,14 @@ namespace Splat.Tests /// Tests to make sure that the API matches the approved ones. /// [ExcludeFromCodeCoverage] + [UsesVerify] public class ApiApprovalTests { /// /// Tests to make sure the splat project is approved. /// [Fact] - public void SplatProject() - { - typeof(AssemblyFinder).Assembly.CheckApproval(); - } + public Task SplatProject() => typeof(AssemblyFinder).Assembly.CheckApproval(); } } diff --git a/src/Splat.Tests/ApiExtensions.cs b/src/Splat.Tests/ApiExtensions.cs index 7eebd562d..8b0b2fd0b 100644 --- a/src/Splat.Tests/ApiExtensions.cs +++ b/src/Splat.Tests/ApiExtensions.cs @@ -4,20 +4,13 @@ // See the LICENSE file in the project root for full license information. using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; -using System.Text; -using System.Text.RegularExpressions; using System.Threading.Tasks; - -using DiffEngine; - using PublicApiGenerator; +using VerifyXunit; -using Xunit; +#pragma warning disable SA1615 // Element return value should be documented namespace Splat.Tests { @@ -26,57 +19,23 @@ namespace Splat.Tests /// public static class ApiExtensions { - private static readonly Regex _removeCoverletSectionRegex = new(@"^namespace Coverlet\.Core\.Instrumentation\.Tracker.*?^}", RegexOptions.Singleline | RegexOptions.Multiline | RegexOptions.Compiled); - /// /// Checks to make sure the API is approved. /// /// The assembly that is being checked. - /// The caller member. /// The caller file path. - public static void CheckApproval(this Assembly assembly, [CallerMemberName] string? memberName = null, [CallerFilePath] string? filePath = null) + public static Task CheckApproval(this Assembly assembly, [CallerFilePath] string filePath = "") { - var targetFrameworkName = Assembly.GetExecutingAssembly().GetTargetFrameworkName(); - - var sourceDirectory = Path.GetDirectoryName(filePath); - - var approvedFileName = Path.Combine(sourceDirectory!, $"ApiApprovalTests.{memberName}.{targetFrameworkName}.approved.txt"); - var receivedFileName = Path.Combine(sourceDirectory!, $"ApiApprovalTests.{memberName}.{targetFrameworkName}.received.txt"); - - string approvedPublicApi = string.Empty; - - if (File.Exists(approvedFileName)) - { - approvedPublicApi = File.ReadAllText(approvedFileName); - } - var generatorOptions = new ApiGeneratorOptions { WhitelistedNamespacePrefixes = new[] { "Splat" } }; - var receivedPublicApi = Filter(ApiGenerator.GeneratePublicApi(assembly, generatorOptions)); - - if (!string.Equals(receivedPublicApi, approvedPublicApi, StringComparison.Ordinal)) - { - File.WriteAllText(receivedFileName, receivedPublicApi); - DiffRunner.Launch(receivedFileName, approvedFileName); - } - - Assert.Equal(approvedPublicApi, receivedPublicApi); - } - - private static string Filter(string text) - { - text = _removeCoverletSectionRegex.Replace(text, string.Empty); - return string.Join(Environment.NewLine, text.Split( - new[] - { - Environment.NewLine - }, - StringSplitOptions.RemoveEmptyEntries) - .Where(l => - !l.StartsWith("[assembly: AssemblyVersion(", StringComparison.InvariantCulture) && - !l.StartsWith("[assembly: AssemblyFileVersion(", StringComparison.InvariantCulture) && - !l.StartsWith("[assembly: AssemblyInformationalVersion(", StringComparison.InvariantCulture) && - !l.StartsWith("[assembly: System.Reflection.AssemblyMetadata(", StringComparison.InvariantCulture) && - !string.IsNullOrWhiteSpace(l))); + var apiText = assembly.GeneratePublicApi(generatorOptions); + return Verifier.Verify(apiText, null, filePath) + .UniqueForRuntimeAndVersion() + .ScrubEmptyLines() + .ScrubLines(l => + l.StartsWith("[assembly: AssemblyVersion(", StringComparison.InvariantCulture) || + l.StartsWith("[assembly: AssemblyFileVersion(", StringComparison.InvariantCulture) || + l.StartsWith("[assembly: AssemblyInformationalVersion(", StringComparison.InvariantCulture) || + l.StartsWith("[assembly: System.Reflection.AssemblyMetadata(", StringComparison.InvariantCulture)); } } } From 6d71493d68bd34a599aa764d1a3515a3b4ba2d2a Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 1 Oct 2021 14:28:44 +1000 Subject: [PATCH 21/66] housekeeping: Fix the release ci (#784) --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 15a0451e9..a2db2dd19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,9 @@ jobs: dotnet workload install tvos dotnet workload install macos dotnet workload install maui - + dotnet tool install -g Redth.Net.Maui.Check + maui-check --non-interactive --fix + - name: Add MSBuild to PATH uses: glennawatson/setup-msbuild@v1.0.3 with: From 572aba4d4a8e22c9fadf3415b67dc1c290ebbea2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 17:13:22 +1100 Subject: [PATCH 22/66] build(deps): bump Verify.Xunit from 12.2.0 to 13.0.3 in /src (#786) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 12.2.0 to 13.0.3. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/commits) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index b7271bb63..a903c5ba1 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From 5fe819c600c27f0bb02e5324a0ce27adfe9da861 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 06:31:24 +0000 Subject: [PATCH 23/66] build(deps): bump Microsoft.AppCenter.Analytics from 4.3.0 to 4.4.0 in /src (#773) * build(deps): bump Microsoft.AppCenter.Analytics in /src Bumps Microsoft.AppCenter.Analytics from 4.3.0 to 4.4.0. --- updated-dependencies: - dependency-name: Microsoft.AppCenter.Analytics dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * make target frameworks platform specific CI failing due to targeting net5.0, net6.0 * adjust target frameworks * windows target for net6 * adjust tests project restore targets * remove uap for appcenter for now * autofac tests target windows for net5 and 6 * remove android and ios for now Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Vreony Co-authored-by: Glenn <5834289+glennawatson@users.noreply.github.com> --- src/Splat.AppCenter/Splat.AppCenter.csproj | 9 +++++---- src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj | 2 +- src/Splat.Tests/Splat.Tests.csproj | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Splat.AppCenter/Splat.AppCenter.csproj b/src/Splat.AppCenter/Splat.AppCenter.csproj index 76cc6c389..07b5b2025 100644 --- a/src/Splat.AppCenter/Splat.AppCenter.csproj +++ b/src/Splat.AppCenter/Splat.AppCenter.csproj @@ -1,7 +1,8 @@ - + - netstandard2.0;net5.0;net6.0 + netstandard2.0;net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0 + Splat.AppCenter Splat .NET Foundation and Contributors @@ -12,8 +13,8 @@ - - + + diff --git a/src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj b/src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj index d56e06da8..b4004bf4d 100644 --- a/src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj +++ b/src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj @@ -1,7 +1,7 @@  - net5.0;netcoreapp3.1 + net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0;netcoreapp3.1 false $(NoWarn);1591;CA1707;SA1633;CA2000 diff --git a/src/Splat.Tests/Splat.Tests.csproj b/src/Splat.Tests/Splat.Tests.csproj index 6660c747c..b5d76eece 100644 --- a/src/Splat.Tests/Splat.Tests.csproj +++ b/src/Splat.Tests/Splat.Tests.csproj @@ -1,7 +1,7 @@ - + - net5.0;net6.0;netcoreapp3.1 + net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0;netcoreapp3.1 $(NoWarn);1591;CA1707;SA1633;CA2000;CA1034 latest latest From e308ca96fc85e6639086810d0bbaaabbd06ddb23 Mon Sep 17 00:00:00 2001 From: Eriawan Kusumawardhono Date: Sat, 9 Oct 2021 02:11:57 +0700 Subject: [PATCH 24/66] Fixes #787 About unnecessary ItemGroup with condition in Splat.csproj (#788) * Fixes #787 Remove ItemGroup that has conditon with TFM that starts with `net46`in Splat.csproj file. Having this condition of TFM net46* is unnecessary, Because defined TargetFrameworks does not contain NET Fx related TFM. * remove the net46 and net472 as well because these TFMs are in the Splat.Drawing as suggested in issue comment: https://github.com/reactiveui/splat/issues/787#issuecomment-938583942 --- src/Splat/Splat.csproj | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Splat/Splat.csproj b/src/Splat/Splat.csproj index ac428f5c9..529d46acb 100644 --- a/src/Splat/Splat.csproj +++ b/src/Splat/Splat.csproj @@ -1,7 +1,6 @@ - + netstandard2.0;net5.0;net6.0 - $(TargetFrameworks);net461;net472 Splat Splat .NET Foundation and Contributors @@ -11,8 +10,5 @@ latest enable - - - - + From b331cf6488c078195c5f4e6f7252e06f0216c9af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 12:53:09 +0100 Subject: [PATCH 25/66] build(deps): bump DryIoc.Dll from 4.8.1 to 4.8.2 in /src (#790) Bumps [DryIoc.Dll](https://github.com/dadhi/DryIoc) from 4.8.1 to 4.8.2. - [Release notes](https://github.com/dadhi/DryIoc/releases) - [Commits](https://github.com/dadhi/DryIoc/compare/v4.8.1...v4.8.2) --- updated-dependencies: - dependency-name: DryIoc.Dll dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Splat.DryIoc/Splat.DryIoc.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Splat.DryIoc/Splat.DryIoc.csproj b/src/Splat.DryIoc/Splat.DryIoc.csproj index ea3052329..f0da2c853 100644 --- a/src/Splat.DryIoc/Splat.DryIoc.csproj +++ b/src/Splat.DryIoc/Splat.DryIoc.csproj @@ -9,7 +9,7 @@ - + From cdf6f354954dfe6949879c54d56a31039e70df40 Mon Sep 17 00:00:00 2001 From: David Vreony Date: Thu, 21 Oct 2021 22:50:30 +0100 Subject: [PATCH 26/66] add vs2022 update command (#796) ci failing due to requiring 17.0.0-pre.5.0 for maui --- .github/workflows/ci-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 3ff5413d6..65d449bb3 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -20,6 +20,7 @@ jobs: shell: bash run: | dotnet tool update -g dotnet-vs + vs update preview vs modify preview +mobile +desktop +uwp +web echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" From 7bc3c779fd80d54f8deabd7cfd277602f52a0c71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Oct 2021 09:22:00 +1100 Subject: [PATCH 27/66] build(deps): bump Verify.Xunit from 13.0.3 to 13.3.0 in /src (#794) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 13.0.3 to 13.3.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/commits/13.3.0) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Glenn <5834289+glennawatson@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index a903c5ba1..c79c4196f 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From a8efa696508e69c754a29f8f1189c07c3fb856f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Oct 2021 09:22:19 +1100 Subject: [PATCH 28/66] build(deps): bump DryIoc.Dll from 4.8.2 to 4.8.3 in /src (#795) Bumps [DryIoc.Dll](https://github.com/dadhi/DryIoc) from 4.8.2 to 4.8.3. - [Release notes](https://github.com/dadhi/DryIoc/releases) - [Commits](https://github.com/dadhi/DryIoc/compare/v4.8.2...v4.8.3) --- updated-dependencies: - dependency-name: DryIoc.Dll dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Glenn <5834289+glennawatson@users.noreply.github.com> --- src/Splat.DryIoc/Splat.DryIoc.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Splat.DryIoc/Splat.DryIoc.csproj b/src/Splat.DryIoc/Splat.DryIoc.csproj index f0da2c853..23b67b4ad 100644 --- a/src/Splat.DryIoc/Splat.DryIoc.csproj +++ b/src/Splat.DryIoc/Splat.DryIoc.csproj @@ -9,7 +9,7 @@ - + From 24009a9f7e66b762195b5155a7b299a532e440e6 Mon Sep 17 00:00:00 2001 From: n-ski <57114830+n-ski@users.noreply.github.com> Date: Fri, 22 Oct 2021 02:12:48 +0300 Subject: [PATCH 29/66] Fix loading WPF `BitmapImage` from a network stream (#793) * Do not freeze `BitmapImage` if it cannot be frozen (#792) * Remove whitespace Co-authored-by: Glenn <5834289+glennawatson@users.noreply.github.com> Co-authored-by: David Vreony --- .../Platforms/net4/Bitmaps/PlatformBitmapLoader.cs | 6 +++++- .../Platforms/net5/Bitmaps/PlatformBitmapLoader.cs | 6 +++++- .../Platforms/netcoreapp3/Bitmaps/PlatformBitmapLoader.cs | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Splat.Drawing/Platforms/net4/Bitmaps/PlatformBitmapLoader.cs b/src/Splat.Drawing/Platforms/net4/Bitmaps/PlatformBitmapLoader.cs index 88dbdd51a..5070cf3c4 100644 --- a/src/Splat.Drawing/Platforms/net4/Bitmaps/PlatformBitmapLoader.cs +++ b/src/Splat.Drawing/Platforms/net4/Bitmaps/PlatformBitmapLoader.cs @@ -79,7 +79,11 @@ private static void WithInit(BitmapImage source, Action block) source.BeginInit(); block(source); source.EndInit(); - source.Freeze(); + + if (source.CanFreeze) + { + source.Freeze(); + } } } } diff --git a/src/Splat.Drawing/Platforms/net5/Bitmaps/PlatformBitmapLoader.cs b/src/Splat.Drawing/Platforms/net5/Bitmaps/PlatformBitmapLoader.cs index 0e301a4c8..00372b59e 100644 --- a/src/Splat.Drawing/Platforms/net5/Bitmaps/PlatformBitmapLoader.cs +++ b/src/Splat.Drawing/Platforms/net5/Bitmaps/PlatformBitmapLoader.cs @@ -86,7 +86,11 @@ private static void WithInit(BitmapImage source, Action block) source.BeginInit(); block(source); source.EndInit(); - source.Freeze(); + + if (source.CanFreeze) + { + source.Freeze(); + } } } } diff --git a/src/Splat.Drawing/Platforms/netcoreapp3/Bitmaps/PlatformBitmapLoader.cs b/src/Splat.Drawing/Platforms/netcoreapp3/Bitmaps/PlatformBitmapLoader.cs index 0e301a4c8..00372b59e 100644 --- a/src/Splat.Drawing/Platforms/netcoreapp3/Bitmaps/PlatformBitmapLoader.cs +++ b/src/Splat.Drawing/Platforms/netcoreapp3/Bitmaps/PlatformBitmapLoader.cs @@ -86,7 +86,11 @@ private static void WithInit(BitmapImage source, Action block) source.BeginInit(); block(source); source.EndInit(); - source.Freeze(); + + if (source.CanFreeze) + { + source.Freeze(); + } } } } From c012ce6b82785751334b63274b389d16401136e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 08:12:17 +0100 Subject: [PATCH 30/66] build(deps): bump Nerdbank.GitVersioning from 3.4.240 to 3.4.244 in /src (#799) Bumps [Nerdbank.GitVersioning](https://github.com/dotnet/Nerdbank.GitVersioning) from 3.4.240 to 3.4.244. - [Release notes](https://github.com/dotnet/Nerdbank.GitVersioning/releases) - [Commits](https://github.com/dotnet/Nerdbank.GitVersioning/compare/v3.4.240...v3.4.244) --- updated-dependencies: - dependency-name: Nerdbank.GitVersioning dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index c79c4196f..d94a1f96e 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -70,7 +70,7 @@ - + From d0ddf78448a54d757dbf68274fe3cd954b61cc51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 08:47:41 +0100 Subject: [PATCH 31/66] build(deps): bump NLog from 4.7.11 to 4.7.12 in /src (#798) Bumps [NLog](https://github.com/NLog/NLog) from 4.7.11 to 4.7.12. - [Release notes](https://github.com/NLog/NLog/releases) - [Changelog](https://github.com/NLog/NLog/blob/v4.7.12/CHANGELOG.md) - [Commits](https://github.com/NLog/NLog/compare/v4.7.11...v4.7.12) --- updated-dependencies: - dependency-name: NLog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Splat.NLog/Splat.NLog.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Splat.NLog/Splat.NLog.csproj b/src/Splat.NLog/Splat.NLog.csproj index 27084d2f0..8c3d78b17 100644 --- a/src/Splat.NLog/Splat.NLog.csproj +++ b/src/Splat.NLog/Splat.NLog.csproj @@ -11,7 +11,7 @@ enable - + From 7b0ca59d1196635c2aa6d54a76d6b15cdd77cd83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Oct 2021 09:26:32 +0100 Subject: [PATCH 32/66] build(deps): bump FluentAssertions from 6.1.0 to 6.2.0 in /src (#800) Bumps [FluentAssertions](https://github.com/fluentassertions/fluentassertions) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/fluentassertions/fluentassertions/releases) - [Changelog](https://github.com/fluentassertions/fluentassertions/blob/master/AcceptApiChanges.ps1) - [Commits](https://github.com/fluentassertions/fluentassertions/compare/6.1.0...6.2.0) --- updated-dependencies: - dependency-name: FluentAssertions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index d94a1f96e..ce9d5c96d 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -45,7 +45,7 @@ - + From a33ec0505029ee3185772656e200ea33b62f1290 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Oct 2021 07:55:00 +0100 Subject: [PATCH 33/66] build(deps): bump Microsoft.NET.Test.Sdk from 16.11.0 to 17.0.0 in /src (#802) Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.11.0 to 17.0.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.11.0...v17.0.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index ce9d5c96d..d5c6d4958 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -42,7 +42,7 @@ - + From a6228ff9a4c34b230c0839f3c1145549c61d58c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Oct 2021 18:15:10 +0100 Subject: [PATCH 34/66] build(deps): bump Verify.Xunit from 13.3.0 to 13.3.1 in /src (#801) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 13.3.0 to 13.3.1. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/13.3.0...13.3.1) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index d5c6d4958..684e162d4 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From 8ce206b1e51e6565024ed012e37eb42ca2472994 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Nov 2021 07:17:44 +0000 Subject: [PATCH 35/66] build(deps): bump Verify.Xunit from 13.3.1 to 14.0.1 in /src (#804) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 13.3.1 to 14.0.1. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/13.3.1...14.0.1) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 684e162d4..fcc5ed27d 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From 1b9bc50e70e6ec1d75b02c41145b7047161f8ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Nov 2021 19:02:20 +1100 Subject: [PATCH 36/66] build(deps): bump ReactiveUI from 16.2.6 to 16.3.5 in /src (#806) Bumps [ReactiveUI](https://github.com/reactiveui/reactiveui) from 16.2.6 to 16.3.5. - [Release notes](https://github.com/reactiveui/reactiveui/releases) - [Commits](https://github.com/reactiveui/reactiveui/compare/16.2.6...16.3.5) --- updated-dependencies: - dependency-name: ReactiveUI dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index d76452271..6123c03a6 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -47,7 +47,7 @@ - + From 09167434dc027e99f1ec900bcfca94b549b80ae0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Nov 2021 19:02:46 +1100 Subject: [PATCH 37/66] build(deps): bump DryIoc.Dll from 4.8.3 to 4.8.4 in /src (#805) Bumps [DryIoc.Dll](https://github.com/dadhi/DryIoc) from 4.8.3 to 4.8.4. - [Release notes](https://github.com/dadhi/DryIoc/releases) - [Commits](https://github.com/dadhi/DryIoc/compare/v4.8.3...v4.8.4) --- updated-dependencies: - dependency-name: DryIoc.Dll dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Splat.DryIoc/Splat.DryIoc.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Splat.DryIoc/Splat.DryIoc.csproj b/src/Splat.DryIoc/Splat.DryIoc.csproj index 23b67b4ad..3f242b39d 100644 --- a/src/Splat.DryIoc/Splat.DryIoc.csproj +++ b/src/Splat.DryIoc/Splat.DryIoc.csproj @@ -9,7 +9,7 @@ - + From 31819d2c4fff9e47cc2dfe68463b878b28f27713 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Mon, 1 Nov 2021 19:36:50 +1100 Subject: [PATCH 38/66] housekeeping: Remove pragma (#803) --- src/Splat.Tests/API/ApiApprovalTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Splat.Tests/API/ApiApprovalTests.cs b/src/Splat.Tests/API/ApiApprovalTests.cs index cec27ccd7..25b2cdf6c 100644 --- a/src/Splat.Tests/API/ApiApprovalTests.cs +++ b/src/Splat.Tests/API/ApiApprovalTests.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using VerifyXunit; using Xunit; -#pragma warning disable SA1615 // Element return value should be documented namespace Splat.Tests { @@ -23,6 +22,7 @@ public class ApiApprovalTests /// /// Tests to make sure the splat project is approved. /// + /// A task to monitor the usage. [Fact] public Task SplatProject() => typeof(AssemblyFinder).Assembly.CheckApproval(); } From f8f01146f49808865c8cfc561ea14b4343361408 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 20:27:06 +0000 Subject: [PATCH 39/66] build(deps): bump log4net from 2.0.12 to 2.0.13 in /src (#808) Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.12 to 2.0.13. - [Release notes](https://github.com/apache/logging-log4net/releases) - [Changelog](https://github.com/apache/logging-log4net/blob/master/ReleaseInstructions.txt) - [Commits](https://github.com/apache/logging-log4net/compare/rc/2.0.12...rc/2.0.13) --- updated-dependencies: - dependency-name: log4net dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Splat.Log4Net/Splat.Log4Net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Splat.Log4Net/Splat.Log4Net.csproj b/src/Splat.Log4Net/Splat.Log4Net.csproj index 3fcc7ffb2..9309bf934 100644 --- a/src/Splat.Log4Net/Splat.Log4Net.csproj +++ b/src/Splat.Log4Net/Splat.Log4Net.csproj @@ -12,7 +12,7 @@ - + From 6b87b771db85f53eb427e94fc366abecc599e8bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 20:46:55 +0000 Subject: [PATCH 40/66] build(deps): bump ReactiveUI from 16.3.5 to 16.3.9 in /src (#807) Bumps [ReactiveUI](https://github.com/reactiveui/reactiveui) from 16.3.5 to 16.3.9. - [Release notes](https://github.com/reactiveui/reactiveui/releases) - [Commits](https://github.com/reactiveui/reactiveui/compare/16.3.5...16.3.9) --- updated-dependencies: - dependency-name: ReactiveUI dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index 6123c03a6..43c308c30 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -47,7 +47,7 @@ - + From faee510d0260edb68f62361ee94f5dece575e3fb Mon Sep 17 00:00:00 2001 From: Chris Pulman Date: Wed, 3 Nov 2021 21:12:11 +0000 Subject: [PATCH 41/66] fix for Project targeting net5.0 won't build Splat.Drawing (#810) Added targets for Net5.0 and Net6.0 libraries Co-authored-by: Glenn <5834289+glennawatson@users.noreply.github.com> --- .../Platforms/ServiceLocationDrawingInitialization.cs | 4 ++-- src/Splat.Drawing/Splat.Drawing.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs b/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs index 0723fb5f4..db17b2780 100644 --- a/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs +++ b/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs @@ -23,8 +23,8 @@ public static void RegisterPlatformBitmapLoader(this IMutableDependencyResolver throw new ArgumentNullException(nameof(resolver)); } -#if !NETSTANDARD - // not supported in netstandard2.0 +#if !NETSTANDARD && !NET5_0 && !NET6_0 + // not supported in netstandard2.0 or NET5/6 library if (!resolver.HasRegistration(typeof(IBitmapLoader))) { resolver.RegisterLazySingleton(() => new PlatformBitmapLoader(), typeof(IBitmapLoader)); diff --git a/src/Splat.Drawing/Splat.Drawing.csproj b/src/Splat.Drawing/Splat.Drawing.csproj index dc0340725..d27065b7b 100644 --- a/src/Splat.Drawing/Splat.Drawing.csproj +++ b/src/Splat.Drawing/Splat.Drawing.csproj @@ -1,7 +1,7 @@ - MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;netstandard2.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos + MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;netstandard2.0;net5.0;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos $(TargetFrameworks);net461;net472;uap10.0.16299;netcoreapp3.1;net5.0-windows;net6.0-windows Splat .NET Foundation and Contributors From accc6bd7a131c22c84ad3940e93027f915d53136 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Nov 2021 12:30:03 +0000 Subject: [PATCH 42/66] build(deps): bump Verify.Xunit from 14.0.1 to 14.1.1 in /src (#811) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 14.0.1 to 14.1.1. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/14.0.1...14.1.1) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index fcc5ed27d..2eba9c9d2 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From ac2085f1b1fc4b44c5af9324bb137e2d95ef390a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Nov 2021 08:49:22 +0000 Subject: [PATCH 43/66] build(deps): bump ReactiveUI from 16.3.9 to 16.3.10 in /src (#812) Bumps [ReactiveUI](https://github.com/reactiveui/reactiveui) from 16.3.9 to 16.3.10. - [Release notes](https://github.com/reactiveui/reactiveui/releases) - [Commits](https://github.com/reactiveui/reactiveui/compare/16.3.9...16.3.10) --- updated-dependencies: - dependency-name: ReactiveUI dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index 43c308c30..b71197d86 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -47,7 +47,7 @@ - + From 57b4cc7a88f670b9ce54430eda13f48a6274bb3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 19:43:27 +0000 Subject: [PATCH 44/66] build(deps): bump Verify.Xunit from 14.1.1 to 14.2.0 in /src (#813) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 14.1.1 to 14.2.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/14.1.1...14.2.0) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 2eba9c9d2..7dc493961 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From c2428eee34f6c4b8c7fb5964f2818c5705c315b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 07:33:57 +0000 Subject: [PATCH 45/66] build(deps): bump Microsoft.ApplicationInsights in /src (#815) Bumps [Microsoft.ApplicationInsights](https://github.com/Microsoft/ApplicationInsights-dotnet) from 2.18.0 to 2.19.0. - [Release notes](https://github.com/Microsoft/ApplicationInsights-dotnet/releases) - [Changelog](https://github.com/microsoft/ApplicationInsights-dotnet/blob/develop/CHANGELOG.md) - [Commits](https://github.com/Microsoft/ApplicationInsights-dotnet/compare/2.18.0...2.19.0) --- updated-dependencies: - dependency-name: Microsoft.ApplicationInsights dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj b/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj index 347c62d3b..b65430cb4 100644 --- a/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj +++ b/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj @@ -11,7 +11,7 @@ enable - + From 4995b8b78605984b9eab02e541c51034337f0d9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 15:16:44 +0000 Subject: [PATCH 46/66] build(deps): bump System.Collections.Immutable in /src (#816) Bumps [System.Collections.Immutable](https://github.com/dotnet/runtime) from 5.0.0 to 6.0.0. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v5.0.0...v6.0.0) --- updated-dependencies: - dependency-name: System.Collections.Immutable dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Splat.Exceptionless/Splat.Exceptionless.csproj | 2 +- .../Splat.Microsoft.Extensions.Logging.csproj | 2 +- src/Splat.NLog/Splat.NLog.csproj | 2 +- src/Splat.Serilog/Splat.Serilog.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Splat.Exceptionless/Splat.Exceptionless.csproj b/src/Splat.Exceptionless/Splat.Exceptionless.csproj index 3c37ce536..39e7246ee 100644 --- a/src/Splat.Exceptionless/Splat.Exceptionless.csproj +++ b/src/Splat.Exceptionless/Splat.Exceptionless.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj index f87652232..90b5eace7 100644 --- a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj +++ b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Splat.NLog/Splat.NLog.csproj b/src/Splat.NLog/Splat.NLog.csproj index 8c3d78b17..ce08a5de5 100644 --- a/src/Splat.NLog/Splat.NLog.csproj +++ b/src/Splat.NLog/Splat.NLog.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Splat.Serilog/Splat.Serilog.csproj b/src/Splat.Serilog/Splat.Serilog.csproj index e83f24d50..d82fede15 100644 --- a/src/Splat.Serilog/Splat.Serilog.csproj +++ b/src/Splat.Serilog/Splat.Serilog.csproj @@ -12,7 +12,7 @@ - + From 6c881bb76db9a7f9988c5e589dcf4f03fc6c8424 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 07:39:43 +0000 Subject: [PATCH 47/66] build(deps): bump Microsoft.SourceLink.GitHub in /src (#818) Bumps [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/dotnet/sourcelink/releases) - [Commits](https://github.com/dotnet/sourcelink/compare/1.0.0...1.1.0) --- updated-dependencies: - dependency-name: Microsoft.SourceLink.GitHub dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 7dc493961..69e97a781 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -58,7 +58,7 @@ - + From 3342016023925aa8a8a1eb62050d4d2d95dc483a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 21:38:49 +0000 Subject: [PATCH 48/66] build(deps): bump Microsoft.SourceLink.GitHub in /src (#820) Bumps [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/dotnet/sourcelink/releases) - [Commits](https://github.com/dotnet/sourcelink/compare/1.1.0...1.1.1) --- updated-dependencies: - dependency-name: Microsoft.SourceLink.GitHub dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 69e97a781..386d280d8 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -58,7 +58,7 @@ - + From b50555c9493572a0185a0d0b08b9b62b1c797e85 Mon Sep 17 00:00:00 2001 From: David Vreony Date: Sun, 14 Nov 2021 21:22:07 +0000 Subject: [PATCH 49/66] housekeeping: add flags for making visual studio preview and maui optional (#821) --- .github/workflows/ci-build.yml | 108 +++------------------------------ 1 file changed, 8 insertions(+), 100 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 65d449bb3..91e2adfce 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -7,107 +7,15 @@ on: branches: [ main ] env: - configuration: Release productNamespacePrefix: "Splat" jobs: build: - runs-on: windows-2022 - outputs: - nbgv: ${{ steps.nbgv.outputs.SemVer2 }} - steps: - - name: Update VS2022 preview - shell: bash - run: | - dotnet tool update -g dotnet-vs - vs update preview - vs modify preview +mobile +desktop +uwp +web - echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - - - name: Install Windows SDK 10.0.16299 - shell: pwsh - run: | - Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe - $startInfo = New-Object System.Diagnostics.ProcessStartInfo - $startInfo.FileName = "winsdk.exe" - $startInfo.Arguments = "/norestart /quiet" - $process = New-Object System.Diagnostics.Process - $process.StartInfo = $startInfo - $process.Start() - $process.WaitForExit() - - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Install .NET Core - uses: actions/setup-dotnet@v1.8.2 - with: - dotnet-version: 3.1.x - - - name: Install .NET 5 - uses: actions/setup-dotnet@v1.8.2 - with: - dotnet-version: 5.0.x - - - name: Install .NET 6 - uses: actions/setup-dotnet@v1.8.2 - with: - dotnet-version: 6.0.x - include-prerelease: true - - - name: Install DotNet workloads - shell: bash - run: | - dotnet workload install android - dotnet workload install ios - dotnet workload install tvos - dotnet workload install macos - dotnet workload install maui - dotnet tool install -g Redth.Net.Maui.Check - maui-check --non-interactive --fix - - - name: Add MSBuild to PATH - uses: glennawatson/setup-msbuild@v1.0.3 - with: - prerelease: true - - - name: NBGV - id: nbgv - uses: dotnet/nbgv@master - with: - setAllVars: true - - - name: NuGet Restore - run: dotnet restore - working-directory: src - - - name: Build - run: msbuild /t:build,pack /nowarn:MSB4011 /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }} - working-directory: src - - - name: Run Unit Tests and Generate Coverage - uses: glennawatson/coverlet-msbuild@v1 - with: - project-files: '**/*Tests*.csproj' - no-build: true - exclude-filter: '[${{env.productNamespacePrefix}}.*.Tests.*]*,[${{env.productNamespacePrefix}}.Tests]*,[${{env.productNamespacePrefix}}.TestRunner.*]*' - include-filter: '[${{env.productNamespacePrefix}}*]*' - output-format: cobertura - output: '../../artifacts/' - configuration: ${{ env.configuration }} - - - 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 }} - - - name: Create NuGet Artifacts - uses: actions/upload-artifact@master - with: - name: nuget - path: '**/*.nupkg' + uses: reactiveui/actions-common/.github/workflows/workflow-common-setup-and-build.yml@main + with: + configuration: Release + productNamespacePrefix: "Splat" + useVisualStudioPreview: false + useMauiCheckDotNetTool: false + runTests: true + nugetMode: 1 From 3069c202b57ea97afb0876f1aed43a81fce2d219 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Nov 2021 22:00:48 +0000 Subject: [PATCH 50/66] build(deps): bump Microsoft.Extensions.Logging from 5.0.0 to 6.0.0 in /src (#814) * build(deps): bump Microsoft.Extensions.Logging in /src Bumps [Microsoft.Extensions.Logging](https://github.com/dotnet/runtime) from 5.0.0 to 6.0.0. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v5.0.0...v6.0.0) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Logging dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * build(deps): bump Microsoft.Extensions.Logging in /src Bumps [Microsoft.Extensions.Logging](https://github.com/dotnet/runtime) from 5.0.0 to 6.0.0. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v5.0.0...v6.0.0) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Logging dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * remove build warnings around logging interface using reserved names Error, Warning, Debug are the log levels so it's suitable * fix nullable ref type errors in net6 update in ms logging Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Vreony --- .../MicrosoftExtensionsLogProvider.cs | 10 ++++++---- .../Splat.Microsoft.Extensions.Logging.csproj | 2 +- .../MicrosoftExtensionsLoggingLoggerTests.cs | 4 ++-- src/Splat/Logging/IStaticFullLogger.cs | 3 +++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Splat.Microsoft.Extensions.Logging/MicrosoftExtensionsLogProvider.cs b/src/Splat.Microsoft.Extensions.Logging/MicrosoftExtensionsLogProvider.cs index a04c89ccb..bc2d3e9c4 100644 --- a/src/Splat.Microsoft.Extensions.Logging/MicrosoftExtensionsLogProvider.cs +++ b/src/Splat.Microsoft.Extensions.Logging/MicrosoftExtensionsLogProvider.cs @@ -38,7 +38,7 @@ public SplatLoggingAdapter(string categoryName) } /// - public void Log(global::Microsoft.Extensions.Logging.LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) + public void Log(global::Microsoft.Extensions.Logging.LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter) { if (!IsEnabled(logLevel)) { @@ -54,7 +54,7 @@ public void Log(global::Microsoft.Extensions.Logging.LogLevel logLevel, var message = formatter(state, exception); - LogHost.Default.Write(exception, message, splatLogLevel); + LogHost.Default.Write(exception!, message, splatLogLevel); } /// @@ -64,9 +64,11 @@ public bool IsEnabled(global::Microsoft.Extensions.Logging.LogLevel logLevel) } /// - public IDisposable? BeginScope(TState state) + public IDisposable BeginScope(TState state) { - return null; + // documentation states we're allowed to return null. + // NRT in net6 causing build issue as of 2021-11-10. + return null!; } } } diff --git a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj index 90b5eace7..40435412b 100644 --- a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj +++ b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj @@ -11,7 +11,7 @@ enable - + diff --git a/src/Splat.Tests/Logging/WrappingFullLoggers/MicrosoftExtensionsLoggingLoggerTests.cs b/src/Splat.Tests/Logging/WrappingFullLoggers/MicrosoftExtensionsLoggingLoggerTests.cs index 579384944..23e4ec0ca 100644 --- a/src/Splat.Tests/Logging/WrappingFullLoggers/MicrosoftExtensionsLoggingLoggerTests.cs +++ b/src/Splat.Tests/Logging/WrappingFullLoggers/MicrosoftExtensionsLoggingLoggerTests.cs @@ -62,8 +62,8 @@ public void Log( global::Microsoft.Extensions.Logging.LogLevel logLevel, EventId eventId, TState state, - Exception exception, - Func formatter) + Exception? exception, + Func formatter) { if (IsEnabled(logLevel)) { diff --git a/src/Splat/Logging/IStaticFullLogger.cs b/src/Splat/Logging/IStaticFullLogger.cs index 831bd9387..2ca7735e2 100644 --- a/src/Splat/Logging/IStaticFullLogger.cs +++ b/src/Splat/Logging/IStaticFullLogger.cs @@ -7,6 +7,8 @@ using System.ComponentModel; using System.Runtime.CompilerServices; +#pragma warning disable CA1716 // Identifiers should not match keywords + namespace Splat { /// @@ -359,3 +361,4 @@ public interface IStaticFullLogger void Write(Exception exception, [Localizable(false)] string message, [Localizable(false)] Type type, LogLevel logLevel, [CallerMemberName]string? callerMemberName = null); } } +#pragma warning restore CA1716 // Identifiers should not match keywords From f7a1ffadc15914c349776880b39e48543a23aa2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 11:20:33 +0000 Subject: [PATCH 51/66] build(deps): bump Verify.Xunit from 14.2.0 to 14.3.0 in /src (#823) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 14.2.0 to 14.3.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/14.2.0...14.3.0) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 386d280d8..4468203ab 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From 930812665bf7d318b075767cd66a40c54c40e641 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 02:13:42 +0000 Subject: [PATCH 52/66] build(deps): bump Verify.Xunit from 14.3.0 to 14.4.0 in /src (#824) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 14.3.0 to 14.4.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/14.3.0...14.4.0) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 4468203ab..eceec01ea 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From 9f79b4bc831b09a280517bdaa2b9c2363ea494f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 15:51:55 +0000 Subject: [PATCH 53/66] build(deps): bump Verify.Xunit from 14.4.0 to 14.5.0 in /src (#825) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 14.4.0 to 14.5.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/14.4.0...14.5.0) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index eceec01ea..fd116993c 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From d74751bc2905b82a374adb66dea15922d97842c7 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Wed, 24 Nov 2021 07:49:17 +1100 Subject: [PATCH 54/66] housekeeping: Add lock threads to lock old topics --- .github/workflows/lock.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/lock.yml diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml new file mode 100644 index 000000000..59cc45082 --- /dev/null +++ b/.github/workflows/lock.yml @@ -0,0 +1,31 @@ +name: 'Lock Threads' + +on: + schedule: + - cron: '0 0 * * *' + workflow_dispatch: + +permissions: + issues: write + pull-requests: write + +concurrency: + group: lock + +jobs: + action: + runs-on: ubuntu-latest + steps: + - uses: dessant/lock-threads@v3 + with: + github-token: ${{ github.token }} + issue-inactive-days: '14' + pr-inactive-days: '14' + issue-comment: > + This issue has been automatically locked since there + has not been any recent activity after it was closed. + Please open a new issue for related bugs. + pr-comment: > + This pull request has been automatically locked since there + has not been any recent activity after it was closed. + Please open a new issue for related bugs. From 340a93dcfecafd1f351ff0b753a9b620e7ffefa1 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:22:06 +1100 Subject: [PATCH 55/66] housekeeping: Remove nuget mode, security risk --- .github/workflows/ci-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 91e2adfce..fc8d5e085 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -18,4 +18,3 @@ jobs: useVisualStudioPreview: false useMauiCheckDotNetTool: false runTests: true - nugetMode: 1 From e69204ada4c37a929f2aeb35f8b820312f84705a Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:26:54 +1100 Subject: [PATCH 56/66] housekeeping: Always run tests for builds --- .github/workflows/ci-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index fc8d5e085..7cfbcdfb7 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -17,4 +17,3 @@ jobs: productNamespacePrefix: "Splat" useVisualStudioPreview: false useMauiCheckDotNetTool: false - runTests: true From 71563bcfe592b31012f729555bbafcd39a68fdf4 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:30:43 +1100 Subject: [PATCH 57/66] Housekeeping: Use common release script --- .github/workflows/release.yml | 123 +++------------------------------- 1 file changed, 10 insertions(+), 113 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a2db2dd19..8b17c44c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,122 +1,19 @@ -name: Build and Release +name: Build on: push: branches: [ main ] + pull_request: + branches: [ main ] env: - configuration: Release productNamespacePrefix: "Splat" jobs: - release: - runs-on: windows-2022 - environment: - name: release - steps: - - name: Update VS2022 preview - shell: bash - run: | - dotnet tool update -g dotnet-vs - vs modify preview +mobile +desktop +uwp +web - echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - - - name: Install Windows SDK 10.0.16299 - shell: pwsh - run: | - Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe - $startInfo = New-Object System.Diagnostics.ProcessStartInfo - $startInfo.FileName = "winsdk.exe" - $startInfo.Arguments = "/norestart /quiet" - $process = New-Object System.Diagnostics.Process - $process.StartInfo = $startInfo - $process.Start() - $process.WaitForExit() - - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Install .NET Core - uses: actions/setup-dotnet@v1.8.2 - with: - dotnet-version: 3.1.x - - - name: Install .NET 5 - uses: actions/setup-dotnet@v1.8.2 - with: - dotnet-version: 5.0.x - - - name: Install .NET 6 - uses: actions/setup-dotnet@v1.8.2 - with: - dotnet-version: 6.0.x - include-prerelease: true - - - name: Install DotNet workloads - shell: bash - run: | - dotnet workload install android - dotnet workload install ios - dotnet workload install tvos - dotnet workload install macos - dotnet workload install maui - dotnet tool install -g Redth.Net.Maui.Check - maui-check --non-interactive --fix - - - name: Add MSBuild to PATH - uses: glennawatson/setup-msbuild@v1.0.3 - with: - prerelease: true - - - name: NBGV - id: nbgv - uses: dotnet/nbgv@master - with: - setAllVars: true - - - name: NuGet Restore - run: dotnet restore - working-directory: src - - - name: Build - run: msbuild /t:build,pack /nowarn:MSB4011 /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }} - working-directory: src - - - name: Save SignClient Configuration - run: 'echo "$SIGN_CLIENT_CONFIG" > SignPackages.json' - shell: bash - env: - SIGN_CLIENT_CONFIG: ${{secrets.SIGN_CLIENT_CONFIG}} - - - name: Sign NuGet Packages - uses: glennawatson/signclient@v1 - with: - input-files: '**/*.nupkg' - sign-client-secret: ${{ secrets.SIGN_CLIENT_SECRET }} - sign-client-user: ${{ secrets.SIGN_CLIENT_USER_ID }} - project-name: reactiveui - description: reactiveui - config-file: SignPackages.json - - - name: Changelog - uses: glennawatson/ChangeLog@v1 - id: changelog - - - name: Create Release - uses: actions/create-release@v1.1.4 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: ${{ steps.nbgv.outputs.SemVer2 }} - release_name: ${{ steps.nbgv.outputs.SemVer2 }} - body: | - ${{ steps.changelog.outputs.commitLog }} - - - name: NuGet Push - env: - NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} - SOURCE_URL: https://api.nuget.org/v3/index.json - run: | - dotnet nuget push -s ${{ env.SOURCE_URL }} -k ${{ env.NUGET_AUTH_TOKEN }} **/*.nupkg + build: + uses: reactiveui/actions-common/.github/workflows/workflow-common-release.yml@main + with: + configuration: Release + productNamespacePrefix: "Splat" + useVisualStudioPreview: false + useMauiCheckDotNetTool: false From da4aec63aa9c7d42d8d15e3b81b27f31f60920d0 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:32:34 +1100 Subject: [PATCH 58/66] housekeeping: Rename release job --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b17c44c6..49e58767c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ env: productNamespacePrefix: "Splat" jobs: - build: + release: uses: reactiveui/actions-common/.github/workflows/workflow-common-release.yml@main with: configuration: Release From 2fefb944e1c338a76566bb1b7dba1127f9803f85 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:55:13 +1100 Subject: [PATCH 59/66] housekeeping: Reference required secrets --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49e58767c..af3e87784 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,3 +17,7 @@ jobs: productNamespacePrefix: "Splat" useVisualStudioPreview: false useMauiCheckDotNetTool: false + SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }} + SIGN_CLIENT_SECRET: ${{ secrets.SIGN_CLIENT_SECRET }} + SIGN_CLIENT_CONFIG: ${{ secrets.SIGN_CLIENT_CONFIG }} + NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} From dc162186472f3141fff571d1574ef0883cf3857e Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:57:50 +1100 Subject: [PATCH 60/66] fix: syntax for passing in secrets --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af3e87784..1f8d68ffe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,6 +17,7 @@ jobs: productNamespacePrefix: "Splat" useVisualStudioPreview: false useMauiCheckDotNetTool: false + secrets: SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }} SIGN_CLIENT_SECRET: ${{ secrets.SIGN_CLIENT_SECRET }} SIGN_CLIENT_CONFIG: ${{ secrets.SIGN_CLIENT_CONFIG }} From 045e9fc2bf1c3c4352db731315261baee4833338 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:59:45 +1100 Subject: [PATCH 61/66] housekeeping: only run release on push to main --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f8d68ffe..5cbbec6cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,9 +3,7 @@ name: Build on: push: branches: [ main ] - pull_request: - branches: [ main ] - + env: productNamespacePrefix: "Splat" From 846355d9cea51ecbffcb09572cc486f05ee9696b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Nov 2021 01:14:22 +0000 Subject: [PATCH 62/66] build(deps): bump Verify.Xunit from 14.5.0 to 14.6.2 in /src (#828) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 14.5.0 to 14.6.2. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/14.5.0...14.6.2) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index fd116993c..6e0f8d8f7 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From 872481220717e2568f3a54ade57fe1495e858693 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 21:21:19 +0000 Subject: [PATCH 63/66] build(deps): bump Verify.Xunit from 14.6.2 to 14.6.6 in /src (#829) Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 14.6.2 to 14.6.6. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/14.6.2...14.6.6) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 6e0f8d8f7..eeb201644 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + From 0195fdeae54bbe25b51d22c76d8bd8cbb45e10fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Nov 2021 07:40:35 +0000 Subject: [PATCH 64/66] build(deps): bump Roslynator.Analyzers from 3.2.2 to 3.3.0 in /src (#830) Bumps [Roslynator.Analyzers](https://github.com/JosefPihrt/Roslynator) from 3.2.2 to 3.3.0. - [Release notes](https://github.com/JosefPihrt/Roslynator/releases) - [Changelog](https://github.com/JosefPihrt/Roslynator/blob/master/ChangeLog.md) - [Commits](https://github.com/JosefPihrt/Roslynator/compare/v3.2.2...v3.3.0) --- updated-dependencies: - dependency-name: Roslynator.Analyzers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index eeb201644..cf3af56b2 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -75,7 +75,7 @@ - + From dbf160af9a4b68c81c40dffd626385db28809616 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Wed, 1 Dec 2021 10:02:00 +1100 Subject: [PATCH 65/66] breaking: Remove net 5 support (#831) --- README.md | 2 +- src/Benchmarks/Splat.Benchmarks.csproj | 2 +- .../ReactiveUI.DI.Tests.csproj | 22 +- src/Splat.AppCenter/Splat.AppCenter.csproj | 2 +- .../Splat.ApplicationInsights.csproj | 2 +- .../Splat.Autofac.Tests.csproj | 2 +- src/Splat.Autofac/Splat.Autofac.csproj | 2 +- .../Splat.Common.Test.csproj | 2 +- ...ests.SplatUIProject.DotNet6_0.verified.txt | 450 ++++++++++++++++++ .../Splat.Drawing.Tests.csproj | 2 +- src/Splat.Drawing/Splat.Drawing.csproj | 4 +- .../Splat.DryIoc.Tests.csproj | 2 +- src/Splat.DryIoc/Splat.DryIoc.csproj | 2 +- .../Splat.Exceptionless.csproj | 2 +- src/Splat.Log4Net/Splat.Log4Net.csproj | 2 +- ...xtensions.DependencyInjection.Tests.csproj | 2 +- .../MicrosoftDependencyResolver.cs | 14 +- ...soft.Extensions.DependencyInjection.csproj | 4 +- .../Splat.Microsoft.Extensions.Logging.csproj | 2 +- src/Splat.NLog/Splat.NLog.csproj | 2 +- .../Splat.Ninject.Tests.csproj | 2 +- src/Splat.Ninject/Splat.Ninject.csproj | 2 +- .../Splat.Prism.Forms.csproj | 2 +- .../Splat.Prism.Tests.csproj | 2 +- src/Splat.Prism/Splat.Prism.csproj | 2 +- src/Splat.Raygun/Splat.Raygun.csproj | 2 +- src/Splat.Serilog/Splat.Serilog.csproj | 2 +- .../Splat.SimpleInjector.Tests.csproj | 2 +- .../Splat.SimpleInjector.csproj | 2 +- .../Splat.TestRunner.Android.csproj | 2 +- src/Splat.Tests/Splat.Tests.csproj | 2 +- src/Splat/Splat.csproj | 2 +- src/Splat/TargetFrameworkExtensions.cs | 1 + 33 files changed, 496 insertions(+), 53 deletions(-) create mode 100644 src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet6_0.verified.txt diff --git a/README.md b/README.md index d0ea484ee..73f248361 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Splat currently supports: [Always Be NuGetting](https://nuget.org/packages/Splat/). Package contains binaries for: -* .NET Framework 4.6.1, .NET Framework 4.7.2, .NET Standard 2.0 and .NET 5.0 +* .NET Framework 4.6.1, .NET Framework 4.7.2, .NET Standard 2.0 and .NET 6.0 * WPF * Windows Forms * UWP diff --git a/src/Benchmarks/Splat.Benchmarks.csproj b/src/Benchmarks/Splat.Benchmarks.csproj index 24180929a..1e56aee88 100644 --- a/src/Benchmarks/Splat.Benchmarks.csproj +++ b/src/Benchmarks/Splat.Benchmarks.csproj @@ -2,7 +2,7 @@ false - net5.0 + net6.0 AnyCPU pdbonly true diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index b71197d86..41c3549de 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -1,22 +1,13 @@ - net462;net472;netcoreapp3.1;net5.0; + net472;net6.0; $(NoWarn);1591;CA1707;SA1633;CA2000 false latest - - - - - - - - - @@ -26,16 +17,7 @@ - - - - - - - - - - + diff --git a/src/Splat.AppCenter/Splat.AppCenter.csproj b/src/Splat.AppCenter/Splat.AppCenter.csproj index 07b5b2025..66a9cd0b0 100644 --- a/src/Splat.AppCenter/Splat.AppCenter.csproj +++ b/src/Splat.AppCenter/Splat.AppCenter.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0 + netstandard2.0;net6.0-windows10.0.17763.0 Splat.AppCenter Splat diff --git a/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj b/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj index b65430cb4..0df7f393e 100644 --- a/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj +++ b/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Splat.ApplicationInsights Splat diff --git a/src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj b/src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj index b4004bf4d..36cf90ea3 100644 --- a/src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj +++ b/src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj @@ -1,7 +1,7 @@  - net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0;netcoreapp3.1 + net6.0-windows10.0.17763.0 false $(NoWarn);1591;CA1707;SA1633;CA2000 diff --git a/src/Splat.Autofac/Splat.Autofac.csproj b/src/Splat.Autofac/Splat.Autofac.csproj index 1e0947471..6888be018 100644 --- a/src/Splat.Autofac/Splat.Autofac.csproj +++ b/src/Splat.Autofac/Splat.Autofac.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Autofac adapter for Splat latest diff --git a/src/Splat.Common.Test/Splat.Common.Test.csproj b/src/Splat.Common.Test/Splat.Common.Test.csproj index 120618602..5ba929473 100644 --- a/src/Splat.Common.Test/Splat.Common.Test.csproj +++ b/src/Splat.Common.Test/Splat.Common.Test.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(NoWarn);CA2000 latest enable diff --git a/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet6_0.verified.txt b/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet6_0.verified.txt new file mode 100644 index 000000000..879a4c96e --- /dev/null +++ b/src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet6_0.verified.txt @@ -0,0 +1,450 @@ +[assembly: System.Resources.NeutralResourcesLanguage("en-US")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")] +[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows7.0")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName="")] +[assembly: System.Runtime.Versioning.TargetPlatform("Windows7.0")] +namespace Splat +{ + public static class BitmapLoader + { + public static Splat.IBitmapLoader Current { get; set; } + } + [System.Serializable] + public class BitmapLoaderException : System.Exception + { + public BitmapLoaderException() { } + public BitmapLoaderException(string message) { } + protected BitmapLoaderException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } + public BitmapLoaderException(string message, System.Exception innerException) { } + } + public static class BitmapMixins + { + public static Splat.IBitmap FromNative(this System.Windows.Media.Imaging.BitmapSource value) { } + public static System.Windows.Media.Imaging.BitmapSource ToNative(this Splat.IBitmap value) { } + } + public static class ColorExtensions + { + public static System.Drawing.Color FromNative(this System.Windows.Media.Color value) { } + public static System.Windows.Media.Color ToNative(this System.Drawing.Color value) { } + public static System.Windows.Media.SolidColorBrush ToNativeBrush(this System.Drawing.Color value) { } + } + public enum CompressedBitmapFormat + { + Png = 0, + Jpeg = 1, + } + public class DefaultPlatformModeDetector : Splat.IPlatformModeDetector + { + public DefaultPlatformModeDetector() { } + public bool? InDesignMode() { } + } + public interface IBitmap : System.IDisposable + { + float Height { get; } + float Width { get; } + System.Threading.Tasks.Task Save(Splat.CompressedBitmapFormat format, float quality, System.IO.Stream target); + } + public interface IBitmapLoader + { + Splat.IBitmap? Create(float width, float height); + System.Threading.Tasks.Task Load(System.IO.Stream sourceStream, float? desiredWidth, float? desiredHeight); + System.Threading.Tasks.Task LoadFromResource(string source, float? desiredWidth, float? desiredHeight); + } + public interface IPlatformModeDetector + { + bool? InDesignMode(); + } + public enum KnownColor + { + Empty = 0, + ActiveBorder = 1, + ActiveCaption = 2, + ActiveCaptionText = 3, + AppWorkspace = 4, + Control = 5, + ControlDark = 6, + ControlDarkDark = 7, + ControlLight = 8, + ControlLightLight = 9, + ControlText = 10, + Desktop = 11, + GrayText = 12, + Highlight = 13, + HighlightText = 14, + HotTrack = 15, + InactiveBorder = 16, + InactiveCaption = 17, + InactiveCaptionText = 18, + Info = 19, + InfoText = 20, + Menu = 21, + MenuText = 22, + ScrollBar = 23, + Window = 24, + WindowFrame = 25, + WindowText = 26, + Transparent = 27, + AliceBlue = 28, + AntiqueWhite = 29, + Aqua = 30, + Aquamarine = 31, + Azure = 32, + Beige = 33, + Bisque = 34, + Black = 35, + BlanchedAlmond = 36, + Blue = 37, + BlueViolet = 38, + Brown = 39, + BurlyWood = 40, + CadetBlue = 41, + Chartreuse = 42, + Chocolate = 43, + Coral = 44, + CornflowerBlue = 45, + Cornsilk = 46, + Crimson = 47, + Cyan = 48, + DarkBlue = 49, + DarkCyan = 50, + DarkGoldenrod = 51, + DarkGray = 52, + DarkGreen = 53, + DarkKhaki = 54, + DarkMagenta = 55, + DarkOliveGreen = 56, + DarkOrange = 57, + DarkOrchid = 58, + DarkRed = 59, + DarkSalmon = 60, + DarkSeaGreen = 61, + DarkSlateBlue = 62, + DarkSlateGray = 63, + DarkTurquoise = 64, + DarkViolet = 65, + DeepPink = 66, + DeepSkyBlue = 67, + DimGray = 68, + DodgerBlue = 69, + Firebrick = 70, + FloralWhite = 71, + ForestGreen = 72, + Fuchsia = 73, + Gainsboro = 74, + GhostWhite = 75, + Gold = 76, + Goldenrod = 77, + Gray = 78, + Green = 79, + GreenYellow = 80, + Honeydew = 81, + HotPink = 82, + IndianRed = 83, + Indigo = 84, + Ivory = 85, + Khaki = 86, + Lavender = 87, + LavenderBlush = 88, + LawnGreen = 89, + LemonChiffon = 90, + LightBlue = 91, + LightCoral = 92, + LightCyan = 93, + LightGoldenrodYellow = 94, + LightGray = 95, + LightGreen = 96, + LightPink = 97, + LightSalmon = 98, + LightSeaGreen = 99, + LightSkyBlue = 100, + LightSlateGray = 101, + LightSteelBlue = 102, + LightYellow = 103, + Lime = 104, + LimeGreen = 105, + Linen = 106, + Magenta = 107, + Maroon = 108, + MediumAquamarine = 109, + MediumBlue = 110, + MediumOrchid = 111, + MediumPurple = 112, + MediumSeaGreen = 113, + MediumSlateBlue = 114, + MediumSpringGreen = 115, + MediumTurquoise = 116, + MediumVioletRed = 117, + MidnightBlue = 118, + MintCream = 119, + MistyRose = 120, + Moccasin = 121, + NavajoWhite = 122, + Navy = 123, + OldLace = 124, + Olive = 125, + OliveDrab = 126, + Orange = 127, + OrangeRed = 128, + Orchid = 129, + PaleGoldenrod = 130, + PaleGreen = 131, + PaleTurquoise = 132, + PaleVioletRed = 133, + PapayaWhip = 134, + PeachPuff = 135, + Peru = 136, + Pink = 137, + Plum = 138, + PowderBlue = 139, + Purple = 140, + Red = 141, + RosyBrown = 142, + RoyalBlue = 143, + SaddleBrown = 144, + Salmon = 145, + SandyBrown = 146, + SeaGreen = 147, + SeaShell = 148, + Sienna = 149, + Silver = 150, + SkyBlue = 151, + SlateBlue = 152, + SlateGray = 153, + Snow = 154, + SpringGreen = 155, + SteelBlue = 156, + Tan = 157, + Teal = 158, + Thistle = 159, + Tomato = 160, + Turquoise = 161, + Violet = 162, + Wheat = 163, + White = 164, + WhiteSmoke = 165, + Yellow = 166, + YellowGreen = 167, + ButtonFace = 168, + ButtonHighlight = 169, + ButtonShadow = 170, + GradientActiveCaption = 171, + GradientInactiveCaption = 172, + MenuBar = 173, + MenuHighlight = 174, + } + public class PlatformBitmapLoader : Splat.IBitmapLoader + { + public PlatformBitmapLoader() { } + public Splat.IBitmap Create(float width, float height) { } + public System.Threading.Tasks.Task Load(System.IO.Stream sourceStream, float? desiredWidth, float? desiredHeight) { } + public System.Threading.Tasks.Task LoadFromResource(string source, float? desiredWidth, float? desiredHeight) { } + } + public static class PlatformModeDetector + { + public static bool InDesignMode() { } + public static void OverrideModeDetector(Splat.IPlatformModeDetector modeDetector) { } + } + public static class PointExtensions + { + public static System.Drawing.PointF FromNative(this System.Windows.Point value) { } + public static System.Windows.Point ToNative(this System.Drawing.Point value) { } + public static System.Windows.Point ToNative(this System.Drawing.PointF value) { } + } + public static class RectExtensions + { + public static System.Drawing.RectangleF FromNative(this System.Windows.Rect value) { } + public static System.Windows.Rect ToNative(this System.Drawing.Rectangle value) { } + public static System.Windows.Rect ToNative(this System.Drawing.RectangleF value) { } + } + public static class ServiceLocationDrawingInitialization + { + public static void RegisterPlatformBitmapLoader(this Splat.IMutableDependencyResolver resolver) { } + } + public static class SizeExtensions + { + public static System.Drawing.SizeF FromNative(this System.Windows.Size value) { } + public static System.Windows.Size ToNative(this System.Drawing.Size value) { } + public static System.Windows.Size ToNative(this System.Drawing.SizeF value) { } + } + [System.Runtime.Serialization.DataContract] + public struct SplatColor : System.IEquatable + { + public byte A { get; } + public byte B { get; } + public byte G { get; } + public bool IsEmpty { get; } + public bool IsKnownColor { get; } + public bool IsNamedColor { get; } + public bool IsSystemColor { get; } + public string Name { get; } + public byte R { get; } + public static Splat.SplatColor AliceBlue { get; } + public static Splat.SplatColor AntiqueWhite { get; } + public static Splat.SplatColor Aqua { get; } + public static Splat.SplatColor Aquamarine { get; } + public static Splat.SplatColor Azure { get; } + public static Splat.SplatColor Beige { get; } + public static Splat.SplatColor Bisque { get; } + public static Splat.SplatColor Black { get; } + public static Splat.SplatColor BlanchedAlmond { get; } + public static Splat.SplatColor Blue { get; } + public static Splat.SplatColor BlueViolet { get; } + public static Splat.SplatColor Brown { get; } + public static Splat.SplatColor BurlyWood { get; } + public static Splat.SplatColor CadetBlue { get; } + public static Splat.SplatColor Chartreuse { get; } + public static Splat.SplatColor Chocolate { get; } + public static Splat.SplatColor Coral { get; } + public static Splat.SplatColor CornflowerBlue { get; } + public static Splat.SplatColor Cornsilk { get; } + public static Splat.SplatColor Crimson { get; } + public static Splat.SplatColor Cyan { get; } + public static Splat.SplatColor DarkBlue { get; } + public static Splat.SplatColor DarkCyan { get; } + public static Splat.SplatColor DarkGoldenrod { get; } + public static Splat.SplatColor DarkGray { get; } + public static Splat.SplatColor DarkGreen { get; } + public static Splat.SplatColor DarkKhaki { get; } + public static Splat.SplatColor DarkMagenta { get; } + public static Splat.SplatColor DarkOliveGreen { get; } + public static Splat.SplatColor DarkOrange { get; } + public static Splat.SplatColor DarkOrchid { get; } + public static Splat.SplatColor DarkRed { get; } + public static Splat.SplatColor DarkSalmon { get; } + public static Splat.SplatColor DarkSeaGreen { get; } + public static Splat.SplatColor DarkSlateBlue { get; } + public static Splat.SplatColor DarkSlateGray { get; } + public static Splat.SplatColor DarkTurquoise { get; } + public static Splat.SplatColor DarkViolet { get; } + public static Splat.SplatColor DeepPink { get; } + public static Splat.SplatColor DeepSkyBlue { get; } + public static Splat.SplatColor DimGray { get; } + public static Splat.SplatColor DodgerBlue { get; } + public static Splat.SplatColor Empty { get; } + public static Splat.SplatColor Firebrick { get; } + public static Splat.SplatColor FloralWhite { get; } + public static Splat.SplatColor ForestGreen { get; } + public static Splat.SplatColor Fuchsia { get; } + public static Splat.SplatColor Gainsboro { get; } + public static Splat.SplatColor GhostWhite { get; } + public static Splat.SplatColor Gold { get; } + public static Splat.SplatColor Goldenrod { get; } + public static Splat.SplatColor Gray { get; } + public static Splat.SplatColor Green { get; } + public static Splat.SplatColor GreenYellow { get; } + public static Splat.SplatColor Honeydew { get; } + public static Splat.SplatColor HotPink { get; } + public static Splat.SplatColor IndianRed { get; } + public static Splat.SplatColor Indigo { get; } + public static Splat.SplatColor Ivory { get; } + public static Splat.SplatColor Khaki { get; } + public static Splat.SplatColor Lavender { get; } + public static Splat.SplatColor LavenderBlush { get; } + public static Splat.SplatColor LawnGreen { get; } + public static Splat.SplatColor LemonChiffon { get; } + public static Splat.SplatColor LightBlue { get; } + public static Splat.SplatColor LightCoral { get; } + public static Splat.SplatColor LightCyan { get; } + public static Splat.SplatColor LightGoldenrodYellow { get; } + public static Splat.SplatColor LightGray { get; } + public static Splat.SplatColor LightGreen { get; } + public static Splat.SplatColor LightPink { get; } + public static Splat.SplatColor LightSalmon { get; } + public static Splat.SplatColor LightSeaGreen { get; } + public static Splat.SplatColor LightSkyBlue { get; } + public static Splat.SplatColor LightSlateGray { get; } + public static Splat.SplatColor LightSteelBlue { get; } + public static Splat.SplatColor LightYellow { get; } + public static Splat.SplatColor Lime { get; } + public static Splat.SplatColor LimeGreen { get; } + public static Splat.SplatColor Linen { get; } + public static Splat.SplatColor Magenta { get; } + public static Splat.SplatColor Maroon { get; } + public static Splat.SplatColor MediumAquamarine { get; } + public static Splat.SplatColor MediumBlue { get; } + public static Splat.SplatColor MediumOrchid { get; } + public static Splat.SplatColor MediumPurple { get; } + public static Splat.SplatColor MediumSeaGreen { get; } + public static Splat.SplatColor MediumSlateBlue { get; } + public static Splat.SplatColor MediumSpringGreen { get; } + public static Splat.SplatColor MediumTurquoise { get; } + public static Splat.SplatColor MediumVioletRed { get; } + public static Splat.SplatColor MidnightBlue { get; } + public static Splat.SplatColor MintCream { get; } + public static Splat.SplatColor MistyRose { get; } + public static Splat.SplatColor Moccasin { get; } + public static Splat.SplatColor NavajoWhite { get; } + public static Splat.SplatColor Navy { get; } + public static Splat.SplatColor OldLace { get; } + public static Splat.SplatColor Olive { get; } + public static Splat.SplatColor OliveDrab { get; } + public static Splat.SplatColor Orange { get; } + public static Splat.SplatColor OrangeRed { get; } + public static Splat.SplatColor Orchid { get; } + public static Splat.SplatColor PaleGoldenrod { get; } + public static Splat.SplatColor PaleGreen { get; } + public static Splat.SplatColor PaleTurquoise { get; } + public static Splat.SplatColor PaleVioletRed { get; } + public static Splat.SplatColor PapayaWhip { get; } + public static Splat.SplatColor PeachPuff { get; } + public static Splat.SplatColor Peru { get; } + public static Splat.SplatColor Pink { get; } + public static Splat.SplatColor Plum { get; } + public static Splat.SplatColor PowderBlue { get; } + public static Splat.SplatColor Purple { get; } + public static Splat.SplatColor Red { get; } + public static Splat.SplatColor RosyBrown { get; } + public static Splat.SplatColor RoyalBlue { get; } + public static Splat.SplatColor SaddleBrown { get; } + public static Splat.SplatColor Salmon { get; } + public static Splat.SplatColor SandyBrown { get; } + public static Splat.SplatColor SeaGreen { get; } + public static Splat.SplatColor SeaShell { get; } + public static Splat.SplatColor Sienna { get; } + public static Splat.SplatColor Silver { get; } + public static Splat.SplatColor SkyBlue { get; } + public static Splat.SplatColor SlateBlue { get; } + public static Splat.SplatColor SlateGray { get; } + public static Splat.SplatColor Snow { get; } + public static Splat.SplatColor SpringGreen { get; } + public static Splat.SplatColor SteelBlue { get; } + public static Splat.SplatColor Tan { get; } + public static Splat.SplatColor Teal { get; } + public static Splat.SplatColor Thistle { get; } + public static Splat.SplatColor Tomato { get; } + public static Splat.SplatColor Transparent { get; } + public static Splat.SplatColor Turquoise { get; } + public static Splat.SplatColor Violet { get; } + public static Splat.SplatColor Wheat { get; } + public static Splat.SplatColor White { get; } + public static Splat.SplatColor WhiteSmoke { get; } + public static Splat.SplatColor Yellow { get; } + public static Splat.SplatColor YellowGreen { get; } + public bool Equals(Splat.SplatColor other) { } + public override bool Equals(object? obj) { } + public float GetBrightness() { } + public override int GetHashCode() { } + public float GetHue() { } + public float GetSaturation() { } + public uint ToArgb() { } + public Splat.KnownColor ToKnownColor() { } + public override string ToString() { } + public static Splat.SplatColor FromArgb(uint argb) { } + public static Splat.SplatColor FromArgb(int alpha, Splat.SplatColor baseColor) { } + public static Splat.SplatColor FromArgb(int red, int green, int blue) { } + public static Splat.SplatColor FromArgb(int alpha, int red, int green, int blue) { } + public static Splat.SplatColor FromKnownColor(Splat.KnownColor color) { } + public static Splat.SplatColor FromName(string name) { } + public static bool operator !=(Splat.SplatColor left, Splat.SplatColor right) { } + public static bool operator ==(Splat.SplatColor left, Splat.SplatColor right) { } + } + public static class SplatColorExtensions + { + public static Splat.SplatColor FromNative(this System.Windows.Media.Color value) { } + public static System.Windows.Media.Color ToNative(this Splat.SplatColor value) { } + public static System.Windows.Media.SolidColorBrush ToNativeBrush(this Splat.SplatColor value) { } + } +} \ No newline at end of file diff --git a/src/Splat.Drawing.Tests/Splat.Drawing.Tests.csproj b/src/Splat.Drawing.Tests/Splat.Drawing.Tests.csproj index 7dd32d0b0..ad9abcf88 100644 --- a/src/Splat.Drawing.Tests/Splat.Drawing.Tests.csproj +++ b/src/Splat.Drawing.Tests/Splat.Drawing.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net5.0-windows + net6.0-windows false $(NoWarn);1591;CA1707;SA1633;CA2000;CA1034 latest diff --git a/src/Splat.Drawing/Splat.Drawing.csproj b/src/Splat.Drawing/Splat.Drawing.csproj index d27065b7b..071bb9b31 100644 --- a/src/Splat.Drawing/Splat.Drawing.csproj +++ b/src/Splat.Drawing/Splat.Drawing.csproj @@ -1,8 +1,8 @@ - MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;netstandard2.0;net5.0;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos - $(TargetFrameworks);net461;net472;uap10.0.16299;netcoreapp3.1;net5.0-windows;net6.0-windows + MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;netstandard2.0;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos + $(TargetFrameworks);net461;net472;uap10.0.16299;net6.0-windows Splat .NET Foundation and Contributors A library to make things cross-platform that should be diff --git a/src/Splat.DryIoc.Tests/Splat.DryIoc.Tests.csproj b/src/Splat.DryIoc.Tests/Splat.DryIoc.Tests.csproj index e40f23a1d..9a2992410 100644 --- a/src/Splat.DryIoc.Tests/Splat.DryIoc.Tests.csproj +++ b/src/Splat.DryIoc.Tests/Splat.DryIoc.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0 $(NoWarn);1591;CA1707;SA1633;CA2000 latest enable diff --git a/src/Splat.DryIoc/Splat.DryIoc.csproj b/src/Splat.DryIoc/Splat.DryIoc.csproj index 3f242b39d..bd8ecca20 100644 --- a/src/Splat.DryIoc/Splat.DryIoc.csproj +++ b/src/Splat.DryIoc/Splat.DryIoc.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 $(NoWarn);CA1801 DryIoc adapter for Splat diff --git a/src/Splat.Exceptionless/Splat.Exceptionless.csproj b/src/Splat.Exceptionless/Splat.Exceptionless.csproj index 39e7246ee..bd406f185 100644 --- a/src/Splat.Exceptionless/Splat.Exceptionless.csproj +++ b/src/Splat.Exceptionless/Splat.Exceptionless.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Splat.Exceptionless Splat diff --git a/src/Splat.Log4Net/Splat.Log4Net.csproj b/src/Splat.Log4Net/Splat.Log4Net.csproj index 9309bf934..578303437 100644 --- a/src/Splat.Log4Net/Splat.Log4Net.csproj +++ b/src/Splat.Log4Net/Splat.Log4Net.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Splat.Log4Net Splat diff --git a/src/Splat.Microsoft.Extensions.DependencyInjection.Tests/Splat.Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/Splat.Microsoft.Extensions.DependencyInjection.Tests/Splat.Microsoft.Extensions.DependencyInjection.Tests.csproj index 62b413b00..cad328aa3 100644 --- a/src/Splat.Microsoft.Extensions.DependencyInjection.Tests/Splat.Microsoft.Extensions.DependencyInjection.Tests.csproj +++ b/src/Splat.Microsoft.Extensions.DependencyInjection.Tests/Splat.Microsoft.Extensions.DependencyInjection.Tests.csproj @@ -1,7 +1,7 @@  - net5.0;netcoreapp3.1 + net6.0 $(NoWarn);1591;CA1707;SA1633;CA2000 false latest diff --git a/src/Splat.Microsoft.Extensions.DependencyInjection/MicrosoftDependencyResolver.cs b/src/Splat.Microsoft.Extensions.DependencyInjection/MicrosoftDependencyResolver.cs index a37e1a20e..7bcdeda90 100644 --- a/src/Splat.Microsoft.Extensions.DependencyInjection/MicrosoftDependencyResolver.cs +++ b/src/Splat.Microsoft.Extensions.DependencyInjection/MicrosoftDependencyResolver.cs @@ -46,7 +46,7 @@ public MicrosoftDependencyResolver(IServiceProvider serviceProvider) => /// Gets the internal Microsoft conainer, /// or build new if this instance was not initialized with one. /// - protected virtual IServiceProvider ServiceProvider + protected virtual IServiceProvider? ServiceProvider { get { @@ -54,7 +54,7 @@ protected virtual IServiceProvider ServiceProvider { if (_serviceProvider is null) { - _serviceProvider = _serviceCollection.BuildServiceProvider(); + _serviceProvider = _serviceCollection?.BuildServiceProvider(); } return _serviceProvider; @@ -88,6 +88,11 @@ public void UpdateContainer(IServiceProvider serviceProvider) /// public virtual IEnumerable GetServices(Type? serviceType, string? contract = null) { + if (ServiceProvider is null) + { + throw new InvalidOperationException("The ServiceProvider is null."); + } + var isNull = serviceType is null; if (serviceType is null) { @@ -324,6 +329,11 @@ private void RemoveContractService(Type serviceType) { var dicType = GetDictionaryType(serviceType); + if (ServiceProvider is null) + { + throw new InvalidOperationException("The ServiceProvider is null."); + } + if (_isImmutable) { return (ContractDictionary?)ServiceProvider.GetService(dicType); diff --git a/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj b/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj index a183087d1..5406e8821 100644 --- a/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj +++ b/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj @@ -1,14 +1,14 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 latest enable - + diff --git a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj index 40435412b..754cbe900 100644 --- a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj +++ b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Splat.Microsoft.Extensions.Logging Splat diff --git a/src/Splat.NLog/Splat.NLog.csproj b/src/Splat.NLog/Splat.NLog.csproj index ce08a5de5..3393d26f7 100644 --- a/src/Splat.NLog/Splat.NLog.csproj +++ b/src/Splat.NLog/Splat.NLog.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Splat.NLog Splat diff --git a/src/Splat.Ninject.Tests/Splat.Ninject.Tests.csproj b/src/Splat.Ninject.Tests/Splat.Ninject.Tests.csproj index 891b3a251..8d7b57494 100644 --- a/src/Splat.Ninject.Tests/Splat.Ninject.Tests.csproj +++ b/src/Splat.Ninject.Tests/Splat.Ninject.Tests.csproj @@ -1,7 +1,7 @@  - net5.0;netcoreapp3.1 + net6.0 $(NoWarn);1591;CA1707;SA1633;CA2000 false latest diff --git a/src/Splat.Ninject/Splat.Ninject.csproj b/src/Splat.Ninject/Splat.Ninject.csproj index 4d8343c97..98c6b3f01 100644 --- a/src/Splat.Ninject/Splat.Ninject.csproj +++ b/src/Splat.Ninject/Splat.Ninject.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Autofac adapter for Splat latest diff --git a/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj b/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj index d8473ec26..1b45d4aff 100644 --- a/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj +++ b/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Prism adapter for Splat including Xamarin Forms adapters. latest diff --git a/src/Splat.Prism.Tests/Splat.Prism.Tests.csproj b/src/Splat.Prism.Tests/Splat.Prism.Tests.csproj index 9798eae14..4f3bad292 100644 --- a/src/Splat.Prism.Tests/Splat.Prism.Tests.csproj +++ b/src/Splat.Prism.Tests/Splat.Prism.Tests.csproj @@ -1,7 +1,7 @@  - net5.0;netcoreapp3.1 + net6.0 $(NoWarn);CA1707;CS1574 latest enable diff --git a/src/Splat.Prism/Splat.Prism.csproj b/src/Splat.Prism/Splat.Prism.csproj index c8bdc6477..88e9ea592 100644 --- a/src/Splat.Prism/Splat.Prism.csproj +++ b/src/Splat.Prism/Splat.Prism.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Prism adapter for Splat latest diff --git a/src/Splat.Raygun/Splat.Raygun.csproj b/src/Splat.Raygun/Splat.Raygun.csproj index 32d892658..48211a715 100644 --- a/src/Splat.Raygun/Splat.Raygun.csproj +++ b/src/Splat.Raygun/Splat.Raygun.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Splat.Raygun Splat diff --git a/src/Splat.Serilog/Splat.Serilog.csproj b/src/Splat.Serilog/Splat.Serilog.csproj index d82fede15..c65b4f51d 100644 --- a/src/Splat.Serilog/Splat.Serilog.csproj +++ b/src/Splat.Serilog/Splat.Serilog.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 Splat.Serilog Splat diff --git a/src/Splat.SimpleInjector.Tests/Splat.SimpleInjector.Tests.csproj b/src/Splat.SimpleInjector.Tests/Splat.SimpleInjector.Tests.csproj index bab1213df..0bf239e43 100644 --- a/src/Splat.SimpleInjector.Tests/Splat.SimpleInjector.Tests.csproj +++ b/src/Splat.SimpleInjector.Tests/Splat.SimpleInjector.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0 $(NoWarn);1591;CA1707;SA1633;CA2000 latest enable diff --git a/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj b/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj index e8f294f72..f0e152e52 100644 --- a/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj +++ b/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 $(TargetFrameworks);net461 SimpleInjector adapter for Splat latest diff --git a/src/Splat.TestRunner.Android/Splat.TestRunner.Android.csproj b/src/Splat.TestRunner.Android/Splat.TestRunner.Android.csproj index 9f7a9eb44..574d12203 100644 --- a/src/Splat.TestRunner.Android/Splat.TestRunner.Android.csproj +++ b/src/Splat.TestRunner.Android/Splat.TestRunner.Android.csproj @@ -16,7 +16,7 @@ Resources\Resource.Designer.cs Off false - v9.0 + v10.0 Properties\AndroidManifest.xml true false diff --git a/src/Splat.Tests/Splat.Tests.csproj b/src/Splat.Tests/Splat.Tests.csproj index b5d76eece..a548f2a98 100644 --- a/src/Splat.Tests/Splat.Tests.csproj +++ b/src/Splat.Tests/Splat.Tests.csproj @@ -1,7 +1,7 @@ - net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0;netcoreapp3.1 + net6.0-windows $(NoWarn);1591;CA1707;SA1633;CA2000;CA1034 latest latest diff --git a/src/Splat/Splat.csproj b/src/Splat/Splat.csproj index 529d46acb..6fc4b9061 100644 --- a/src/Splat/Splat.csproj +++ b/src/Splat/Splat.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net5.0;net6.0 + netstandard2.0;net6.0 Splat Splat .NET Foundation and Contributors diff --git a/src/Splat/TargetFrameworkExtensions.cs b/src/Splat/TargetFrameworkExtensions.cs index f1314dccc..4714d3e53 100644 --- a/src/Splat/TargetFrameworkExtensions.cs +++ b/src/Splat/TargetFrameworkExtensions.cs @@ -29,6 +29,7 @@ public static class TargetFrameworkExtensions { return frameworkName switch { + ".NETCoreApp,Version=v6.0" => "net6.0", ".NETCoreApp,Version=v5.0" => "net5.0", ".NETCoreApp,Version=v3.1" => "netcoreapp3.1", ".NETCoreApp,Version=v3.0" => "netcoreapp3.0", From 52f8dfeb313520dd1f359d0ff60fab205e33a718 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Wed, 1 Dec 2021 10:03:20 +1100 Subject: [PATCH 66/66] housekeeping: Release 14.1.x --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 5aec3477b..e83a5c2fe 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "13.1", + "version": "14.1", "publicReleaseRefSpec": [ "^refs/heads/main$", // we release out of master "^refs/heads/preview/.*", // we release previews