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

Use new Prism.Container packages #2968

Merged
merged 11 commits into from
Oct 3, 2023
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
15 changes: 8 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>
<ItemGroup>
<PackageVersion Include="DryIoc.dll" Version="5.4.1" />
<PackageVersion Include="Unity.Container" Version="5.11.11" />
<PackageVersion Include="Prism.Container.Abstractions" Version="9.0.61-pre" />
<PackageVersion Include="Prism.Container.DryIoc" Version="9.0.61-pre" />
<PackageVersion Include="Prism.Container.Unity" Version="9.0.61-pre" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="Xamarin.Forms" Version="5.0.0.2401" />
Expand Down Expand Up @@ -52,14 +53,14 @@
<!-- Tests -->
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.2" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
<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.6.3" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="xunit" Version="2.5.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageVersion Include="Moq" Version="4.20.69" />
<PackageVersion Include="xunit" Version="2.5.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" />
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
</ItemGroup>
<ItemGroup Condition=" $(UseMaui) != 'true' ">
Expand Down
60 changes: 1 addition & 59 deletions PrismLibrary.sln
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.DI.Forms.Tests", "tests\Forms\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.shproj", "{FAC4FA5A-D6C1-4787-9B1F-A3EC6E2FB26E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Containers", "Containers", "{75B1C655-8365-4130-8B79-C748BF0403F2}"
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("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.DryIoc.Shared", "src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.shproj", "{6E7EC81D-DA39-4C4F-A898-0148558C34F4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{8F959801-D494-4CAF-9437-90F30472E169}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Forms.Regions", "src\Forms\Prism.Forms.Regions\Prism.Forms.Regions.csproj", "{7760BB71-219E-4DB1-B67C-7A428D9A10E2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Ioc.DryIoc.Tests", "tests\Containers\Prism.Container.DryIoc.Tests\Prism.Ioc.DryIoc.Tests.csproj", "{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Ioc.Unity.Tests", "tests\Containers\Prism.Container.Unity.Tests\Prism.Ioc.Unity.Tests.csproj", "{704E14A4-C3A2-492D-9C4E-7D386A18B698}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.Ioc.Shared", "tests\Containers\Prism.Container.Shared\Prism.Ioc.Shared.shproj", "{78932299-2281-4A59-BFB8-07DE3014F748}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Containers", "Containers", "{D62DD517-CA80-449D-A26B-9AB427379825}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.Container.Wpf.Shared", "tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.shproj", "{BD42A7D6-A84D-4D27-9C28-7F6A2EC477F1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno.WinUI", "src\Uno\Prism.Uno\Prism.Uno.WinUI.csproj", "{E74664C1-1BB1-4920-8099-2C9125CFD00B}"
Expand All @@ -99,7 +85,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Maui.Tests", "tests\M
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Maui.Tests", "tests\Maui\Prism.DryIoc.Maui.Tests\Prism.DryIoc.Maui.Tests.csproj", "{8711D306-1118-4A11-9399-EF14AA13015E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Events", "src\Prism.Events\Prism.Events.csproj", "{8610485A-BE9F-4938-86D4-E9F1FA1739A0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Events", "src\Prism.Events\Prism.Events.csproj", "{8610485A-BE9F-4938-86D4-E9F1FA1739A0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -303,30 +289,6 @@ Global
{7760BB71-219E-4DB1-B67C-7A428D9A10E2}.Release|x64.Build.0 = Release|Any CPU
{7760BB71-219E-4DB1-B67C-7A428D9A10E2}.Release|x86.ActiveCfg = Release|Any CPU
{7760BB71-219E-4DB1-B67C-7A428D9A10E2}.Release|x86.Build.0 = Release|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Debug|x64.ActiveCfg = Debug|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Debug|x64.Build.0 = Debug|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Debug|x86.ActiveCfg = Debug|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Debug|x86.Build.0 = Debug|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Release|Any CPU.Build.0 = Release|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Release|x64.ActiveCfg = Release|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Release|x64.Build.0 = Release|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Release|x86.ActiveCfg = Release|Any CPU
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA}.Release|x86.Build.0 = Release|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Debug|Any CPU.Build.0 = Debug|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Debug|x64.ActiveCfg = Debug|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Debug|x64.Build.0 = Debug|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Debug|x86.ActiveCfg = Debug|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Debug|x86.Build.0 = Debug|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Release|Any CPU.ActiveCfg = Release|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Release|Any CPU.Build.0 = Release|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Release|x64.ActiveCfg = Release|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Release|x64.Build.0 = Release|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Release|x86.ActiveCfg = Release|Any CPU
{704E14A4-C3A2-492D-9C4E-7D386A18B698}.Release|x86.Build.0 = Release|Any CPU
{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E74664C1-1BB1-4920-8099-2C9125CFD00B}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -460,15 +422,8 @@ Global
{367BE810-5B34-4894-BE47-1C8DCC67DE81} = {F1F91777-01EA-43A3-A3ED-D473B382F46C}
{2E8F565D-9D13-424E-BD86-C5A362F9AAE7} = {F1F91777-01EA-43A3-A3ED-D473B382F46C}
{FAC4FA5A-D6C1-4787-9B1F-A3EC6E2FB26E} = {F8A0FDE6-8E75-47D1-9E33-02AB8E8AB473}
{75B1C655-8365-4130-8B79-C748BF0403F2} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
{D66336A6-07E5-401A-A710-DAEDD6975D59} = {75B1C655-8365-4130-8B79-C748BF0403F2}
{6E7EC81D-DA39-4C4F-A898-0148558C34F4} = {75B1C655-8365-4130-8B79-C748BF0403F2}
{8F959801-D494-4CAF-9437-90F30472E169} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
{7760BB71-219E-4DB1-B67C-7A428D9A10E2} = {017675AD-346B-499D-819A-C43A2288DE98}
{2D7EC81A-17B5-47C3-8AE1-619F7F8843AA} = {D62DD517-CA80-449D-A26B-9AB427379825}
{704E14A4-C3A2-492D-9C4E-7D386A18B698} = {D62DD517-CA80-449D-A26B-9AB427379825}
{78932299-2281-4A59-BFB8-07DE3014F748} = {D62DD517-CA80-449D-A26B-9AB427379825}
{D62DD517-CA80-449D-A26B-9AB427379825} = {00FFDC13-7397-46F1-897E-A62A7575D28A}
{BD42A7D6-A84D-4D27-9C28-7F6A2EC477F1} = {F1F91777-01EA-43A3-A3ED-D473B382F46C}
{E74664C1-1BB1-4920-8099-2C9125CFD00B} = {8F959801-D494-4CAF-9437-90F30472E169}
{DB530D15-0556-4B6F-96B2-1497C8DF08D6} = {8F959801-D494-4CAF-9437-90F30472E169}
Expand All @@ -487,23 +442,10 @@ Global
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
tests\Forms\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems*{089c5e84-52c3-409e-924c-bd8f4833594b}*SharedItemsImports = 5
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{0c8aab85-387c-41d2-abce-bafaf74b62b2}*SharedItemsImports = 5
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{2d7ec81a-17b5-47c3-8ae1-619f7f8843aa}*SharedItemsImports = 5
tests\Containers\Prism.Container.Shared\Prism.Container.Shared.projitems*{2d7ec81a-17b5-47c3-8ae1-619f7f8843aa}*SharedItemsImports = 5
tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.projitems*{367be810-5b34-4894-be47-1c8dcc67de81}*SharedItemsImports = 5
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{60d92138-66ac-4dc9-973d-fdd917f87112}*SharedItemsImports = 5
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{6e7ec81d-da39-4c4f-a898-0148558c34f4}*SharedItemsImports = 13
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{704e14a4-c3a2-492d-9c4e-7d386a18b698}*SharedItemsImports = 5
tests\Containers\Prism.Container.Shared\Prism.Container.Shared.projitems*{704e14a4-c3a2-492d-9c4e-7d386a18b698}*SharedItemsImports = 5
tests\Containers\Prism.Container.Shared\Prism.Container.Shared.projitems*{78932299-2281-4a59-bfb8-07de3014f748}*SharedItemsImports = 13
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{aad8a958-546b-4b7d-bbd1-d79e825530eb}*SharedItemsImports = 5
tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.projitems*{ba05687e-2317-4a65-805b-c596f52f7203}*SharedItemsImports = 5
tests\Wpf\Prism.Container.Wpf.Shared\Prism.Container.Wpf.Shared.projitems*{bd42a7d6-a84d-4d27-9c28-7f6a2ec477f1}*SharedItemsImports = 13
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{c2f58215-92f0-4501-a9f4-862c78b2b4ce}*SharedItemsImports = 5
tests\Forms\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems*{c2ff8459-f2d1-4b87-a31a-82a1835f89cf}*SharedItemsImports = 5
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{d66336a6-07e5-401a-a710-daedd6975d59}*SharedItemsImports = 13
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{db530d15-0556-4b6f-96b2-1497c8df08d6}*SharedItemsImports = 5
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{e9a2458b-999d-4d36-822f-663d3830575a}*SharedItemsImports = 5
tests\Forms\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems*{fac4fa5a-d6c1-4787-9b1f-a3ec6e2fb26e}*SharedItemsImports = 13
EndGlobalSection
EndGlobal
5 changes: 0 additions & 5 deletions PrismLibrary_Core.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"solution": {
"path": "PrismLibrary.sln",
"projects": [
"src\\Containers\\Prism.DryIoc.Shared\\Prism.DryIoc.Shared.shproj",
"src\\Containers\\Prism.Unity.Shared\\Prism.Unity.Shared.shproj",
"src\\Prism.Core\\Prism.Core.csproj",
"src\\Prism.Events\\Prism.Events.csproj",
"tests\\Containers\\Prism.Container.DryIoc.Tests\\Prism.Ioc.DryIoc.Tests.csproj",
"tests\\Containers\\Prism.Container.Shared\\Prism.Ioc.Shared.shproj",
"tests\\Containers\\Prism.Container.Unity.Tests\\Prism.Ioc.Unity.Tests.csproj",
"tests\\Prism.Core.Tests\\Prism.Core.Tests.csproj"
]
}
Expand Down
5 changes: 0 additions & 5 deletions PrismLibrary_Forms.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,12 @@
"solution": {
"path": "PrismLibrary.sln",
"projects": [
"src\\Containers\\Prism.DryIoc.Shared\\Prism.DryIoc.Shared.shproj",
"src\\Containers\\Prism.Unity.Shared\\Prism.Unity.Shared.shproj",
"src\\Forms\\Prism.DryIoc.Forms\\Prism.DryIoc.Forms.csproj",
"src\\Forms\\Prism.Forms.Regions\\Prism.Forms.Regions.csproj",
"src\\Forms\\Prism.Forms\\Prism.Forms.csproj",
"src\\Forms\\Prism.Unity.Forms\\Prism.Unity.Forms.csproj",
"src\\Prism.Core\\Prism.Core.csproj",
"src\\Prism.Events\\Prism.Events.csproj",
"tests\\Containers\\Prism.Container.DryIoc.Tests\\Prism.Ioc.DryIoc.Tests.csproj",
"tests\\Containers\\Prism.Container.Shared\\Prism.Ioc.Shared.shproj",
"tests\\Containers\\Prism.Container.Unity.Tests\\Prism.Ioc.Unity.Tests.csproj",
"tests\\Forms\\Prism.DI.Forms.Tests\\Prism.DI.Forms.Tests.shproj",
"tests\\Forms\\Prism.DryIoc.Forms.Tests\\Prism.DryIoc.Forms.Tests.csproj",
"tests\\Forms\\Prism.Forms.Regions.Tests\\Prism.Forms.Regions.Tests.csproj",
Expand Down
3 changes: 0 additions & 3 deletions PrismLibrary_Maui.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
"solution": {
"path": "PrismLibrary.sln",
"projects": [
"src\\Containers\\Prism.DryIoc.Shared\\Prism.DryIoc.Shared.shproj",
"src\\Maui\\Prism.DryIoc.Maui\\Prism.DryIoc.Maui.csproj",
"src\\Maui\\Prism.Maui.Rx\\Prism.Maui.Rx.csproj",
"src\\Maui\\Prism.Maui\\Prism.Maui.csproj",
"src\\Prism.Core\\Prism.Core.csproj",
"src\\Prism.Events\\Prism.Events.csproj",
"tests\\Containers\\Prism.Container.DryIoc.Tests\\Prism.Ioc.DryIoc.Tests.csproj",
"tests\\Containers\\Prism.Container.Shared\\Prism.Ioc.Shared.shproj",
"tests\\Maui\\Prism.DryIoc.Maui.Tests\\Prism.DryIoc.Maui.Tests.csproj",
"tests\\Maui\\Prism.Maui.Tests\\Prism.Maui.Tests.csproj",
"tests\\Prism.Core.Tests\\Prism.Core.Tests.csproj"
Expand Down
5 changes: 0 additions & 5 deletions PrismLibrary_Uno.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@
"solution": {
"path": "PrismLibrary.sln",
"projects": [
"src\\Containers\\Prism.DryIoc.Shared\\Prism.DryIoc.Shared.shproj",
"src\\Containers\\Prism.Unity.Shared\\Prism.Unity.Shared.shproj",
"src\\Prism.Core\\Prism.Core.csproj",
"src\\Prism.Events\\Prism.Events.csproj",
"src\\Uno\\Prism.DryIoc.Uno\\Prism.DryIoc.Uno.WinUI.csproj",
"src\\Uno\\Prism.Uno\\Prism.Uno.WinUI.csproj",
"tests\\Containers\\Prism.Container.DryIoc.Tests\\Prism.Ioc.DryIoc.Tests.csproj",
"tests\\Containers\\Prism.Container.Shared\\Prism.Ioc.Shared.shproj",
"tests\\Containers\\Prism.Container.Unity.Tests\\Prism.Ioc.Unity.Tests.csproj",
"tests\\Prism.Core.Tests\\Prism.Core.Tests.csproj"
]
}
Expand Down
5 changes: 0 additions & 5 deletions PrismLibrary_Wpf.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@
"solution": {
"path": "PrismLibrary.sln",
"projects": [
"src\\Containers\\Prism.DryIoc.Shared\\Prism.DryIoc.Shared.shproj",
"src\\Containers\\Prism.Unity.Shared\\Prism.Unity.Shared.shproj",
"src\\Prism.Core\\Prism.Core.csproj",
"src\\Prism.Events\\Prism.Events.csproj",
"src\\Wpf\\Prism.DryIoc.Wpf\\Prism.DryIoc.Wpf.csproj",
"src\\Wpf\\Prism.Unity.Wpf\\Prism.Unity.Wpf.csproj",
"src\\Wpf\\Prism.Wpf\\Prism.Wpf.csproj",
"tests\\Containers\\Prism.Container.DryIoc.Tests\\Prism.Ioc.DryIoc.Tests.csproj",
"tests\\Containers\\Prism.Container.Shared\\Prism.Ioc.Shared.shproj",
"tests\\Containers\\Prism.Container.Unity.Tests\\Prism.Ioc.Unity.Tests.csproj",
"tests\\Prism.Core.Tests\\Prism.Core.Tests.csproj",
"tests\\Wpf\\Prism.Container.Wpf.Shared\\Prism.Container.Wpf.Shared.shproj",
"tests\\Wpf\\Prism.DryIoc.Wpf.Tests\\Prism.DryIoc.Wpf.Tests.csproj",
Expand Down
Loading
Loading