tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge PlatformSupport project into Avalonia.Base

pull/8183/head
Max Katz 4 years ago
parent
8e4d904a5a
commit
ad0a06bf24
28 changed files with 22 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 53
      Avalonia.sln
  2. 1
      build/CoreLibraries.props
  3. 1
      src/Avalonia.Base/Media/PathGeometry.cs
  4. 2
      src/Avalonia.Base/Media/PathGeometryCollections.cs
  5. 5
      src/Avalonia.Base/Platform/AssetLoader.cs
  6. 2
      src/Avalonia.Base/Platform/Internal/AssemblyDescriptor.cs
  7. 2
      src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs
  8. 2
      src/Avalonia.Base/Platform/Internal/AssetDescriptor.cs
  9. 2
      src/Avalonia.Base/Platform/Internal/Constants.cs
  10. 2
      src/Avalonia.Base/Platform/Internal/DynLoader.cs
  11. 2
      src/Avalonia.Base/Platform/Internal/SlicedStream.cs
  12. 3
      src/Avalonia.Base/Platform/PathGeometryContext.cs
  13. 3
      src/Avalonia.Base/Platform/StandardRuntimePlatform.cs
  14. 4
      src/Avalonia.Base/Platform/StandardRuntimePlatformServices.cs
  15. 1
      src/Avalonia.Base/Properties/AssemblyInfo.cs
  16. 2
      src/Avalonia.Controls/AppBuilder.cs
  17. 36
      src/Avalonia.Controls/AppBuilderBase.cs
  18. 1
      src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
  19. 1
      src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs
  20. 5
      tests/Avalonia.Base.UnitTests/AssetLoaderTests.cs
  21. 1
      tests/Avalonia.Base.UnitTests/Media/PathMarkupParserTests.cs
  22. 1
      tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs
  23. 1
      tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs
  24. 2
      tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
  25. 2
      tests/Avalonia.RenderTests/TestBase.cs
  26. 1
      tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
  27. 1
      tests/Avalonia.UnitTests/TestServices.cs
  28. 1
      tests/Avalonia.UnitTests/UnitTestApplication.cs

53
Avalonia.sln
View File

@ -209,12 +209,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsInteropTest", "sampl
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlSamples", "samples\SampleControls\ControlSamples.csproj", "{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.PlatformSupport", "src\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj", "{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.PlatformSupport.UnitTests", "tests\Avalonia.PlatformSupport.UnitTests\Avalonia.PlatformSupport.UnitTests.csproj", "{CE910927-CE5A-456F-BC92-E4C757354A5C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.SourceGenerator", "src\Avalonia.SourceGenerator\Avalonia.SourceGenerator.csproj", "{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevAnalyzers", "src\tools\DevAnalyzers\DevAnalyzers.csproj", "{2B390431-288C-435C-BB6B-A374033BD8D1}"
@ -1845,30 +1841,6 @@ Global
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhone.Build.0 = Release|Any CPU
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhone.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhone.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|Any CPU.Build.0 = Release|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhone.ActiveCfg = Release|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhone.Build.0 = Release|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@ -1893,30 +1865,6 @@ Global
{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhone.Build.0 = Release|Any CPU
{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|iPhone.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|iPhone.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|Any CPU.Build.0 = Release|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|iPhone.ActiveCfg = Release|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|iPhone.Build.0 = Release|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@ -2046,7 +1994,6 @@ Global
{26A98DA1-D89D-4A95-8152-349F404DA2E2} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{CE910927-CE5A-456F-BC92-E4C757354A5C} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
{2B390431-288C-435C-BB6B-A374033BD8D1} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution

1
build/CoreLibraries.props
View File

@ -8,6 +8,5 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Markup/Avalonia.Markup/Avalonia.Markup.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.MicroCom/Avalonia.MicroCom.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj" />
</ItemGroup>
</Project>

1
src/Avalonia.Base/Media/PathGeometry.cs
View File

@ -2,7 +2,6 @@ using System;
using Avalonia.Collections;
using Avalonia.Metadata;
using Avalonia.Platform;
using Avalonia.Visuals.Platform;
namespace Avalonia.Media
{

2
src/Avalonia.Base/Media/PathGeometryCollections.cs
View File

@ -1,5 +1,5 @@
using Avalonia.Collections;
using Avalonia.Visuals.Platform;
using Avalonia.Platform;
namespace Avalonia.Media
{

5
src/Avalonia.PlatformSupport/AssetLoader.cs → src/Avalonia.Base/Platform/AssetLoader.cs
View File

@ -3,11 +3,10 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using Avalonia.Platform;
using Avalonia.PlatformSupport.Internal;
using Avalonia.Platform.Internal;
using Avalonia.Utilities;
namespace Avalonia.PlatformSupport
namespace Avalonia.Platform
{
/// <summary>
/// Loads assets compiled into the application binary.

2
src/Avalonia.PlatformSupport/Internal/AssemblyDescriptor.cs → src/Avalonia.Base/Platform/Internal/AssemblyDescriptor.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Reflection;
using Avalonia.Utilities;
namespace Avalonia.PlatformSupport.Internal;
namespace Avalonia.Platform.Internal;
internal interface IAssemblyDescriptor
{

2
src/Avalonia.PlatformSupport/Internal/AssemblyDescriptorResolver.cs → src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
namespace Avalonia.PlatformSupport.Internal;
namespace Avalonia.Platform.Internal;
internal interface IAssemblyDescriptorResolver
{

2
src/Avalonia.PlatformSupport/Internal/AssetDescriptor.cs → src/Avalonia.Base/Platform/Internal/AssetDescriptor.cs
View File

@ -2,7 +2,7 @@
using System.IO;
using System.Reflection;
namespace Avalonia.PlatformSupport.Internal;
namespace Avalonia.Platform.Internal;
internal interface IAssetDescriptor
{

2
src/Avalonia.PlatformSupport/Internal/Constants.cs → src/Avalonia.Base/Platform/Internal/Constants.cs
View File

@ -1,4 +1,4 @@
namespace Avalonia.PlatformSupport.Internal;
namespace Avalonia.Platform.Internal;
internal static class Constants
{

2
src/Avalonia.PlatformSupport/DynLoader.cs → src/Avalonia.Base/Platform/Internal/DynLoader.cs
View File

@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
using Avalonia.Platform.Interop;
// ReSharper disable InconsistentNaming
namespace Avalonia.PlatformSupport
namespace Avalonia.Platform.Internal
{
class UnixLoader : IDynamicLibraryLoader
{

2
src/Avalonia.PlatformSupport/Internal/SlicedStream.cs → src/Avalonia.Base/Platform/Internal/SlicedStream.cs
View File

@ -1,7 +1,7 @@
using System;
using System.IO;
namespace Avalonia.PlatformSupport.Internal;
namespace Avalonia.Platform.Internal;
internal class SlicedStream : Stream
{

3
src/Avalonia.Base/Platform/PathGeometryContext.cs
View File

@ -1,9 +1,8 @@
using System;
using System.Diagnostics.CodeAnalysis;
using Avalonia.Media;
using Avalonia.Platform;
namespace Avalonia.Visuals.Platform
namespace Avalonia.Platform
{
public class PathGeometryContext : IGeometryContext
{

3
src/Avalonia.PlatformSupport/StandardRuntimePlatform.cs → src/Avalonia.Base/Platform/StandardRuntimePlatform.cs
View File

@ -1,9 +1,8 @@
using System;
using System.Runtime.InteropServices;
using System.Threading;
using Avalonia.Platform;
namespace Avalonia.PlatformSupport
namespace Avalonia.Platform
{
public class StandardRuntimePlatform : IRuntimePlatform
{

4
src/Avalonia.PlatformSupport/StandardRuntimePlatformServices.cs → src/Avalonia.Base/Platform/StandardRuntimePlatformServices.cs
View File

@ -1,8 +1,8 @@
using System.Reflection;
using Avalonia.Platform;
using Avalonia.Platform.Internal;
using Avalonia.Platform.Interop;
namespace Avalonia.PlatformSupport
namespace Avalonia.Platform
{
public static class StandardRuntimePlatformServices
{

1
src/Avalonia.Base/Properties/AssemblyInfo.cs
View File

@ -26,7 +26,6 @@ using Avalonia.Metadata;
[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
[assembly: InternalsVisibleTo("Avalonia.PlatformSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
[assembly: InternalsVisibleTo("Avalonia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]

2
src/Avalonia.PlatformSupport/AppBuilder.cs → src/Avalonia.Controls/AppBuilder.cs
View File

@ -1,5 +1,5 @@
using Avalonia.Controls;
using Avalonia.PlatformSupport;
using Avalonia.Platform;
namespace Avalonia
{

36
src/Avalonia.Controls/AppBuilderBase.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Linq;
using Avalonia.Controls.ApplicationLifetimes;
@ -120,38 +119,8 @@ namespace Avalonia.Controls
return Self;
}
/// <summary>
/// Starts the application with an instance of <typeparamref name="TMainWindow"/>.
/// </summary>
/// <typeparam name="TMainWindow">The window type.</typeparam>
/// <param name="dataContextProvider">A delegate that will be called to create a data context for the window (optional).</param>
[Obsolete("Use either lifetimes or AppMain overload. See see https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes for details")]
public void Start<TMainWindow>(Func<object>? dataContextProvider = null)
where TMainWindow : Window, new()
{
AfterSetup(builder =>
{
var window = new TMainWindow();
if (dataContextProvider != null)
window.DataContext = dataContextProvider();
((IClassicDesktopStyleApplicationLifetime)builder.Instance!.ApplicationLifetime!)
.MainWindow = window;
});
// Copy-pasted because we can't call extension methods due to generic constraints
var lifetime = new ClassicDesktopStyleApplicationLifetime() {ShutdownMode = ShutdownMode.OnMainWindowClose};
SetupWithLifetime(lifetime);
lifetime.Start(Array.Empty<string>());
}
public delegate void AppMainDelegate(Application app, string[] args);
[Obsolete("Use either lifetimes or AppMain overload. See see https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes for details", true)]
public void Start()
{
throw new NotSupportedException();
}
public void Start(AppMainDelegate main, string[] args)
{
Setup();
@ -234,6 +203,9 @@ namespace Avalonia.Controls
protected virtual bool CheckSetup => true;
/// <summary>
/// Searches and initiates modules included with <see cref="ExportAvaloniaModuleAttribute"/> attribute.
/// </summary>
private void SetupAvaloniaModules()
{
var moduleInitializers = from assembly in AppDomain.CurrentDomain.GetAssemblies()

1
src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
View File

@ -51,7 +51,6 @@
<ItemGroup>
<ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
<ProjectReference Include="..\..\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj" />
<ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
</ItemGroup>
</Project>

1
src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs
View File

@ -1,6 +1,5 @@
using Avalonia.Controls;
using Avalonia.Platform;
using Avalonia.PlatformSupport;
namespace Avalonia.Web.Blazor
{

5
tests/Avalonia.PlatformSupport.UnitTests/AssetLoaderTests.cs → tests/Avalonia.Base.UnitTests/AssetLoaderTests.cs
View File

@ -1,10 +1,11 @@
using System;
using System.Reflection;
using Avalonia.PlatformSupport.Internal;
using Avalonia.Platform;
using Avalonia.Platform.Internal;
using Moq;
using Xunit;
namespace Avalonia.PlatformSupport.UnitTests;
namespace Avalonia.Base.UnitTests;
public class AssetLoaderTests
{

1
tests/Avalonia.Base.UnitTests/Media/PathMarkupParserTests.cs
View File

@ -2,7 +2,6 @@ using System.Globalization;
using System.IO;
using Avalonia.Media;
using Avalonia.Platform;
using Avalonia.Visuals.Platform;
using Moq;
using Xunit;

1
tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs
View File

@ -1,7 +1,6 @@
using System;
using Avalonia.Controls;
using Avalonia.Platform;
using Avalonia.PlatformSupport;
using Avalonia.Styling;
using Avalonia.UnitTests;
using BenchmarkDotNet.Attributes;

1
tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs
View File

@ -1,7 +1,6 @@
using System;
using Avalonia.Controls;
using Avalonia.Platform;
using Avalonia.PlatformSupport;
using Avalonia.Styling;
using Avalonia.UnitTests;
using BenchmarkDotNet.Attributes;

2
tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
View File

@ -2,7 +2,7 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml.Styling;
using Avalonia.PlatformSupport;
using Avalonia.Platform;
using Avalonia.Styling;
using Avalonia.UnitTests;

2
tests/Avalonia.RenderTests/TestBase.cs
View File

@ -25,8 +25,6 @@ namespace Avalonia.Skia.RenderTests
namespace Avalonia.Direct2D1.RenderTests
#endif
{
using Avalonia.PlatformSupport;
public class TestBase
{
#if AVALONIA_SKIA

1
tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
View File

@ -14,7 +14,6 @@
<EmbeddedResource Include="..\Avalonia.UnitTests\Assets\*.ttf" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj" />
<ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
<ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
<ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />

1
tests/Avalonia.UnitTests/TestServices.cs
View File

@ -5,7 +5,6 @@ using Avalonia.Layout;
using Avalonia.Markup.Xaml;
using Avalonia.Media;
using Avalonia.Platform;
using Avalonia.PlatformSupport;
using Avalonia.Styling;
using Avalonia.Themes.Default;
using Avalonia.Rendering;

1
tests/Avalonia.UnitTests/UnitTestApplication.cs
View File

@ -10,7 +10,6 @@ using System.Reactive.Disposables;
using System.Reactive.Concurrency;
using Avalonia.Input.Platform;
using Avalonia.Animation;
using Avalonia.PlatformSupport;
namespace Avalonia.UnitTests
{

Write Preview
Loading…
Cancel
Save