Merge 4c91ec436f into 5ff7b68b37

2024-11-10 07:55:43 +00:00 · 2023-09-12 23:52:27 +00:00
16 changed files with 20 additions and 28 deletions
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@ -25,7 +25,6 @@ jobs:
        dotnet-version: |
          6.0.x
          7.0.x
-          8.0.x

    - name: Add NuGet source
      run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
@ -41,6 +40,3 @@ jobs:

    - name: Test .NET 7
      run: dotnet test --no-build --verbosity normal --configuration Release --framework net7.0
-
-    - name: Test .NET 8
-      run: dotnet test --no-build --verbosity normal --configuration Release --framework net8.0
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -18,7 +18,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 7.0.x

    - name: Add GitHub NuGet source
      run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@ -17,7 +17,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 7.0.x

    - name: Add GitHub NuGet source
      run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -17,7 +17,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 7.0.x

    - name: Add GitHub NuGet source
      run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
--- a/.github/workflows/source_validator.yml
+++ b/.github/workflows/source_validator.yml
@ -19,7 +19,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 7.0.x

    - name: Add GitHub NuGet source
      run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -46,7 +46,6 @@ TypeInitializationException.

 - X10D: Removed `IEnumerable<T>.ConcatOne` - this functionality already exists with `Append`.
 - X10D: Removed `Endianness` enum.
- X10D: Removed `Span<T>.Replace(T, T)` for .NET 8 target.
 - X10D: Removed .NET Standard 2.1 target.
 - X10D.Hosting: Removed .NET Standard 2.1 target.
 - X10D.DSharpPlus: Complete sunset of library. This library will not be updated to support DSharpPlus v5.0.0 (#83).
--- a/X10D.Hosting/X10D.Hosting.csproj
+++ b/X10D.Hosting/X10D.Hosting.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
    </PropertyGroup>

    <ItemGroup>
--- a/X10D.Tests/X10D.Tests.csproj
+++ b/X10D.Tests/X10D.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
        <IsPackable>false</IsPackable>
        <IsTestProject>true</IsTestProject>
        <CoverletOutputFormat>json,cobertura</CoverletOutputFormat>
@ -14,14 +14,14 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="NSubstitute" Version="5.1.0"/>
-        <PackageReference Include="NUnit" Version="3.14.0"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
-        <PackageReference Include="NUnit.Analyzers" Version="3.9.0"/>
-        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
-        <PackageReference Include="System.Reactive" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0"/>
+        <PackageReference Include="NSubstitute" Version="5.0.0"/>
+        <PackageReference Include="NUnit" Version="3.13.3"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.4.2"/>
+        <PackageReference Include="NUnit.Analyzers" Version="3.6.1"/>
+        <PackageReference Include="coverlet.collector" Version="3.2.0"/>
+        <PackageReference Include="System.Reactive" Version="5.0.0"/>
    </ItemGroup>

    <ItemGroup>
--- a/X10D.Tests/src/Linq/ReadOnlySpanTests.cs
+++ b/X10D.Tests/src/Linq/ReadOnlySpanTests.cs
@ -76,7 +76,7 @@ internal class ReadOnlySpanTests
        Assert.Throws<ArgumentNullException>(() =>
        {
            var span = new ReadOnlySpan<int>();
-            _ = span.Count((Predicate<int>)null!);
+            _ = span.Count(null!);
        });
    }
 }
--- a/X10D.Tests/src/Linq/SpanTests.cs
+++ b/X10D.Tests/src/Linq/SpanTests.cs
@ -76,7 +76,7 @@ internal class SpanTests
        Assert.Throws<ArgumentNullException>(() =>
        {
            var span = new Span<int>();
-            _ = span.Count((Predicate<int>)null!);
+            _ = span.Count(null!);
        });
    }
 }
--- a/X10D.sln
+++ b/X10D.sln
@ -17,7 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 		branding_Icon.png = branding_Icon.png
 		Directory.Build.props = Directory.Build.props
-		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceValidator", "tools\SourceValidator\SourceValidator.csproj", "{84750149-9068-4780-AFDE-CDA1AC57007D}"
--- a/X10D/X10D.csproj
+++ b/X10D/X10D.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
    </PropertyGroup>

    <ItemGroup>
--- a/X10D/src/Collections/SpanExtensions.cs
+++ b/X10D/src/Collections/SpanExtensions.cs
@ -53,7 +53,6 @@ public static class SpanExtensions
        return source;
    }

-#if !NET8_0_OR_GREATER
    /// <summary>
    ///     Replaces all occurrences of a specified element in a span of elements with another specified element.
    /// </summary>
@ -73,7 +72,6 @@ public static class SpanExtensions
            }
        }
    }
-#endif

    /// <summary>
    ///     Splits a span of elements into sub-spans based on a delimiting element.
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "8.0.0",
+    "version": "7.0.0",
    "rollForward": "latestMajor",
    "allowPrerelease": false
  }
--- a/tools/Benchmarks/Benchmarks.csproj
+++ b/tools/Benchmarks/Benchmarks.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
        <Configuration>Release</Configuration>
        <OutputType>Exe</OutputType>
        <Optimize>true</Optimize>
--- a/tools/SourceValidator/SourceValidator.csproj
+++ b/tools/SourceValidator/SourceValidator.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
        <OutputType>Exe</OutputType>
    </PropertyGroup>