Merge branch 'master' into CP_UpdatePackages

reactivemarbles · Nov 5, 2024 · 54361be · 54361be
2 parents 5399998 + 708e723
commit 54361be
Show file tree

Hide file tree

Showing 63 changed files with 3,107 additions and 1,751 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <!--<Compile Update="**\*.cs" DependentUpon="I%(Filename).cs" />-->
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143" PrivateAssets="all" Condition="!Exists('packages.config')" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" PrivateAssets="all" Condition="!Exists('packages.config')" />
     <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />

diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.1",
+    "version": "2.1.1",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageDownload Include="nbgv" Version="[3.6.143]" />
+    <PackageDownload Include="nbgv" Version="[3.6.146]" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj b/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AppBarButton.WPF" Version="1.0.2" />
-    <PackageReference Include="ReactiveList" Version="2.0.4" />
+    <PackageReference Include="ReactiveList" Version="2.1.0" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
     <PackageReference Include="ReactiveUI.SourceGenerators" Version="1.0.3" PrivateAssets="all" />
     <PackageReference Include="ScottPlot.WPF" Version="5.0.43" />