From b0070c0ed24d21c4d0266c8623d8b75d2df1fe38 Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Tue, 19 Mar 2024 23:30:21 +0000
Subject: [PATCH] Housekeeping Update packages (#127)

* Housekeeping Update packages

* update build
---
 .github/workflows/ci-build.yml                   | 16 ++++------------
 .github/workflows/release.yml                    | 16 ++++------------
 src/Directory.Build.props                        |  6 ++++--
 ...rbles.Locator.Register.SourceGenerator.csproj |  3 ++-
 .../ReactiveMarbles.Locator.csproj               |  2 +-
 src/directory.packages.props                     | 10 +++++-----
 6 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index dd2b2b7..8fd983d 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -25,18 +25,10 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.x
-
-    - name: Install .NET 5
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 5.0.x
-
-    - name: Install .NET 6
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 6.0.x
-        include-prerelease: true
+        dotnet-version: |
+            6.0.x
+            7.0.x
+            8.0.x
 
     - name: NBGV
       id: nbgv
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 47116b8..9dcaf44 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,18 +24,10 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.x
-
-    - name: Install .NET 5
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 5.0.x
-
-    - name: Install .NET 6
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 6.0.x
-        include-prerelease: true
+        dotnet-version: |
+            6.0.x
+            7.0.x
+            8.0.x
         
     - name: NBGV
       id: nbgv
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0a6b7de..08567c2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -7,12 +7,13 @@
     <IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
     <DebugType>embedded</DebugType>
     <Authors>Glenn Watson;Rodney Littles II;Chris Pulman</Authors>
-    <Copyright>Copyright (c) 2021 ReactiveUI Association Inc</Copyright>
-    <PackageIcon>logo.png</PackageIcon>
+    <Copyright>Copyright (c) $([System.DateTime]::Now.ToString('yyyy')) ReactiveUI Association Inc</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/reactivemarbles/Locator</PackageProjectUrl>
     <PackageDescription>A simple locator for Reactive Marbles. Used when performance is key over a full feature set.</PackageDescription>
     <Owners>glennawatson;chrispulman;RLittlesII</Owners>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageIcon>logo.png</PackageIcon>
     <PackageTags>locator;marbles;rx</PackageTags>
     <PackageReleaseNotes>https://github.com/reactivemarbles/Locator/releases</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/reactivemarbles/Locator</RepositoryUrl>
@@ -40,6 +41,7 @@
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\images\logo.png" Pack="true" PackagePath="\" />
     <None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
+    <None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
diff --git a/src/ReactiveMarbles.Locator.Register.SourceGenerator/ReactiveMarbles.Locator.Register.SourceGenerator.csproj b/src/ReactiveMarbles.Locator.Register.SourceGenerator/ReactiveMarbles.Locator.Register.SourceGenerator.csproj
index 48244b6..c94c908 100644
--- a/src/ReactiveMarbles.Locator.Register.SourceGenerator/ReactiveMarbles.Locator.Register.SourceGenerator.csproj
+++ b/src/ReactiveMarbles.Locator.Register.SourceGenerator/ReactiveMarbles.Locator.Register.SourceGenerator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -12,6 +12,7 @@
     <DebugType>full</DebugType>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ReactiveMarbles.Locator/ReactiveMarbles.Locator.csproj b/src/ReactiveMarbles.Locator/ReactiveMarbles.Locator.csproj
index 8b44d73..e7f3a24 100644
--- a/src/ReactiveMarbles.Locator/ReactiveMarbles.Locator.csproj
+++ b/src/ReactiveMarbles.Locator/ReactiveMarbles.Locator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
diff --git a/src/directory.packages.props b/src/directory.packages.props
index 9052d6b..2aa79e6 100644
--- a/src/directory.packages.props
+++ b/src/directory.packages.props
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.11.0" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.12.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
   </ItemGroup>
 
@@ -19,15 +19,15 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
     <PackageVersion Include="ReactiveMarbles.RoslynHelpers" Version="1.1.1" />
-    <PackageVersion Include="ILRepack" Version="2.0.27" />
+    <PackageVersion Include="ILRepack" Version="2.0.28" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageVersion Include="Tmds.ExecFunction" Version="0.7.1" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="xunit" Version="2.4.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.1" />
+    <PackageVersion Include="xunit" Version="2.4.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>