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

Updated Prism for Uno Platform #2687

Merged
merged 5 commits into from
May 6, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 4 additions & 22 deletions Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,13 @@

<!-- Uno -->
<ItemGroup>
<PackageReference Update="Uno.UI" Version="4.0.8" />
<PackageReference Update="Uno.WinUI" Version="4.0.8" />
<PackageReference Update="Uno.UI" Version="4.2.6" />
<PackageReference Update="Uno.WinUI" Version="4.2.6" />
<PackageReference Update="Uno.Core" Version="4.0.1" />
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.3.0-uno.12" />
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.12" />
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.3.0" />
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0" />
<PackageReference Update="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
<PackageReference Update="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.8" />
<PackageReference Update="Uno.UI.RemoteControl" Version="4.0.8" />
<PackageReference Update="Uno.WinUI.RemoteControl" Version="4.0.8" />
<PackageReference Update="Uno.UniversalImageLoader" Version="1.9.35" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Update="Uno.Extensions.Logging.WebAssembly.Console" Version="1.1.0" />
<PackageReference Update="Uno.Extensions.Logging.OSLog " Version="1.1.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
<PackageReference Update="Uno.UI.WebAssembly" Version="4.0.8" />
<PackageReference Update="Uno.WinUI.Skia.Gtk" Version="4.0.8" />
<PackageReference Update="Uno.WinUI.Skia.Wpf" Version="4.0.8" />
<PackageReference Update="Uno.WinUI.WebAssembly" Version="4.0.8" />
<PackageReference Update="Uno.Wasm.Bootstrap" Version="3.1.2" />
<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="3.1.2" />
<PackageReference Update="Microsoft.Windows.Compatibility" Version="5.0.2" />
<PackageReference Update="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Update="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196"/>
<PackageReference Update="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11" />
</ItemGroup>

<!-- Tests -->
Expand Down
112 changes: 2 additions & 110 deletions PrismLibrary_Uno.sln
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29403.142
# Visual Studio Version 17
VisualStudioVersion = 17.1.32414.318
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno", "src\Uno\Prism.Uno\Prism.Uno.csproj", "{B2A9C972-BD7A-4A95-B62C-F8385B819900}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Uno", "src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.csproj", "{B09FC94C-8100-4EB2-846C-99ACB056A993}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Uno", "src\Uno\Prism.Unity.Uno\Prism.Unity.Uno.csproj", "{4338E214-2BA3-4043-90B6-6C1269C58865}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Core", "src\Prism.Core\Prism.Core.csproj", "{CF74BE80-F9A0-4C02-A59C-30F43EDAB866}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{57CC0FDC-A8BD-4A51-A965-C25F1A7DDF89}"
Expand All @@ -19,24 +17,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{CBE0B15D-B96
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.DryIoc.Shared", "src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.shproj", "{6E7EC81D-DA39-4C4F-A898-0148558C34F4}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.Unity.Shared", "src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.shproj", "{D66336A6-07E5-401A-A710-DAEDD6975D59}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno.WinUI", "Uno.WinUI", "{41C6017D-FDF6-4EE0-92F2-126370858919}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno.WinUI", "src\Uno\Prism.Uno\Prism.Uno.WinUI.csproj", "{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Uno.WinUI", "src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.WinUI.csproj", "{8602A977-D992-4AB9-92ED-5A5FED95A4B5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Uno.WinUI", "src\Uno\Prism.Unity.Uno\Prism.Unity.Uno.WinUI.csproj", "{1E245214-C5AF-4918-817B-0E68472B9F99}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{1e245214-c5af-4918-817b-0e68472b9f99}*SharedItemsImports = 5
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{4338e214-2ba3-4043-90b6-6c1269c58865}*SharedItemsImports = 5
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{6e7ec81d-da39-4c4f-a898-0148558c34f4}*SharedItemsImports = 13
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{8602a977-d992-4ab9-92ed-5a5fed95a4b5}*SharedItemsImports = 5
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{b09fc94c-8100-4eb2-846c-99acb056a993}*SharedItemsImports = 5
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{d66336a6-07e5-401a-a710-daedd6975d59}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Expand Down Expand Up @@ -161,54 +152,6 @@ Global
{B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|x64.Build.0 = Release|Any CPU
{B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|x86.ActiveCfg = Release|Any CPU
{B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|x86.Build.0 = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|ARM.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|iPhone.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|x64.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|x64.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|x86.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.AppStore|x86.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|ARM.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|iPhone.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|x64.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|x64.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|x86.ActiveCfg = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Debug|x86.Build.0 = Debug|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|Any CPU.Build.0 = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|ARM.ActiveCfg = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|ARM.Build.0 = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|iPhone.ActiveCfg = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|iPhone.Build.0 = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|x64.ActiveCfg = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|x64.Build.0 = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|x86.ActiveCfg = Release|Any CPU
{4338E214-2BA3-4043-90B6-6C1269C58865}.Release|x86.Build.0 = Release|Any CPU
{CF74BE80-F9A0-4C02-A59C-30F43EDAB866}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{CF74BE80-F9A0-4C02-A59C-30F43EDAB866}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{CF74BE80-F9A0-4C02-A59C-30F43EDAB866}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -353,71 +296,20 @@ Global
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|x64.Build.0 = Release|Any CPU
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|x86.ActiveCfg = Release|Any CPU
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|x86.Build.0 = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|ARM.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|iPhone.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|x64.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|x64.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|x86.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|x86.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|ARM.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|ARM.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|iPhone.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|x64.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|x64.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|x86.ActiveCfg = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|x86.Build.0 = Debug|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|Any CPU.Build.0 = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|ARM.ActiveCfg = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|ARM.Build.0 = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|iPhone.ActiveCfg = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|iPhone.Build.0 = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|x64.ActiveCfg = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|x64.Build.0 = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|x86.ActiveCfg = Release|Any CPU
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B2A9C972-BD7A-4A95-B62C-F8385B819900} = {CBE0B15D-B960-4D91-9F74-2F7BA30BED4D}
{B09FC94C-8100-4EB2-846C-99ACB056A993} = {CBE0B15D-B960-4D91-9F74-2F7BA30BED4D}
{4338E214-2BA3-4043-90B6-6C1269C58865} = {CBE0B15D-B960-4D91-9F74-2F7BA30BED4D}
{CF74BE80-F9A0-4C02-A59C-30F43EDAB866} = {57CC0FDC-A8BD-4A51-A965-C25F1A7DDF89}
{B08E87A0-7697-43DA-AFB6-090E955057B4} = {57CC0FDC-A8BD-4A51-A965-C25F1A7DDF89}
{CBE0B15D-B960-4D91-9F74-2F7BA30BED4D} = {57CC0FDC-A8BD-4A51-A965-C25F1A7DDF89}
{6E7EC81D-DA39-4C4F-A898-0148558C34F4} = {B08E87A0-7697-43DA-AFB6-090E955057B4}
{D66336A6-07E5-401A-A710-DAEDD6975D59} = {B08E87A0-7697-43DA-AFB6-090E955057B4}
{41C6017D-FDF6-4EE0-92F2-126370858919} = {57CC0FDC-A8BD-4A51-A965-C25F1A7DDF89}
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A} = {41C6017D-FDF6-4EE0-92F2-126370858919}
{8602A977-D992-4AB9-92ED-5A5FED95A4B5} = {41C6017D-FDF6-4EE0-92F2-126370858919}
{1E245214-C5AF-4918-817B-0E68472B9F99} = {41C6017D-FDF6-4EE0-92F2-126370858919}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9A6B5A49-790C-425F-BBF5-99D104959C33}
Expand Down