HouseKeeping Update Packages

ReactiveList updated due to bug introduced in 1.0.3 Pushed SourceGenerators back to V1.0.3 removing the requirement for Polyfill
reactivemarbles · Oct 13, 2024 · 145f396 · 145f396
1 parent b8f8574
commit 145f396
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 29 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.3</AvaloniaVersion>
+    <AvaloniaVersion>11.1.4</AvaloniaVersion>
     <ReactiveUIVersion>20.1.63</ReactiveUIVersion>
     <XamarinReactiveUIVersion>19.6.12</XamarinReactiveUIVersion>
     <CrissCrossCoreTargetFrameworks>netstandard2.0;net6.0;net8.0</CrissCrossCoreTargetFrameworks>

diff --git a/global.json b/global.json
diff --git a/src/CrissCross.MAUI.Test/CrissCross.MAUI.Test.csproj b/src/CrissCross.MAUI.Test/CrissCross.MAUI.Test.csproj
@@ -51,11 +51,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.82" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.91" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CrissCross.MAUI/CrissCross.MAUI.csproj b/src/CrissCross.MAUI/CrissCross.MAUI.csproj
@@ -18,10 +18,10 @@
   <ItemGroup>
     <PackageReference Include="CompiledBindings.MAUI" Version="1.0.18" />
     <PackageReference Include="ReactiveUI.Maui" Version="$(ReactiveUIVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.82" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.91" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CrissCross\CrissCross.csproj" />

diff --git a/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj b/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj
@@ -9,21 +9,21 @@
     <NoWarn>$(NoWarn);CA1812</NoWarn>
     <Authors>Chris Pulman; Adriana Segher</Authors>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="AppBarButton.WPF" Version="1.0.2" />
-    <PackageReference Include="ReactiveList" Version="2.0.3" />
+    <PackageReference Include="ReactiveList" Version="2.0.4" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="1.1.31" PrivateAssets="all" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="1.0.3" PrivateAssets="all" />
     <PackageReference Include="ScottPlot.WPF" Version="5.0.39" />
   </ItemGroup>
-  
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <PackageReference Include="Polyfill" Version="6.12.0">
+
+  <!--<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+    <PackageReference Include="Polyfill" Version="7.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-  </ItemGroup>
+  </ItemGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\CrissCross.WPF\CrissCross.WPF.csproj" />

diff --git a/src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj b/src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="CP.Extensions.Hosting.ReactiveUI.Wpf" Version="2.0.5" />
-    <PackageReference Include="ReactiveList" Version="2.0.3" />
+    <PackageReference Include="ReactiveList" Version="2.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" />
     <PackageReference Include="AppBarButton.WPF" Version="1.0.2" />

diff --git a/src/CrissCross/CrissCross.csproj b/src/CrissCross/CrissCross.csproj
@@ -1,14 +1,11 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(CrissCrossCoreTargetFrameworks);Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid13.0;tizen40</TargetFrameworks>
+    <TargetFrameworks>$(CrissCrossCoreTargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);$(CrissCrossWinTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin')) or $(TargetFramework.StartsWith('MonoAndroid')) or $(TargetFramework.StartsWith('tizen'))">
-    <PackageReference Include="ReactiveUI" Version="$(XamarinReactiveUIVersion)" />
-  </ItemGroup>
-  <ItemGroup Condition="!$(TargetFramework.StartsWith('Xamarin')) and !$(TargetFramework.StartsWith('MonoAndroid')) and !$(TargetFramework.StartsWith('tizen'))">
+  <ItemGroup>
     <PackageReference Include="ReactiveUI" Version="$(ReactiveUIVersion)" />
   </ItemGroup>