diff --git a/Directory.Build.props b/Directory.Build.props index 5057644930..eeae69bd45 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -22,6 +22,7 @@ + true $(MSBuildProjectName.Equals('Prism.Core')) $(MSBuildProjectName.Contains('Test')) $(MSBuildProjectName.Contains('Wpf')) @@ -53,9 +54,63 @@ $(DefineConstants);__ANDROID__ + + + + 21.0 + + + + + 14.2 + iossimulator-x64 + + + + + 10.14 + osx-x64 + + + + + 14.0 + maccatalyst-x64 + + + + + 10.0.18362.0 + 10.0.18362.0 + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/Directory.Build.targets b/Directory.Build.targets index cff16cd1e4..73fb42be63 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,4 @@ - - $(AssemblyName) ($(TargetFramework)) diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..e643216d43 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Packages.props b/Packages.props deleted file mode 100644 index 7cfbe48648..0000000000 --- a/Packages.props +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - diff --git a/PrismLibrary.sln b/PrismLibrary.sln index dea6ba32ac..cf56ae1dff 100644 --- a/PrismLibrary.sln +++ b/PrismLibrary.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29920.165 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}" EndProject @@ -67,12 +67,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.DryIoc.Shared", "src\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{8F959801-D494-4CAF-9437-90F30472E169}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno", "src\Uno\Prism.Uno\Prism.Uno.csproj", "{D007EECA-A0AE-470C-9365-86135CEFA12E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Uno", "src\Uno\Prism.Unity.Uno\Prism.Unity.Uno.csproj", "{9A1C368F-30AE-4C82-BE03-9168CE089B56}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Uno", "src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.csproj", "{02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}" -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}" @@ -85,42 +79,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Containers", "Containers", 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UWP", "UWP", "{150D34B0-F786-4FAA-A9DF-D06E1542BF8C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinUI", "WinUI", "{9DF4BF66-FEFA-4135-A37A-963E46B77D13}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno.WinUI", "src\Uno\Prism.Uno\Prism.Uno.WinUI.csproj", "{E74664C1-1BB1-4920-8099-2C9125CFD00B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Uno.WinUI", "src\Uno\Prism.Unity.Uno\Prism.Unity.Uno.WinUI.csproj", "{D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Uno.WinUI", "src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.WinUI.csproj", "{DB530D15-0556-4B6F-96B2-1497C8DF08D6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Forms.Regions.Tests", "tests\Forms\Prism.Forms.Regions.Tests\Prism.Forms.Regions.Tests.csproj", "{1DECC7D9-9F2A-4FF5-9FBB-A5245F1C73D7}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{02e0ecaa-b8c6-4eab-a9ab-164b1b99af35}*SharedItemsImports = 5 - 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*{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.Unity.Shared\Prism.Unity.Shared.projitems*{9a1c368f-30ae-4c82-be03-9168ce089b56}*SharedItemsImports = 5 - 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*{d3611b62-8fe0-4594-a4e0-1fa0c5cd8ada}*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 GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 @@ -310,42 +277,6 @@ Global {2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|x64.Build.0 = Release|Any CPU {2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|x86.ActiveCfg = Release|Any CPU {2E8F565D-9D13-424E-BD86-C5A362F9AAE7}.Release|x86.Build.0 = Release|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Debug|x64.ActiveCfg = Debug|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Debug|x64.Build.0 = Debug|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Debug|x86.ActiveCfg = Debug|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Debug|x86.Build.0 = Debug|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Release|Any CPU.Build.0 = Release|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Release|x64.ActiveCfg = Release|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Release|x64.Build.0 = Release|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Release|x86.ActiveCfg = Release|Any CPU - {D007EECA-A0AE-470C-9365-86135CEFA12E}.Release|x86.Build.0 = Release|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Debug|x64.ActiveCfg = Debug|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Debug|x64.Build.0 = Debug|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Debug|x86.ActiveCfg = Debug|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Debug|x86.Build.0 = Debug|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Release|Any CPU.Build.0 = Release|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Release|x64.ActiveCfg = Release|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Release|x64.Build.0 = Release|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Release|x86.ActiveCfg = Release|Any CPU - {9A1C368F-30AE-4C82-BE03-9168CE089B56}.Release|x86.Build.0 = Release|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Debug|x64.ActiveCfg = Debug|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Debug|x64.Build.0 = Debug|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Debug|x86.ActiveCfg = Debug|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Debug|x86.Build.0 = Debug|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Release|Any CPU.Build.0 = Release|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Release|x64.ActiveCfg = Release|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Release|x64.Build.0 = Release|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Release|x86.ActiveCfg = Release|Any CPU - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35}.Release|x86.Build.0 = Release|Any CPU {7760BB71-219E-4DB1-B67C-7A428D9A10E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7760BB71-219E-4DB1-B67C-7A428D9A10E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {7760BB71-219E-4DB1-B67C-7A428D9A10E2}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -394,18 +325,6 @@ Global {E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|x64.Build.0 = Release|Any CPU {E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|x86.ActiveCfg = Release|Any CPU {E74664C1-1BB1-4920-8099-2C9125CFD00B}.Release|x86.Build.0 = Release|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Debug|x64.ActiveCfg = Debug|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Debug|x64.Build.0 = Debug|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Debug|x86.ActiveCfg = Debug|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Debug|x86.Build.0 = Debug|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Release|Any CPU.Build.0 = Release|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Release|x64.ActiveCfg = Release|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Release|x64.Build.0 = Release|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Release|x86.ActiveCfg = Release|Any CPU - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA}.Release|x86.Build.0 = Release|Any CPU {DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {DB530D15-0556-4B6F-96B2-1497C8DF08D6}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -459,23 +378,38 @@ Global {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} - {D007EECA-A0AE-470C-9365-86135CEFA12E} = {150D34B0-F786-4FAA-A9DF-D06E1542BF8C} - {9A1C368F-30AE-4C82-BE03-9168CE089B56} = {150D34B0-F786-4FAA-A9DF-D06E1542BF8C} - {02E0ECAA-B8C6-4EAB-A9AB-164B1B99AF35} = {150D34B0-F786-4FAA-A9DF-D06E1542BF8C} {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} - {150D34B0-F786-4FAA-A9DF-D06E1542BF8C} = {8F959801-D494-4CAF-9437-90F30472E169} {9DF4BF66-FEFA-4135-A37A-963E46B77D13} = {8F959801-D494-4CAF-9437-90F30472E169} {E74664C1-1BB1-4920-8099-2C9125CFD00B} = {9DF4BF66-FEFA-4135-A37A-963E46B77D13} - {D3611B62-8FE0-4594-A4E0-1FA0C5CD8ADA} = {9DF4BF66-FEFA-4135-A37A-963E46B77D13} {DB530D15-0556-4B6F-96B2-1497C8DF08D6} = {9DF4BF66-FEFA-4135-A37A-963E46B77D13} {1DECC7D9-9F2A-4FF5-9FBB-A5245F1C73D7} = {F8A0FDE6-8E75-47D1-9E33-02AB8E8AB473} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6} 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*{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 diff --git a/PrismLibrary_Uno.sln b/PrismLibrary_Uno.sln index c3ccb398ee..5a525ea4e1 100644 --- a/PrismLibrary_Uno.sln +++ b/PrismLibrary_Uno.sln @@ -3,18 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # 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.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}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Containers", "Containers", "{B08E87A0-7697-43DA-AFB6-090E955057B4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{CBE0B15D-B960-4D91-9F74-2F7BA30BED4D}" -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.WinUI", "Uno.WinUI", "{41C6017D-FDF6-4EE0-92F2-126370858919}" @@ -24,11 +18,6 @@ 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 Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - 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 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU Ad-Hoc|ARM = Ad-Hoc|ARM @@ -56,102 +45,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|ARM.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|iPhone.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|x64.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|x64.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|x86.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.AppStore|x86.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|ARM.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|iPhone.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|x64.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|x64.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|x86.ActiveCfg = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Debug|x86.Build.0 = Debug|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|Any CPU.Build.0 = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|ARM.ActiveCfg = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|ARM.Build.0 = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|iPhone.ActiveCfg = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|iPhone.Build.0 = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|x64.ActiveCfg = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|x64.Build.0 = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|x86.ActiveCfg = Release|Any CPU - {B2A9C972-BD7A-4A95-B62C-F8385B819900}.Release|x86.Build.0 = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|ARM.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|iPhone.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|x64.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|x64.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|x86.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.AppStore|x86.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|ARM.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|iPhone.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|x64.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|x64.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|x86.ActiveCfg = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Debug|x86.Build.0 = Debug|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|Any CPU.Build.0 = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|ARM.ActiveCfg = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|ARM.Build.0 = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|iPhone.ActiveCfg = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|iPhone.Build.0 = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {B09FC94C-8100-4EB2-846C-99ACB056A993}.Release|x64.ActiveCfg = Release|Any CPU - {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 {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 @@ -301,11 +194,8 @@ Global 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} {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} {41C6017D-FDF6-4EE0-92F2-126370858919} = {57CC0FDC-A8BD-4A51-A965-C25F1A7DDF89} {D08AC337-20D8-4BB3-9150-AF8C0E31AA1A} = {41C6017D-FDF6-4EE0-92F2-126370858919} @@ -314,4 +204,8 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9A6B5A49-790C-425F-BBF5-99D104959C33} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + 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 + EndGlobalSection EndGlobal diff --git a/build/steps/prepare-build.yml b/build/steps/prepare-build.yml index b93eb104b9..454fb4d037 100644 --- a/build/steps/prepare-build.yml +++ b/build/steps/prepare-build.yml @@ -4,22 +4,22 @@ parameters: steps: - task: UseDotNet@2 - displayName: Ensure 3.1 SDK is Installed + displayName: Ensure 3.1 x is Installed inputs: packageType: 'sdk' - version: '3.1.409' + version: '3.1.x' - task: UseDotNet@2 - displayName: Ensure 5.0.203 SDK is Installed + displayName: Ensure 5.0.x SDK is Installed inputs: packageType: 'sdk' - version: '5.0.203' + version: '5.0.x' - task: UseDotNet@2 - displayName: 'Use global.json SDK' + displayName: Ensure 6.0.x SDK is Installed inputs: packageType: 'sdk' - useGlobalJson: true + version: '6.0.x' - task: NuGetToolInstaller@1 displayName: Use latest NuGet diff --git a/e2e/Forms/tests/HelloWorld.UITests/HelloWorld.UITests.csproj b/e2e/Forms/tests/HelloWorld.UITests/HelloWorld.UITests.csproj index ffcf7ef1e1..db3a242d5f 100644 --- a/e2e/Forms/tests/HelloWorld.UITests/HelloWorld.UITests.csproj +++ b/e2e/Forms/tests/HelloWorld.UITests/HelloWorld.UITests.csproj @@ -2,7 +2,7 @@ - net461 + net481 NU1201 $(ArtifactStagingRoot)\UITests diff --git a/global.json b/global.json index 853a36a25a..f159fe6885 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,9 @@ { "sdk": { - "version": "6.0.300", "rollForward": "latestMinor", "allowPrerelease": false }, "msbuild-sdks": { - "MSBuild.Sdk.Extras": "3.0.44", - "Microsoft.Build.CentralPackageVersions": "2.1.3" + "MSBuild.Sdk.Extras": "3.0.44" } } diff --git a/src/Prism.Core/Prism.Core.csproj b/src/Prism.Core/Prism.Core.csproj index 6ba4391fbd..9071e9b5d5 100644 --- a/src/Prism.Core/Prism.Core.csproj +++ b/src/Prism.Core/Prism.Core.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net461;net47;net6.0 + netstandard2.0;net47;net6.0 Prism Prism.Core Prism @@ -10,11 +10,6 @@ Prism is a fully open source version of the Prism guidance originally produced by Microsoft Patterns & Practices. Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared code base in a Portable Class Library targeting these platforms; WPF, and Xamarin Forms. Features that need to be platform specific are implemented in the respective libraries for the target platform. prism;wpf;xamarin;mvvm;xaml - - - - - diff --git a/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj b/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj index 361270404d..4bac4c5ae7 100644 --- a/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj +++ b/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj @@ -1,7 +1,7 @@  - netstandard2.0;xamarinios10;MonoAndroid11.0;MonoAndroid12.0;xamarinmac20 + netstandard2.0;net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-macos $(TargetFrameworks);net6.0-windows10.0.18362 $(NoWarn);1591 Prism.DryIoc.Uno @@ -20,10 +20,6 @@ Prism provides an implementation of a collection of design patterns that are hel prism;winui;windows;uno;mvvm;uwp;ios;android;macos;webassembly;linux;xaml;dryioc - - - - $(DefineConstants);__WASM__ diff --git a/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.csproj b/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.csproj deleted file mode 100644 index e77d136c2d..0000000000 --- a/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.csproj +++ /dev/null @@ -1,57 +0,0 @@ - - - - netstandard2.0;xamarinios10;MonoAndroid11.0;MonoAndroid12.0;xamarinmac20 - $(TargetFrameworks);uap10.0.18362; - $(DefineConstants);HAS_UWP - $(NoWarn);1591 - - - false - Use these extensions to build apps for Uno Platform, UWP, & WinUI using Prism with the DryIoc Container. - -Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET Standard. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, and Xamarin Forms). Prism for Uno Platform helps you more easily design and build rich, flexible, and easy to maintain Windows UWP, WinUI & cross platform Uno applications. - prism;winui;windows;uno;mvvm;uwp;ios;android;macos;webassembly;linux;xaml;dryioc - - - $(DefineConstants);__WASM__ - - - - - - - - %(Filename) - - - - - - - - - - - - - - - - - - - - - - - - $(AssemblyName).xml - - - - diff --git a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj index c13427b0f7..9749f672f7 100644 --- a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj +++ b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj @@ -1,7 +1,7 @@  - netstandard2.0;xamarinios10;MonoAndroid11.0;MonoAndroid12.0;xamarinmac20 + netstandard2.0;net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-macos $(TargetFrameworks);net6.0-windows10.0.18362 true Prism.Uno @@ -21,30 +21,26 @@ $(DefineConstants);__WASM__ - + - + - - + + %(Filename) - + - - + + diff --git a/src/Uno/Prism.Uno/Prism.Uno.csproj b/src/Uno/Prism.Uno/Prism.Uno.csproj deleted file mode 100644 index ecfbfd583c..0000000000 --- a/src/Uno/Prism.Uno/Prism.Uno.csproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - netstandard2.0;xamarinios10;MonoAndroid11.0;MonoAndroid12.0;xamarinmac20 - $(TargetFrameworks);uap10.0.18362; - true - Prism - $(DefineConstants);HAS_UWP - $(NoWarn);1591 - Prism.Uno - true - Prism is a fully open source version of the Prism guidance originally produced by Microsoft Patterns & Practices. Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET Standard. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, and Xamarin Forms). - -Prism for Uno Platform helps you more easily design and build rich, flexible, and easy to maintain Windows UWP, WinUI & cross platform Uno applications. This library provides user interface composition as well as modularity support. - prism;winui;windows;uno;mvvm;uwp;ios;android;macos;webassembly;linux;xaml - - - $(DefineConstants);__WASM__ - - - - - - - - - - - - - - %(Filename) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - $(AssemblyName).xml - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - MSBuild:Compile - - - diff --git a/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj b/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj index f259a72ab3..3c849fb6f0 100644 --- a/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj +++ b/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj @@ -2,7 +2,7 @@ - net461;net47;net6.0-windows + net47;net6.0-windows true Prism.DryIoc Prism.DryIoc diff --git a/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj b/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj index 558166be04..4464633d2c 100644 --- a/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj +++ b/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj @@ -2,7 +2,7 @@ - net461;net47;net6.0-windows + net47;net6.0-windows true Prism.Unity Prism.Unity diff --git a/src/Wpf/Prism.Wpf/Prism.Wpf.csproj b/src/Wpf/Prism.Wpf/Prism.Wpf.csproj index 99c14bee92..f72ac076c3 100644 --- a/src/Wpf/Prism.Wpf/Prism.Wpf.csproj +++ b/src/Wpf/Prism.Wpf/Prism.Wpf.csproj @@ -4,7 +4,7 @@ Properties Prism - net461;net47;net6.0-windows + net47;net6.0-windows true Prism is a fully open source version of the Prism guidance originally produced by Microsoft Patterns & Practices. Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET Standard. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, and Xamarin Forms). diff --git a/tests/Forms/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj b/tests/Forms/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj index 972ac532c4..8970032000 100644 --- a/tests/Forms/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj +++ b/tests/Forms/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/tests/Forms/Prism.Forms.Tests/Prism.Forms.Tests.csproj b/tests/Forms/Prism.Forms.Tests/Prism.Forms.Tests.csproj index 095caea295..2173ccd034 100644 --- a/tests/Forms/Prism.Forms.Tests/Prism.Forms.Tests.csproj +++ b/tests/Forms/Prism.Forms.Tests/Prism.Forms.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/tests/Forms/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj b/tests/Forms/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj index 56042326bf..93e05fc8d9 100644 --- a/tests/Forms/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj +++ b/tests/Forms/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/tests/Prism.Core.Tests/Prism.Core.Tests.csproj b/tests/Prism.Core.Tests/Prism.Core.Tests.csproj index 04646bcb50..594e06f448 100644 --- a/tests/Prism.Core.Tests/Prism.Core.Tests.csproj +++ b/tests/Prism.Core.Tests/Prism.Core.Tests.csproj @@ -1,7 +1,7 @@  - net461;net472;netcoreapp3.1 + net472;net6.0 false diff --git a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj index 4f213eb7da..1ffd54e107 100644 --- a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj +++ b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj b/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj index 0a511e8557..85108ba1ec 100644 --- a/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj +++ b/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj b/tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj index e25cbc7534..142d092c88 100644 --- a/tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj +++ b/tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj b/tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj index d69228609e..62169a806f 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj +++ b/tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj @@ -57,4 +57,4 @@ - \ No newline at end of file +