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.

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 #147

Merged
merged 9 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 4 deletions samples/BlazorBindingsToDo/AppState.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

using System;
using System.IO;
using System.Threading.Tasks;

namespace BlazorBindingsToDo;

public class AppState
Expand Down
14 changes: 7 additions & 7 deletions samples/BlazorBindingsToDo/BlazorBindingsToDo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.8" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.8" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.8" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.10" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Foundation;
using Microsoft.Maui;

namespace BlazorBindingsToDo;

Expand Down
1 change: 0 additions & 1 deletion samples/BlazorBindingsToDo/Platforms/Windows/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

using Microsoft.UI.Xaml;
using BlazorBindingsToDo;

// To learn more about WinUI, the WinUI project structure,
Expand Down
1 change: 0 additions & 1 deletion samples/BlazorBindingsToDo/Platforms/iOS/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

using ObjCRuntime;
using UIKit;

namespace BlazorBindingsToDo;
Expand Down
7 changes: 4 additions & 3 deletions samples/BlazorBindingsXaminals/BlazorBindingsXaminals.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\..\src\BlazorBindings.Maui\BlazorBindings.Maui.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
</ItemGroup>

</Project>
2 changes: 0 additions & 2 deletions samples/BlazorBindingsXaminals/Platforms/Windows/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

using Microsoft.UI.Xaml;

// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

Expand Down
8 changes: 4 additions & 4 deletions samples/ControlGallery/ControlGallery.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="UraniumUI.Icons.FontAwesome" Version="2.7.4" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="UraniumUI.Icons.FontAwesome" Version="2.10.2" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Foundation;
using Microsoft.Maui;

namespace ControlGallery;

Expand Down
2 changes: 0 additions & 2 deletions samples/ControlGallery/Platforms/Windows/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

using Microsoft.UI.Xaml;

// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

Expand Down
10 changes: 5 additions & 5 deletions samples/FluxorSample/FluxorSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Fluxor.Blazor.Web" Version="5.9.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Fluxor.Blazor.Web" Version="6.1.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions samples/FluxorSample/Platforms/MacCatalyst/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace FluxorSample;

Expand Down
3 changes: 1 addition & 2 deletions samples/FluxorSample/Platforms/iOS/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace FluxorSample;

Expand Down
6 changes: 3 additions & 3 deletions samples/FlyoutPageSample/FlyoutPageSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion samples/FlyoutPageSample/Platforms/Android/MainActivity.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Android.App;
using Android.Content.PM;
using Android.OS;

namespace FlyoutPageSample;

Expand Down
3 changes: 1 addition & 2 deletions samples/FlyoutPageSample/Platforms/MacCatalyst/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace FlyoutPageSample;

Expand Down
4 changes: 1 addition & 3 deletions samples/FlyoutPageSample/Platforms/Windows/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Microsoft.UI.Xaml;

// To learn more about WinUI, the WinUI project structure,
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

namespace FlyoutPageSample.WinUI;
Expand Down
3 changes: 1 addition & 2 deletions samples/FlyoutPageSample/Platforms/iOS/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace FlyoutPageSample;

Expand Down
6 changes: 3 additions & 3 deletions samples/HybridSample/Data/WeatherForecastService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ namespace HybridSample.Data;

public class WeatherForecastService
{
private static readonly string[] Summaries = new[]
{
private static readonly string[] Summaries =
[
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
};
];

public Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
{
Expand Down
8 changes: 4 additions & 4 deletions samples/HybridSample/HybridSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions samples/HybridSample/Platforms/MacCatalyst/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace HybridSample
{
Expand Down
4 changes: 1 addition & 3 deletions samples/HybridSample/Platforms/Windows/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Microsoft.UI.Xaml;

// To learn more about WinUI, the WinUI project structure,
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

namespace HybridSample.WinUI
Expand Down
3 changes: 1 addition & 2 deletions samples/HybridSample/Platforms/iOS/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace HybridSample
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ static StatusBarBehavior()
RegisterAdditionalHandlers();
}

/// <summary>
/// When the status bar color and style should be applied.
/// </summary>
[Parameter] public CMB.StatusBarApplyOn? ApplyOn { get; set; }
/// <summary>
/// Property that holds the value of the Status bar color.
/// </summary>
Expand All @@ -45,6 +49,13 @@ protected override void HandleParameter(string name, object value)
{
switch (name)
{
case nameof(ApplyOn):
if (!Equals(ApplyOn, value))
{
ApplyOn = (CMB.StatusBarApplyOn?)value;
NativeControl.ApplyOn = ApplyOn ?? (CMB.StatusBarApplyOn)CMB.StatusBarBehavior.ApplyOnProperty.DefaultValue;
}
break;
case nameof(StatusBarColor):
if (!Equals(StatusBarColor, value))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static CalendarView()
/// </summary>
[Parameter] public double? DayNamesHeightRequest { get; set; }
[Parameter] public double? DayNameVerticalSpacing { get; set; }
[Parameter] public IEnumerable<global::XCalendar.Core.Interfaces.ICalendarDay> Days { get; set; }
[Parameter] public IEnumerable<object> Days { get; set; }
[Parameter] public IList<DayOfWeek> DaysOfWeek { get; set; }
/// <summary>
/// The height of the view used to display the <see cref="P:XCalendar.Maui.Views.CalendarView.Days" />
Expand Down Expand Up @@ -89,7 +89,7 @@ protected override void HandleParameter(string name, object value)
case nameof(Days):
if (!Equals(Days, value))
{
Days = (IEnumerable<global::XCalendar.Core.Interfaces.ICalendarDay>)value;
Days = (IEnumerable<object>)value;
NativeControl.Days = Days;
}
break;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Android.App;
using Android.Content.PM;
using Android.OS;

namespace ThirdPartyControlsSample;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Microsoft.UI.Xaml;

// To learn more about WinUI, the WinUI project structure,
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

namespace ThirdPartyControlsSample.WinUI;
Expand Down
3 changes: 1 addition & 2 deletions samples/ThirdPartyControlsSample/Platforms/iOS/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace ThirdPartyControlsSample;

Expand Down
8 changes: 4 additions & 4 deletions samples/ThirdPartyControlsSample/Properties/Elements.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
using XCalendar.Maui.Views;

// CommunityToolkit
[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.AvatarView), Exclude = new[] { nameof(CommunityToolkit.Maui.Views.AvatarView.CornerRadius) })]
[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.AvatarView), Exclude = [nameof(CommunityToolkit.Maui.Views.AvatarView.CornerRadius)])]
[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.DrawingView))]
[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.Popup), Exclude = new[] { nameof(CommunityToolkit.Maui.Views.Popup.Anchor) })]
[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.Popup), Exclude = [nameof(CommunityToolkit.Maui.Views.Popup.Anchor)])]

[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Behaviors.MaskedBehavior))]
[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Behaviors.UserStoppedTypingBehavior))]
[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Behaviors.StatusBarBehavior))]

// XCalendar
[assembly: GenerateComponent(typeof(CalendarView),
GenericProperties = new[] {
GenericProperties = [
$"{nameof(CalendarView.DayNameTemplate)}:XCalendar.Core.Interfaces.ICalendarDay",
$"{nameof(CalendarView.DayTemplate)}:XCalendar.Core.Interfaces.ICalendarDay",
})]
])]

// Material.Components.Maui
[assembly: GenerateComponentsFromAssembly(typeof(Material.Components.Maui.Button),
Expand Down
12 changes: 6 additions & 6 deletions samples/ThirdPartyControlsSample/ThirdPartyControlsSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="CommunityToolkit.Maui" Version="7.0.1" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
<PackageReference Include="CommunityToolkit.Maui" Version="9.1.0" />
<PackageReference Include="Material.Components.Maui" Version="0.1.2-beta" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.7" />
<PackageReference Include="XCalendar.Maui" Version="4.5.3" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" />
<PackageReference Include="XCalendar.Maui" Version="4.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Android.App;
using Android.Content.PM;
using Android.OS;

namespace ValidationsSample;
[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
Expand Down
3 changes: 1 addition & 2 deletions samples/ValidationsSample/Platforms/MacCatalyst/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace ValidationsSample;
public class Program
Expand Down
4 changes: 1 addition & 3 deletions samples/ValidationsSample/Platforms/Windows/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Microsoft.UI.Xaml;

// To learn more about WinUI, the WinUI project structure,
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

namespace ValidationsSample.WinUI;
Expand Down
3 changes: 1 addition & 2 deletions samples/ValidationsSample/Platforms/iOS/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ObjCRuntime;
using UIKit;
using UIKit;

namespace ValidationsSample;
public class Program
Expand Down
10 changes: 5 additions & 5 deletions samples/ValidationsSample/ValidationsSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Blazored.FluentValidation" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Blazored.FluentValidation" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading