Merge Changes

reactivemarbles · Nov 5, 2024 · 5399998 · 5399998
1 parent 87fde05
commit 5399998
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -29,7 +29,7 @@
     <!-- Include PDB in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <AvaloniaVersion>11.1.4</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0</AvaloniaVersion>
     <ReactiveUIVersion>20.1.63</ReactiveUIVersion>
     <XamarinReactiveUIVersion>19.6.12</XamarinReactiveUIVersion>
     <CrissCrossCoreTargetFrameworks>netstandard2.0;net6.0;net8.0</CrissCrossCoreTargetFrameworks>
@@ -54,7 +54,7 @@
     <!--<Compile Update="**\*.cs" DependentUpon="I%(Filename).cs" />-->
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143" 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.7" PrivateAssets="All" />
+    <PackageReference Include="Roslynator.Analyzers" Version="4.12.9" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
   </ItemGroup>
 </Project>
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143" />
-    <PackageReference Include="Nuke.Common" Version="8.1.2" />
-    <PackageReference Include="CP.Nuke.BuildTools" Version="1.0.44" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
+    <PackageReference Include="Nuke.Common" Version="8.1.3" />
+    <PackageReference Include="CP.Nuke.BuildTools" Version="1.0.79" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj b/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="ReactiveList" Version="2.0.4" />
     <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.39" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.43" />
   </ItemGroup>
 
   <!--<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">

diff --git a/src/CrissCross.WPF.WebView2.Test/CrissCross.WPF.WebView2.Test.csproj b/src/CrissCross.WPF.WebView2.Test/CrissCross.WPF.WebView2.Test.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CrissCross.WPF.WebView2\CrissCross.WPF.WebView2.csproj" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2849.39" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj b/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj
@@ -11,7 +11,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-        <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
+        <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2849.39" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/CrissCross.WPF/CrissCross.WPF.csproj b/src/CrissCross.WPF/CrissCross.WPF.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="CompiledBindings.WPF" Version="1.0.18" />
     <PackageReference Include="ReactiveUI.WPF" Version="$(ReactiveUIVersion)" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2849.39" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net48'">