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 dependencies #2883

Merged
merged 2 commits into from
Jun 10, 2023
Merged

Update dependencies #2883

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
c1dbdb3
chore: update dependencies
dansiegel Jun 9, 2023
dec34c7
chore: alias ExceptionExtensions
dansiegel Jun 10, 2023
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
46 changes: 23 additions & 23 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project>
<ItemGroup>
<PackageVersion Include="DryIoc.dll" Version="5.3.3" />
<PackageVersion Include="DryIoc.dll" Version="5.4.0" />
<PackageVersion Include="Unity.Container" Version="5.11.11" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
<PackageVersion Include="System.Reactive" Version="5.0.0" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="Xamarin.Forms" Version="5.0.0.2401" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
</ItemGroup>
<!-- Uno -->
<ItemGroup Condition=" $(IsUnoProject) == 'true' ">
<PackageVersion Include="Uno.WinUI" Version="4.7.37" />
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.7.37" />
<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.7.37" />
<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.7.37" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.17" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.17" />
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.7.37" />
<PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.7.37" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.37" />
<PackageVersion Include="Uno.WinUI" Version="4.9.20" />
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.9.20" />
<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.9.20" />
<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.9.20" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.24" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.24" />
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.9.20" />
<PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.9.20" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
<PackageVersion Include="Uno.Core" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.3.0" />
Expand All @@ -29,29 +29,29 @@
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.3" />
<PackageVersion Include="Uno.Resizetizer" Version="0.36.0-dev.129" />
<PackageVersion Include="Uno.Extensions.Core" Version="2.3.0-dev.690" />
<PackageVersion Include="Uno.Resizetizer" Version="1.1.0" />
<PackageVersion Include="Uno.Extensions.Core" Version="2.4.2" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
<PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="2.3.0-dev.690" />
<PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="2.3.0-dev.690" />
<PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="2.4.2" />
<PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="2.4.2" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0" />
<PackageVersion Include="Uno.Material.WinUI" Version="2.5.0-dev.31" />
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="2.5.0-dev.23" />
<PackageVersion Include="Uno.Toolkit.WinUI" Version="2.5.0-dev.23" />
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="2.3.0-dev.690" />
<PackageVersion Include="Uno.Material.WinUI" Version="2.6.1" />
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="3.0.4" />
<PackageVersion Include="Uno.Toolkit.WinUI" Version="3.0.4" />
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="2.4.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.7.0.2" />
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
</ItemGroup>
<!-- Tests -->
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.0.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.2" />
<PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
Expand All @@ -72,7 +72,7 @@
<ItemGroup>
<!-- Global Packages -->
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using DryIoc;
using Prism.Ioc;
using Prism.Ioc.Internals;
using ExceptionExtensions = System.ExceptionExtensions;
using IContainer = DryIoc.IContainer;

namespace Prism.DryIoc
Expand Down
7 changes: 4 additions & 3 deletions src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<None Include="build\*.targets" Pack="true" PackagePath="buildTransitive" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
</ItemGroup>

<ItemGroup Condition="!$(TargetFramework.Contains('windows10'))">
<PackageReference Include="Uno.WinUI" />
<PackageReference Include="Uno.Core" />
Expand Down Expand Up @@ -67,9 +71,6 @@
<Compile Include="..\..\Maui\Prism.Maui\Ioc\IServiceCollectionAware.cs" LinkBase="Ioc" />
<Compile Include="..\..\Maui\Prism.Maui\Ioc\MicrosoftDependencyInjectionExtensions.cs" LinkBase="Ioc" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Prism.Core\Prism.Core.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Uno/Prism.Uno/PrismApplicationBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ protected virtual void ConfigureRegionAdapterMappings(RegionAdapterMappings regi

/// <summary>
/// Registers the <see cref="Type"/>s of the Exceptions that are not considered
/// root exceptions by the <see cref="ExceptionExtensions"/>.
/// root exceptions by the <see cref="System.ExceptionExtensions"/>.
/// </summary>
protected virtual void RegisterFrameworkExceptionTypes()
{
Expand Down
1 change: 1 addition & 0 deletions src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using DryIoc;
using Prism.Ioc;
using Prism.Regions;
using ExceptionExtensions = System.ExceptionExtensions;

namespace Prism.DryIoc
{
Expand Down