Skip to content

Commit b35b309

Browse files
authored
Merge pull request #217 from reactivemarbles/UpdatePackages
Update package versions and improve project references
2 parents 27da362 + e84433b commit b35b309

File tree

7 files changed

+21
-18
lines changed

7 files changed

+21
-18
lines changed

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
<!-- Include PDB in the built .nupkg -->
3030
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
3131
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
32-
<AvaloniaVersion>11.3.9</AvaloniaVersion>
32+
<AvaloniaVersion>11.3.10</AvaloniaVersion>
3333
<SplatVersion>17.1.1</SplatVersion>
3434
<ReactiveUIVersion>22.3.1</ReactiveUIVersion>
3535
<XamarinReactiveUIVersion>19.6.12</XamarinReactiveUIVersion>
36-
<WebViewVersion>1.0.3595.46</WebViewVersion>
36+
<WebViewVersion>1.0.3650.58</WebViewVersion>
3737
<CoreNetVersion>9.0.11</CoreNetVersion>
3838
<CrissCrossCoreTargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</CrissCrossCoreTargetFrameworks>
3939
<CrissCrossWinTargetFrameworks>net472;net48;net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</CrissCrossWinTargetFrameworks>
@@ -57,7 +57,7 @@
5757
<!--<Compile Update="**\*.cs" DependentUpon="I%(Filename).cs" />-->
5858
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" Condition="!Exists('packages.config')" />
5959
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
60-
<PackageReference Include="Roslynator.Analyzers" Version="4.14.1" PrivateAssets="All" />
60+
<PackageReference Include="Roslynator.Analyzers" Version="4.15.0" PrivateAssets="All" />
6161
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
6262
</ItemGroup>
6363
</Project>

build/_build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" />
16-
<PackageReference Include="Nuke.Common" Version="10.0.1" />
16+
<PackageReference Include="Nuke.Common" Version="10.1.0" />
1717
<PackageReference Include="CP.Nuke.BuildTools" Version="2.0.16" />
1818
</ItemGroup>
1919

src/CrissCross.Avalonia.UI.Gallery/CrissCross.Avalonia.UI.Gallery.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Avalonia" Version="11.3.9" />
14-
<PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
15-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
16-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.9" />
13+
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
14+
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
15+
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
16+
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
1717
<PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8" />
1818
<PackageReference Include="ReactiveUI" Version="22.3.1" />
1919
</ItemGroup>

src/CrissCross.Avalonia.UI/CrissCross.Avalonia.UI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.*" />
4545
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.*" />
4646
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.*" />
47-
<PackageReference Include="ReactiveList" Version="2.3.2" />
48-
<PackageReference Include="AngleSharp" Version="1.0.6" />
49-
<PackageReference Include="Markdig" Version="0.37.0" />
47+
<PackageReference Include="ReactiveList" Version="2.4.5" />
48+
<PackageReference Include="AngleSharp" Version="1.4.0" />
49+
<PackageReference Include="Markdig" Version="0.44.0" />
5050
<!-- Source generators / analyzers isolated from consumers -->
5151
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
5252
<PackageReference Include="ReactiveUI.SourceGenerators" Version="2.5.1" PrivateAssets="all" />

src/CrissCross.MAUI/CrissCross.MAUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
1616
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
1717
</PropertyGroup>
18-
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0')) or $(TargetFramework.StartsWith('net9.0'))">
18+
<PropertyGroup Condition="$(TargetFramework.StartsWith('net9.0')) or $(TargetFramework.StartsWith('net10.0'))">
1919
<IsAotCompatible>true</IsAotCompatible>
2020
</PropertyGroup>
2121
<ItemGroup>

src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="AppBarButton.WPF" Version="1.0.2" />
16-
<PackageReference Include="ReactiveList" Version="2.3.2" />
16+
<PackageReference Include="ReactiveList" Version="2.4.5" />
1717
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
1818
<PackageReference Include="ReactiveUI.SourceGenerators" Version="2.5.1" PrivateAssets="all" />
1919
<PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
2020
</ItemGroup>
2121

2222
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
23-
<PackageReference Include="Polyfill" Version="9.3.1">
23+
<PackageReference Include="Polyfill" Version="9.6.0">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2626
</PackageReference>

src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,23 @@
5151
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.*" />
5252
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.*" />
5353
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.*" />
54-
<PackageReference Include="ReactiveList" Version="2.3.2" />
54+
<PackageReference Include="ReactiveList" Version="2.4.5" />
5555
<PackageReference Include="AppBarButton.WPF" Version="1.0.2" />
5656
<PackageReference Include="BBCode.WPF" Version="1.0.2" />
5757
<PackageReference Include="CP.Xaml.Converters" Version="1.1.3" />
5858
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
5959
<!-- Source generators / analyzers isolated from consumers -->
6060
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
6161
<PackageReference Include="ReactiveUI.SourceGenerators" Version="2.5.1" PrivateAssets="all" />
62-
<PackageReference Include="PolySharp" Version="1.15.0">
62+
</ItemGroup>
63+
64+
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
65+
<PackageReference Include="Polyfill" Version="9.6.0">
6366
<PrivateAssets>all</PrivateAssets>
64-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
67+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
6568
</PackageReference>
6669
</ItemGroup>
67-
70+
6871
<ItemGroup>
6972
<ProjectReference Include="..\CrissCross.WPF\CrissCross.WPF.csproj" />
7073
</ItemGroup>

0 commit comments

Comments
 (0)