Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Packages #143

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Update Packages #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7147fbe
Update Packages
ChrisPulman Sep 12, 2024
64bcab3
Update Version.json
ChrisPulman Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<!-- Include PDB in the built .nupkg -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
<AvaloniaVersion>11.1.1</AvaloniaVersion>
<AvaloniaVersion>11.1.3</AvaloniaVersion>
<ReactiveUIVersion>20.1.1</ReactiveUIVersion>
<XamarinReactiveUIVersion>19.6.12</XamarinReactiveUIVersion>
<CrissCrossCoreTargetFrameworks>netstandard2.0;net6.0;net8.0</CrissCrossCoreTargetFrameworks>
Expand All @@ -52,7 +52,7 @@
</ItemGroup>
<ItemGroup>
<!--<Compile Update="**\*.cs" DependentUpon="I%(Filename).cs" />-->
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" PrivateAssets="all" Condition="!Exists('packages.config')" />
<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.4" PrivateAssets="All" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
Expand Down
2 changes: 1 addition & 1 deletion Version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.0.6",
"version": "2.0.7",
"publicReleaseRefSpec": [
"^refs/heads/master$",
"^refs/heads/main$"
Expand Down
6 changes: 3 additions & 3 deletions build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" />
<PackageReference Include="Nuke.Common" Version="8.0.0" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143" />
<PackageReference Include="Nuke.Common" Version="8.1.0" />
<PackageReference Include="CP.Nuke.BuildTools" Version="1.0.44" />
</ItemGroup>

<ItemGroup>
<PackageDownload Include="nbgv" Version="[3.6.139]" />
<PackageDownload Include="nbgv" Version="[3.6.143]" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/CrissCross.Avalonia.Test.Android/CrissCross.Avalonia.Test.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.10" />
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.11" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/CrissCross.MAUI.Test/CrissCross.MAUI.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
<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.21" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.82" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/CrissCross.MAUI/CrissCross.MAUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<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.21" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.82" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CrissCross\CrissCross.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="AppBarButton.WPF" Version="1.0.1" />
<PackageReference Include="ReactiveList" Version="2.0.2" />
<PackageReference Include="ReactiveList" Version="2.0.3" />
<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.37" />
Expand Down
4 changes: 2 additions & 2 deletions src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@

<ItemGroup>
<PackageReference Include="CP.Extensions.Hosting.ReactiveUI.Wpf" Version="2.0.5" />
<PackageReference Include="ReactiveList" Version="2.0.2" />
<PackageReference Include="ReactiveList" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" />
<PackageReference Include="AppBarButton.WPF" Version="1.0.1" />
<PackageReference Include="BBCode.WPF" Version="0.2.0" />
<PackageReference Include="CP.Xaml.Converters" Version="1.0.2" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
<PackageReference Include="PolySharp" Version="1.14.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion src/CrissCross.WPF.WebView2.Test/CrissCross.WPF.WebView2.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<ProjectReference Include="..\CrissCross.WPF.WebView2\CrissCross.WPF.WebView2.csproj" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2646-prerelease" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2646-prerelease" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/CrissCross.WPF/CrissCross.WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="ReactiveUI.WPF" Version="$(ReactiveUIVersion)" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2646-prerelease" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading