Skip to content

Commit

Permalink
Updating packages
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeShook committed Oct 5, 2024
1 parent 87378da commit 6c29bf4
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 47 deletions.
2 changes: 1 addition & 1 deletion Client/UdapEd.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Udap.Common" Version="0.3.85" />
<PackageReference Include="Udap.Common" Version="0.3.86" />
</ItemGroup>

<!-- From:: https://jonhilton.net/visual-studio-2022-blazor-css-intellisense/ -->
Expand Down
8 changes: 4 additions & 4 deletions Server/UdapEd.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="Udap.Smart.Model" Version="0.3.85" />
<PackageReference Include="Udap.Smart.Model" Version="0.3.86" />

</ItemGroup>

Expand All @@ -35,9 +35,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Udap.Client" Version="0.3.85" />
<PackageReference Include="Udap.Model" Version="0.3.85" />
<PackageReference Include="Udap.Common" Version="0.3.85" />
<PackageReference Include="Udap.Client" Version="0.3.86" />
<PackageReference Include="Udap.Model" Version="0.3.86" />
<PackageReference Include="Udap.Common" Version="0.3.86" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Shared/UdapEd.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Udap.Model" Version="0.3.85" />
<PackageReference Include="Udap.Common" Version="0.3.85" />
<PackageReference Include="Udap.Model" Version="0.3.86" />
<PackageReference Include="Udap.Common" Version="0.3.86" />
</ItemGroup>

<ItemGroup>
Expand All @@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="MudBlazor" Version="7.8.0" />
<PackageReference Include="Udap.Smart.Model" Version="0.3.85" />
<PackageReference Include="Udap.Smart.Model" Version="0.3.86" />

<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
Expand All @@ -44,7 +44,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworks)' != 'net8.0'">
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.3" />
<PackageReference Include="CommunityToolkit.Maui" Version="9.1.0" />
</ItemGroup>


Expand Down
18 changes: 3 additions & 15 deletions UdapEdAppMaui/MainPage.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
namespace UdapEdAppMaui;
#if WINDOWS
using WinUIEx;
#endif


public partial class MainPage : TabbedPage
{
Expand All @@ -12,22 +10,12 @@ public MainPage()

private void OnMaximizeClicked(object sender, EventArgs e)
{
#if WINDOWS
var window = this.Window.Handler.PlatformView as Microsoft.UI.Xaml.Window;
window.Maximize(); // Use WinUIEx Extension method to maximize window
#endif

}


private void OnFullScreenClicked(object sender, EventArgs e)
{
#if WINDOWS
// Get the window manager
var manager = WinUIEx.WindowManager.Get(this.Window.Handler.PlatformView as Microsoft.UI.Xaml.Window);
if (manager.PresenterKind == Microsoft.UI.Windowing.AppWindowPresenterKind.Overlapped)
manager.PresenterKind = Microsoft.UI.Windowing.AppWindowPresenterKind.FullScreen;
else
manager.PresenterKind = Microsoft.UI.Windowing.AppWindowPresenterKind.Overlapped;
#endif

}
}
21 changes: 1 addition & 20 deletions UdapEdAppMaui/MauiProgram.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@
using IAccessTokenProvider = UdapEd.Shared.Services.Authentication.IAccessTokenProvider;


#if WINDOWS
using WinUIEx;
#endif

namespace UdapEdAppMaui;
public static class MauiProgram
Expand Down Expand Up @@ -210,23 +207,7 @@ public static MauiApp CreateMauiApp()
builder.Logging.AddDebug();
#endif

#if WINDOWS
builder.ConfigureLifecycleEvents(events =>
{
events.AddWindows(wndLifeCycleBuilder =>
{
wndLifeCycleBuilder.OnWindowCreated(window =>
{
window.CenterOnScreen(1024,768); //Set size and center on screen using WinUIEx extension method

var manager = WinUIEx.WindowManager.Get(window);
manager.PersistenceId = "MainWindowPersistanceId"; // Remember window position and size across runs
manager.MinWidth = 640;
manager.MinHeight = 480;
});
});
});
#endif



return builder.Build();
Expand Down
6 changes: 3 additions & 3 deletions UdapEdAppMaui/UdapEdAppMaui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@


<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.3" />
<PackageReference Include="CommunityToolkit.Maui" Version="9.1.0" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.10.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.90" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.90" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.90" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Serilog" Version="4.0.1" />
<PackageReference Include="Serilog" Version="4.0.2" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Udap.Client" Version="0.3.85" />
<PackageReference Include="Udap.Client" Version="0.3.86" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 6c29bf4

Please sign in to comment.