This commit is contained in:
Jerome Laban 2024-01-09 14:23:35 -05:00
Родитель d3dda2e16d
Коммит a9f63600bf
5 изменённых файлов: 24 добавлений и 88 удалений

Просмотреть файл

@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EFCore", "EFCore", "{5B0B7B
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "EFCoreSample.Shared", "samples\EFCoreSample\EFCoreSample.Shared\EFCoreSample.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCoreSample.UWP", "samples\EFCoreSample\EFCoreSample.UWP\EFCoreSample.UWP.csproj", "{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCoreSample.Wasm", "samples\EFCoreSample\EFCoreSample.Wasm\EFCoreSample.Wasm.csproj", "{5AEEC1B7-C6BA-428C-9CDC-B3C249DF032C}"
EndProject
Global
@ -91,66 +89,6 @@ Global
{2CFCD4F7-25D7-488D-A9C2-0785CBBDED96}.Release|x64.Build.0 = Release|Any CPU
{2CFCD4F7-25D7-488D-A9C2-0785CBBDED96}.Release|x86.ActiveCfg = Release|Any CPU
{2CFCD4F7-25D7-488D-A9C2-0785CBBDED96}.Release|x86.Build.0 = Release|Any CPU
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|Any CPU.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|ARM.Build.0 = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|iPhone.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|x64.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|x64.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|x64.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|x86.ActiveCfg = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|x86.Build.0 = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Ad-Hoc|x86.Deploy.0 = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|Any CPU.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|Any CPU.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|Any CPU.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|ARM.ActiveCfg = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|ARM.Build.0 = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|ARM.Deploy.0 = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|iPhone.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|iPhone.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|iPhone.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|iPhoneSimulator.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|x64.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|x64.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|x64.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|x86.ActiveCfg = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|x86.Build.0 = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.AppStore|x86.Deploy.0 = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|Any CPU.ActiveCfg = Debug|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|ARM.ActiveCfg = Debug|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|ARM.Build.0 = Debug|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|ARM.Deploy.0 = Debug|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|iPhone.ActiveCfg = Debug|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|x64.ActiveCfg = Debug|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|x64.Build.0 = Debug|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|x64.Deploy.0 = Debug|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|x86.ActiveCfg = Debug|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|x86.Build.0 = Debug|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Debug|x86.Deploy.0 = Debug|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|Any CPU.ActiveCfg = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|ARM.ActiveCfg = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|ARM.Build.0 = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|ARM.Deploy.0 = Release|ARM
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|iPhone.ActiveCfg = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|iPhoneSimulator.ActiveCfg = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|x64.ActiveCfg = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|x64.Build.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|x64.Deploy.0 = Release|x64
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|x86.ActiveCfg = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|x86.Build.0 = Release|x86
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485}.Release|x86.Deploy.0 = Release|x86
{5AEEC1B7-C6BA-428C-9CDC-B3C249DF032C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{5AEEC1B7-C6BA-428C-9CDC-B3C249DF032C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{5AEEC1B7-C6BA-428C-9CDC-B3C249DF032C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@ -206,7 +144,6 @@ Global
GlobalSection(NestedProjects) = preSolution
{5B0B7B2B-698E-4BD4-B9ED-73A6BDDE8835} = {2A3E8F84-14E1-489E-BA41-D56FF1B1B6D0}
{6279C845-92F8-4333-AB99-3D213163593C} = {5B0B7B2B-698E-4BD4-B9ED-73A6BDDE8835}
{6681C122-A8AC-4AE1-9C86-8DEFE95E9485} = {5B0B7B2B-698E-4BD4-B9ED-73A6BDDE8835}
{5AEEC1B7-C6BA-428C-9CDC-B3C249DF032C} = {5B0B7B2B-698E-4BD4-B9ED-73A6BDDE8835}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
@ -215,6 +152,5 @@ Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
samples\EFCoreSample\EFCoreSample.Shared\EFCoreSample.Shared.projitems*{5aeec1b7-c6ba-428c-9cdc-b3c249df032c}*SharedItemsImports = 5
samples\EFCoreSample\EFCoreSample.Shared\EFCoreSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
samples\EFCoreSample\EFCoreSample.Shared\EFCoreSample.Shared.projitems*{6681c122-a8ac-4ae1-9c86-8defe95e9485}*SharedItemsImports = 4
EndGlobalSection
EndGlobal

Просмотреть файл

@ -7,13 +7,13 @@ using Windows.ApplicationModel;
using Windows.ApplicationModel.Activation;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
namespace EFCoreSample
{
@ -37,7 +37,7 @@ namespace EFCoreSample
/// will be used such as when the application is launched to open a specific file.
/// </summary>
/// <param name="e">Details about the launch request and process.</param>
protected override void OnLaunched(LaunchActivatedEventArgs e)
protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e)
{
try
{
@ -47,7 +47,7 @@ namespace EFCoreSample
// this.DebugSettings.EnableFrameRateCounter = true;
}
#endif
Frame rootFrame = Windows.UI.Xaml.Window.Current.Content as Frame;
Frame rootFrame = Microsoft.UI.Xaml.Window.Current.Content as Frame;
// Do not repeat app initialization when the Window already has content,
// just ensure that the window is active
@ -58,16 +58,16 @@ namespace EFCoreSample
rootFrame.NavigationFailed += OnNavigationFailed;
if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
if (e.UWPLaunchActivatedEventArgs.PreviousExecutionState == ApplicationExecutionState.Terminated)
{
//TODO: Load state from previously suspended application
}
// Place the frame in the current Window
Windows.UI.Xaml.Window.Current.Content = rootFrame;
Microsoft.UI.Xaml.Window.Current.Content = rootFrame;
}
if (e.PrelaunchActivated == false)
if (e.UWPLaunchActivatedEventArgs.PrelaunchActivated == false)
{
if (rootFrame.Content == null)
{
@ -77,7 +77,7 @@ namespace EFCoreSample
rootFrame.Navigate(typeof(MainPage), e.Arguments);
}
// Ensure the current window is active
Windows.UI.Xaml.Window.Current.Activate();
Microsoft.UI.Xaml.Window.Current.Activate();
}
}
catch(Exception ex)

Просмотреть файл

@ -5,13 +5,13 @@ using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
using EFCoreSample.Model;
using System.Threading.Tasks;
using System.Threading;

Просмотреть файл

@ -32,8 +32,8 @@
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0-dev.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.118" />
<PackageReference Include="Uno.Core" Version="4.0.1" />
<PackageReference Include="Uno.UI.WebAssembly" Version="5.0.118" />
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.45.0-dev.64" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.0.118" />
<PackageReference Include="Uno.WinUI.Sample.Banner" Version="1.45.0-dev.64" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="8.0.4" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.4" />
<PackageReference Include="SQLitePCLRaw.bundle_sqlite3" Version="2.0.5-pre20210521085756" />

Просмотреть файл

@ -3,7 +3,7 @@ using Microsoft.Data.Sqlite;
using Microsoft.Extensions.Logging;
using Uno;
using Uno.Extensions;
using Windows.UI.Xaml;
using Microsoft.UI.Xaml;
namespace EFCoreSample.Wasm
{
@ -18,7 +18,7 @@ namespace EFCoreSample.Wasm
#endif
SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());
Windows.UI.Xaml.Application.Start(_ => _app = new App());
Microsoft.UI.Xaml.Application.Start(_ => _app = new App());
}
/// <summary>
/// Configures global Uno Platform logging