diff --git a/Avalonia.Desktop.slnf b/Avalonia.Desktop.slnf index 6af15751ef..a198954abe 100644 --- a/Avalonia.Desktop.slnf +++ b/Avalonia.Desktop.slnf @@ -1,72 +1,73 @@ { - "solution": { - "path": "Avalonia.sln", - "projects": [ - "packages\\Avalonia\\Avalonia.csproj", - "samples\\AppWithoutLifetime\\AppWithoutLifetime.csproj", - "samples\\ControlCatalog.Desktop\\ControlCatalog.Desktop.csproj", - "samples\\ControlCatalog\\ControlCatalog.csproj", - "samples\\GpuInterop\\GpuInterop.csproj", - "samples\\IntegrationTestApp\\IntegrationTestApp.csproj", - "samples\\TextTestApp\\TextTestApp.csproj", - "samples\\MiniMvvm\\MiniMvvm.csproj", - "samples\\RenderDemo\\RenderDemo.csproj", - "samples\\SampleControls\\ControlSamples.csproj", - "samples\\Sandbox\\Sandbox.csproj", - "samples\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContextPlug\\UnloadableAssemblyLoadContextPlug.csproj", - "samples\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContext.csproj", - "samples\\XEmbedSample\\XEmbedSample.csproj", - "src\\Avalonia.Base\\Avalonia.Base.csproj", - "src\\Avalonia.Build.Tasks\\Avalonia.Build.Tasks.csproj", - "src\\Avalonia.Controls.ColorPicker\\Avalonia.Controls.ColorPicker.csproj", - "src\\Avalonia.Controls\\Avalonia.Controls.csproj", - "src\\Avalonia.DesignerSupport\\Avalonia.DesignerSupport.csproj", - "src\\Avalonia.Desktop\\Avalonia.Desktop.csproj", - "src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj", - "src\\Avalonia.Fonts.Inter\\Avalonia.Fonts.Inter.csproj", - "src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj", - "src\\Avalonia.Metal\\Avalonia.Metal.csproj", - "src\\Avalonia.MicroCom\\Avalonia.MicroCom.csproj", - "src\\Avalonia.Native\\Avalonia.Native.csproj", - "src\\Avalonia.OpenGL\\Avalonia.OpenGL.csproj", - "src\\Avalonia.Vulkan\\Avalonia.Vulkan.csproj", - "src\\Avalonia.Remote.Protocol\\Avalonia.Remote.Protocol.csproj", - "src\\Avalonia.Themes.Fluent\\Avalonia.Themes.Fluent.csproj", - "src\\Avalonia.Themes.Simple\\Avalonia.Themes.Simple.csproj", - "src\\Avalonia.X11\\Avalonia.X11.csproj", - "src\\HarfBuzz\\Avalonia.HarfBuzz\\Avalonia.HarfBuzz.csproj", - "src\\Headless\\Avalonia.Headless.Vnc\\Avalonia.Headless.Vnc.csproj", - "src\\Headless\\Avalonia.Headless\\Avalonia.Headless.csproj", - "src\\Linux\\Avalonia.LinuxFramebuffer\\Avalonia.LinuxFramebuffer.csproj", - "src\\Markup\\Avalonia.Markup.Xaml.Loader\\Avalonia.Markup.Xaml.Loader.csproj", - "src\\Markup\\Avalonia.Markup.Xaml\\Avalonia.Markup.Xaml.csproj", - "src\\Markup\\Avalonia.Markup\\Avalonia.Markup.csproj", - "src\\Skia\\Avalonia.Skia\\Avalonia.Skia.csproj", - "src\\tools\\Avalonia.Analyzers.CodeFixes.CSharp\\Avalonia.Analyzers.CodeFixes.CSharp.csproj", - "src\\tools\\Avalonia.Analyzers.CSharp\\Avalonia.Analyzers.CSharp.csproj", - "src\\tools\\Avalonia.Analyzers.VisualBasic\\Avalonia.Analyzers.VisualBasic.csproj", - "src\\tools\\Avalonia.Generators\\Avalonia.Generators.csproj", - "src\\tools\\DevAnalyzers\\DevAnalyzers.csproj", - "src\\tools\\DevGenerators\\DevGenerators.csproj", - "src\\Windows\\Avalonia.Win32.Automation\\Avalonia.Win32.Automation.csproj", - "src\\Windows\\Avalonia.Win32.Interoperability\\Avalonia.Win32.Interoperability.csproj", - "src\\Windows\\Avalonia.Win32\\Avalonia.Win32.csproj", - "tests\\Avalonia.Base.UnitTests\\Avalonia.Base.UnitTests.csproj", - "tests\\Avalonia.Benchmarks\\Avalonia.Benchmarks.csproj", - "tests\\Avalonia.Build.Tasks.UnitTest\\Avalonia.Build.Tasks.UnitTest.csproj", - "tests\\Avalonia.Controls.UnitTests\\Avalonia.Controls.UnitTests.csproj", - "tests\\Avalonia.DesignerSupport.TestApp\\Avalonia.DesignerSupport.TestApp.csproj", - "tests\\Avalonia.DesignerSupport.Tests\\Avalonia.DesignerSupport.Tests.csproj", - "tests\\Avalonia.Generators.Tests\\Avalonia.Generators.Tests.csproj", - "tests\\Avalonia.IntegrationTests.Appium\\Avalonia.IntegrationTests.Appium.csproj", - "tests\\Avalonia.LeakTests\\Avalonia.LeakTests.csproj", - "tests\\Avalonia.Markup.UnitTests\\Avalonia.Markup.UnitTests.csproj", - "tests\\Avalonia.Markup.Xaml.UnitTests\\Avalonia.Markup.Xaml.UnitTests.csproj", - "tests\\Avalonia.RenderTests.WpfCompare\\Avalonia.RenderTests.WpfCompare.csproj", - "tests\\Avalonia.Skia.RenderTests\\Avalonia.Skia.RenderTests.csproj", - "tests\\Avalonia.Skia.UnitTests\\Avalonia.Skia.UnitTests.csproj", - "tests\\Avalonia.UnitTests\\Avalonia.UnitTests.csproj", - "tests\\TestFiles\\BuildTasks\\PInvoke\\PInvoke.csproj" - ] - } -} + "solution": { + "path": "Avalonia.sln", + "projects": [ + "packages\\Avalonia\\Avalonia.csproj", + "samples\\AppWithoutLifetime\\AppWithoutLifetime.csproj", + "samples\\ControlCatalog.Desktop\\ControlCatalog.Desktop.csproj", + "samples\\ControlCatalog\\ControlCatalog.csproj", + "samples\\GpuInterop\\GpuInterop.csproj", + "samples\\IntegrationTestApp\\IntegrationTestApp.csproj", + "samples\\MiniMvvm\\MiniMvvm.csproj", + "samples\\RenderDemo\\RenderDemo.csproj", + "samples\\SampleControls\\ControlSamples.csproj", + "samples\\Sandbox\\Sandbox.csproj", + "samples\\TextTestApp\\TextTestApp.csproj", + "samples\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContextPlug\\UnloadableAssemblyLoadContextPlug.csproj", + "samples\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContext.csproj", + "samples\\XEmbedSample\\XEmbedSample.csproj", + "src\\Avalonia.Base\\Avalonia.Base.csproj", + "src\\Avalonia.Build.Tasks\\Avalonia.Build.Tasks.csproj", + "src\\Avalonia.Controls.ColorPicker\\Avalonia.Controls.ColorPicker.csproj", + "src\\Avalonia.Controls\\Avalonia.Controls.csproj", + "src\\Avalonia.DesignerSupport\\Avalonia.DesignerSupport.csproj", + "src\\Avalonia.Desktop\\Avalonia.Desktop.csproj", + "src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj", + "src\\Avalonia.Fonts.Inter\\Avalonia.Fonts.Inter.csproj", + "src\\Avalonia.FreeDesktop.AtSpi\\Avalonia.FreeDesktop.AtSpi.csproj", + "src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj", + "src\\Avalonia.Metal\\Avalonia.Metal.csproj", + "src\\Avalonia.MicroCom\\Avalonia.MicroCom.csproj", + "src\\Avalonia.Native\\Avalonia.Native.csproj", + "src\\Avalonia.OpenGL\\Avalonia.OpenGL.csproj", + "src\\Avalonia.Remote.Protocol\\Avalonia.Remote.Protocol.csproj", + "src\\Avalonia.Themes.Fluent\\Avalonia.Themes.Fluent.csproj", + "src\\Avalonia.Themes.Simple\\Avalonia.Themes.Simple.csproj", + "src\\Avalonia.Vulkan\\Avalonia.Vulkan.csproj", + "src\\Avalonia.X11\\Avalonia.X11.csproj", + "src\\HarfBuzz\\Avalonia.HarfBuzz\\Avalonia.HarfBuzz.csproj", + "src\\Headless\\Avalonia.Headless.Vnc\\Avalonia.Headless.Vnc.csproj", + "src\\Headless\\Avalonia.Headless\\Avalonia.Headless.csproj", + "src\\Linux\\Avalonia.LinuxFramebuffer\\Avalonia.LinuxFramebuffer.csproj", + "src\\Markup\\Avalonia.Markup.Xaml.Loader\\Avalonia.Markup.Xaml.Loader.csproj", + "src\\Markup\\Avalonia.Markup.Xaml\\Avalonia.Markup.Xaml.csproj", + "src\\Markup\\Avalonia.Markup\\Avalonia.Markup.csproj", + "src\\Skia\\Avalonia.Skia\\Avalonia.Skia.csproj", + "src\\tools\\Avalonia.Analyzers.CodeFixes.CSharp\\Avalonia.Analyzers.CodeFixes.CSharp.csproj", + "src\\tools\\Avalonia.Analyzers.CSharp\\Avalonia.Analyzers.CSharp.csproj", + "src\\tools\\Avalonia.Analyzers.VisualBasic\\Avalonia.Analyzers.VisualBasic.csproj", + "src\\tools\\Avalonia.Generators\\Avalonia.Generators.csproj", + "src\\tools\\DevAnalyzers\\DevAnalyzers.csproj", + "src\\tools\\DevGenerators\\DevGenerators.csproj", + "src\\Windows\\Avalonia.Win32.Automation\\Avalonia.Win32.Automation.csproj", + "src\\Windows\\Avalonia.Win32.Interoperability\\Avalonia.Win32.Interoperability.csproj", + "src\\Windows\\Avalonia.Win32\\Avalonia.Win32.csproj", + "tests\\Avalonia.Base.UnitTests\\Avalonia.Base.UnitTests.csproj", + "tests\\Avalonia.Benchmarks\\Avalonia.Benchmarks.csproj", + "tests\\Avalonia.Build.Tasks.UnitTest\\Avalonia.Build.Tasks.UnitTest.csproj", + "tests\\Avalonia.Controls.UnitTests\\Avalonia.Controls.UnitTests.csproj", + "tests\\Avalonia.DesignerSupport.TestApp\\Avalonia.DesignerSupport.TestApp.csproj", + "tests\\Avalonia.DesignerSupport.Tests\\Avalonia.DesignerSupport.Tests.csproj", + "tests\\Avalonia.Generators.Tests\\Avalonia.Generators.Tests.csproj", + "tests\\Avalonia.IntegrationTests.Appium\\Avalonia.IntegrationTests.Appium.csproj", + "tests\\Avalonia.LeakTests\\Avalonia.LeakTests.csproj", + "tests\\Avalonia.Markup.UnitTests\\Avalonia.Markup.UnitTests.csproj", + "tests\\Avalonia.Markup.Xaml.UnitTests\\Avalonia.Markup.Xaml.UnitTests.csproj", + "tests\\Avalonia.RenderTests.WpfCompare\\Avalonia.RenderTests.WpfCompare.csproj", + "tests\\Avalonia.Skia.RenderTests\\Avalonia.Skia.RenderTests.csproj", + "tests\\Avalonia.Skia.UnitTests\\Avalonia.Skia.UnitTests.csproj", + "tests\\Avalonia.UnitTests\\Avalonia.UnitTests.csproj", + "tests\\TestFiles\\BuildTasks\\PInvoke\\PInvoke.csproj" + ] + } +} \ No newline at end of file diff --git a/Avalonia.sln b/Avalonia.sln index 40c9ee3f11..a7abb92d2f 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -159,8 +159,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Dialogs", "src\Ava EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.FreeDesktop", "src\Avalonia.FreeDesktop\Avalonia.FreeDesktop.csproj", "{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.FreeDesktop.AtSpi", "src\Avalonia.FreeDesktop.AtSpi\Avalonia.FreeDesktop.AtSpi.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Fluent", "src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj", "{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless", "src\Headless\Avalonia.Headless\Avalonia.Headless.csproj", "{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}" @@ -294,6 +292,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Analyzers.CodeFixe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Analyzers.VisualBasic", "src\tools\Avalonia.Analyzers.VisualBasic\Avalonia.Analyzers.VisualBasic.csproj", "{A7644C3B-B843-44F1-9940-560D56CB0936}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.FreeDesktop.AtSpi", "src\Avalonia.FreeDesktop.AtSpi\Avalonia.FreeDesktop.AtSpi.csproj", "{936E2297-5AEC-4FCB-8AD1-C10079E50906}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.FreeDesktop.AtSpi", "src\Avalonia.FreeDesktop.AtSpi\Avalonia.FreeDesktop.AtSpi.csproj", "{84207F6F-EEFC-4AD4-A733-774F7FE2BAE5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -680,6 +682,14 @@ Global {FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Release|Any CPU.Build.0 = Release|Any CPU {FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Debug|Any CPU.ActiveCfg = Release|Any CPU {FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Debug|Any CPU.Build.0 = Release|Any CPU + {936E2297-5AEC-4FCB-8AD1-C10079E50906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {936E2297-5AEC-4FCB-8AD1-C10079E50906}.Debug|Any CPU.Build.0 = Debug|Any CPU + {936E2297-5AEC-4FCB-8AD1-C10079E50906}.Release|Any CPU.ActiveCfg = Release|Any CPU + {936E2297-5AEC-4FCB-8AD1-C10079E50906}.Release|Any CPU.Build.0 = Release|Any CPU + {84207F6F-EEFC-4AD4-A733-774F7FE2BAE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84207F6F-EEFC-4AD4-A733-774F7FE2BAE5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84207F6F-EEFC-4AD4-A733-774F7FE2BAE5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84207F6F-EEFC-4AD4-A733-774F7FE2BAE5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -767,6 +777,8 @@ Global {11522B0D-BF31-42D5-8FC5-41E58F319AF9} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B} {A7644C3B-B843-44F1-9940-560D56CB0936} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637} {FDFB9C25-552D-420B-9D4A-DB0BB6472239} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637} + {936E2297-5AEC-4FCB-8AD1-C10079E50906} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B} + {84207F6F-EEFC-4AD4-A733-774F7FE2BAE5} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}