Skip to content

Commit 6ed21e2

Browse files
dansiegeldansiegel
authored
Merge pull request #3397 from PrismLibrary/dev/ds/maui-tests
Enhances Prism.Maui navigation test coverage
2 parents ff632cd + a699ea3 commit 6ed21e2

71 files changed

Lines changed: 2184 additions & 1912 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@
156156

157157
<!-- Versions: Directory.Packages.props (Central Package Management). PrivateAssets=all is implicit. -->
158158
<ItemGroup>
159-
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
159+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
160160
Condition=" $(UseMaui) != 'true' " />
161-
<GlobalPackageReference Include="Nerdbank.GitVersioning"
161+
<PackageReference Include="Nerdbank.GitVersioning"
162162
Condition=" $(DISABLE_GITVERSIONING) != 'true' AND !$(MSBuildProjectDirectory.Contains('e2e')) " />
163-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub"
163+
<PackageReference Include="Microsoft.SourceLink.GitHub"
164164
Condition=" $(IsPackable) " />
165-
<GlobalPackageReference Include="Microsoft.Sbom.Targets"
165+
<PackageReference Include="Microsoft.Sbom.Targets"
166166
Condition=" $(IsPackable) " />
167167
</ItemGroup>
168168

‎PrismLibrary.sln‎

Lines changed: 0 additions & 462 deletions
This file was deleted.

‎PrismLibrary.slnx‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="Any CPU" />
4+
<Platform Name="x64" />
5+
<Platform Name="x86" />
6+
</Configurations>
7+
<Folder Name="/Solution Items/">
8+
<File Path=".editorconfig" />
9+
<File Path=".gitignore" />
10+
<File Path="CodeCoverage.runsettings" />
11+
<File Path="Directory.Build.props" />
12+
<File Path="Directory.build.targets" />
13+
<File Path="Directory.Packages.props" />
14+
<File Path="global.json" />
15+
<File Path="xunit.runner.json" />
16+
</Folder>
17+
<Folder Name="/src/">
18+
<File Path="src/Directory.Build.props" />
19+
<File Path="src/Directory.Build.targets" />
20+
<Project Path="src/Prism.Core/Prism.Core.csproj" />
21+
<Project Path="src/Prism.Events/Prism.Events.csproj" />
22+
</Folder>
23+
<Folder Name="/src/Avalonia/">
24+
<Project Path="src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj" />
25+
<Project Path="src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj" />
26+
</Folder>
27+
<Folder Name="/src/Maui/">
28+
<Project Path="src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj" />
29+
<Project Path="src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj" />
30+
<Project Path="src/Maui/Prism.Maui/Prism.Maui.csproj" />
31+
</Folder>
32+
<Folder Name="/src/Uno/">
33+
<Project Path="src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj" />
34+
<Project Path="src/Uno/Prism.Uno.Markup/Prism.Uno.WinUI.Markup.csproj" />
35+
<Project Path="src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj" />
36+
</Folder>
37+
<Folder Name="/src/Uno/Prism.DryIoc.Uno/" />
38+
<Folder Name="/src/Uno/Prism.Uno/" />
39+
<Folder Name="/src/Wpf/">
40+
<Project Path="src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj" />
41+
<Project Path="src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj" />
42+
<Project Path="src/Wpf/Prism.Wpf/Prism.Wpf.csproj" />
43+
</Folder>
44+
<Folder Name="/tests/">
45+
<Project Path="tests/Prism.Core.Tests/Prism.Core.Tests.csproj" />
46+
</Folder>
47+
<Folder Name="/tests/Avalonia/">
48+
<Project Path="tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj" />
49+
<Project Path="tests/Avalonia/Prism.Container.Avalonia.Shared/Prism.Container.Avalonia.Shared.shproj" />
50+
<Project Path="tests/Avalonia/Prism.DryIoc.Avalonia.Tests/Prism.DryIoc.Avalonia.Tests.csproj" />
51+
<Project Path="tests/Avalonia/Prism.IocContainer.Avalonia.Tests.Support/Prism.IocContainer.Avalonia.Tests.Support.csproj" />
52+
</Folder>
53+
<Folder Name="/tests/Maui/">
54+
<Project Path="tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj" />
55+
<Project Path="tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj" />
56+
</Folder>
57+
<Folder Name="/tests/Uno/">
58+
<Project Path="tests/Uno/Prism.DryIoc.Uno.WinUI.Tests/Prism.DryIoc.Uno.WinUI.Tests.csproj" />
59+
<Project Path="tests/Uno/Prism.Uno.WinUI.Tests/Prism.Uno.WinUI.Tests.csproj" />
60+
</Folder>
61+
<Folder Name="/tests/Wpf/">
62+
<Project Path="tests/Wpf/Prism.Container.Wpf.Shared/Prism.Container.Wpf.Shared.shproj" />
63+
<Project Path="tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj" />
64+
<Project Path="tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj" />
65+
<Project Path="tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj" />
66+
<Project Path="tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj" />
67+
</Folder>
68+
</Solution>

‎PrismLibrary_Avalonia.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "PrismLibrary.sln",
3+
"path": "PrismLibrary.slnx",
44
"projects": [
55
"src\\Avalonia\\Prism.Avalonia\\Prism.Avalonia.csproj",
66
"src\\Avalonia\\Prism.DryIoc.Avalonia\\Prism.DryIoc.Avalonia.csproj",

‎PrismLibrary_Core.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "PrismLibrary.sln",
3+
"path": "PrismLibrary.slnx",
44
"projects": [
55
"src\\Prism.Core\\Prism.Core.csproj",
66
"src\\Prism.Events\\Prism.Events.csproj",

‎PrismLibrary_Maui.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "PrismLibrary.sln",
3+
"path": "PrismLibrary.slnx",
44
"projects": [
55
"src\\Maui\\Prism.DryIoc.Maui\\Prism.DryIoc.Maui.csproj",
66
"src\\Maui\\Prism.Maui.Rx\\Prism.Maui.Rx.csproj",

‎PrismLibrary_Uno.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "PrismLibrary.sln",
3+
"path": "PrismLibrary.slnx",
44
"projects": [
55
"src\\Prism.Core\\Prism.Core.csproj",
66
"src\\Prism.Events\\Prism.Events.csproj",

‎PrismLibrary_Wpf.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "PrismLibrary.sln",
3+
"path": "PrismLibrary.slnx",
44
"projects": [
55
"src\\Prism.Core\\Prism.Core.csproj",
66
"src\\Prism.Events\\Prism.Events.csproj",

‎e2e/Avalonia/PrismAvaloniaDemo.sln‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎e2e/Avalonia/PrismAvaloniaDemo.slnx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Solution>
2+
<Folder Name="/Prism Library/">
3+
<Project Path="../../src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj" />
4+
<Project Path="../../src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj" />
5+
<Project Path="../../src/Prism.Core/Prism.Core.csproj" />
6+
<Project Path="../../src/Prism.Events/Prism.Events.csproj" />
7+
</Folder>
8+
<Project Path="PrismAvaloniaDemo/PrismAvaloniaDemo.csproj" />
9+
</Solution>

0 commit comments

Comments
 (0)