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.

Sign up for GitHub

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

v9.0.401-pre - Fix dependency for Prism.Core #170

Merged
merged 1 commit into from
Jul 27, 2024
Merged

v9.0.401-pre - Fix dependency for Prism.Core #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Prism.Avalonia.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,6 @@ Global
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
tests\Avalonia\Prism.Container.Avalonia.Shared\Prism.Container.Avalonia.Shared.projitems*{2063f822-f705-4b34-8ba2-658e6bd78001}*SharedItemsImports = 5
tests\Avalonia\Prism.Container.Avalonia.Shared\Prism.Container.Avalonia.Shared.projitems*{bd42a7d6-a84d-4d27-9c28-7f6a2ec477f1}*SharedItemsImports = 13
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion tests/Avalonia/Prism.Avalonia.Tests/Regions/RegionManagerFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ public void CanAddViewToRegion()
Assert.True(regionManager.Regions["RegionName"].Views.Contains(view2));
}

[Fact]
[Fact(DisplayName = "Flaky test. Run by itself not as a group.")]
public void CanRegisterViewType()
{
try
Expand Down
48 changes: 30 additions & 18 deletions ...valonia/Prism.Container.Avalonia.Shared/Fixtures/Ioc/ContainerProviderExtensionFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
using System;
/*
* TODO: Fix me for Avalonia
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Reflection;
using System.Threading;
using Avalonia.Controls;
Expand Down Expand Up @@ -101,16 +104,16 @@ public void CanResolvedNamedServiceUsingProperty(string name)

private const string _xamlWithMarkupExtension =
@"<Window
xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
xmlns=""https://github.com/avaloniaui""
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
xmlns:prism='http://prismlibrary.com/'
xmlns:mocks='clr-namespace:Prism.IocContainer.Avalonia.Tests.Support.Mocks;assembly=Prism.IocContainer.Avalonia.Tests.Support'
DataContext='{prism:ContainerProvider mocks:IService}' />";

private const string _xamlWithXmlElement =
@"<Window
xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
xmlns=""https://github.com/avaloniaui""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:prism='http://prismlibrary.com/'
xmlns:mocks='clr-namespace:Prism.IocContainer.Avalonia.Tests.Support.Mocks;assembly=Prism.IocContainer.Avalonia.Tests.Support'>
<Window.DataContext>
Expand All @@ -128,23 +131,32 @@ public void CanResolveServiceFromXaml(string xaml)
// and Window.DataContext will be null.

object dataContext = null;
var thread = new Thread(() =>
try
{
////using (var reader = new StringReader(xaml))
////{
//// var window = XamlServices.Load(reader) as Window;
//// dataContext = window.DataContext;
////}

var window = AvaloniaRuntimeXamlLoader.Load(xaml) as Window;
dataContext = window.DataContext;

});
thread.SetApartmentState(ApartmentState.STA);
thread.Start();
thread.Join();
var thread = new Thread(() =>
{
////using (var reader = new StringReader(xaml))
////{
//// var window = XamlServices.Load(reader) as Window;
//// dataContext = window.DataContext;
////}

var window = AvaloniaRuntimeXamlLoader.Load(xaml) as Window;
dataContext = window.DataContext;
});

thread.SetApartmentState(ApartmentState.STA);
thread.Start();
thread.Join();
}
catch (Exception ex)
{
Console.WriteLine("Issue resolving AXAML: " + ex);
Debug.WriteLine("Issue resolving AXAML: " + ex);
}

Assert.Same(_unnamedService, dataContext);
}
}
}
*/
9 changes: 5 additions & 4 deletions tests/Prism.Core.Tests/Prism.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -10,10 +10,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="GitHubActionsTestLogger">
<!--<PackageReference Include="GitHubActionsTestLogger">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</PackageReference>-->
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Moq" />
<PackageReference Include="xunit" />
Expand All @@ -24,7 +24,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Prism.Core\Prism.Core.csproj" />
<!--<ProjectReference Include="..\..\src\Prism.Core\Prism.Core.csproj" />-->
<ProjectReference Include="..\..\src\Prism.Avalonia\Prism.Avalonia.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down