diff --git a/.github/workflows/dotnet_deploy.yml b/.github/workflows/dotnet_deploy.yml
index 0fb4ee9..531a54e 100644
--- a/.github/workflows/dotnet_deploy.yml
+++ b/.github/workflows/dotnet_deploy.yml
@@ -20,8 +20,8 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest]
         sdk:
-          - { version: 3.1.407, framework: netcoreapp3.1 }
-          - { version: 5.0.201, framework: net5.0 }
+          - { version: 3.1.415, framework: netcoreapp3.1 }
+          - { version: 6.0.100, framework: net6.0 }
 
     name: ${{ matrix.os }} / ${{ matrix.sdk.version }}
     runs-on: ${{ matrix.os }}
@@ -50,11 +50,11 @@ jobs:
       run: dotnet test -c ${{ env.configuration }} -f ${{ matrix.sdk.framework }} --no-build
 
     - name: Pack nugets
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.sdk.version == '5.0.201' }}
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.sdk.version == '6.0.100' }}
       run: dotnet pack -c ${{ env.configuration }} --no-build
 
     - name: Upload artifact
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.sdk.version == '5.0.201' }}
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.sdk.version == '6.0.100' }}
       uses: actions/upload-artifact@v2
       with:
         name: ${{ env.zip-name }}
@@ -91,7 +91,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.201
+          dotnet-version: 6.0.100
 
       - name: Push nuget
         if: ${{ env.release-draft == 'false' }}
diff --git a/.github/workflows/dotnet_tests.yml b/.github/workflows/dotnet_tests.yml
index 75fb21d..db50da5 100644
--- a/.github/workflows/dotnet_tests.yml
+++ b/.github/workflows/dotnet_tests.yml
@@ -18,8 +18,8 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest]
         sdk:
-          - { version: 3.1.407, framework: netcoreapp3.1 }
-          - { version: 5.0.201, framework: net5.0 }
+          - { version: 3.1.415, framework: netcoreapp3.1 }
+          - { version: 6.0.100, framework: net6.0 }
 
     name: ${{ matrix.os }} / ${{ matrix.sdk.version }}
     runs-on: ${{ matrix.os }}
@@ -36,13 +36,13 @@ jobs:
       run: dotnet restore
 
     - name: Build main library
-      working-directory: src/AvaloniaProjectInfoResolver
+      working-directory: ./src/AvaloniaProjectInfoResolver
       run: dotnet build -c ${{ env.configuration }}
 
     - name: Build tests
-      working-directory: src/AvaloniaProjectInfoResolver.IntegrationTests
+      working-directory: ./src/AvaloniaProjectInfoResolver.IntegrationTests
       run: dotnet build -c ${{ env.configuration }} -f ${{ matrix.sdk.framework }}
 
     - name: Run tests
-      working-directory: src/AvaloniaProjectInfoResolver.IntegrationTests
+      working-directory: ./src/AvaloniaProjectInfoResolver.IntegrationTests
       run: dotnet test -c ${{ env.configuration }} -f ${{ matrix.sdk.framework }} --no-build
diff --git a/.run/Debug PreviewTask [Win].run.xml b/.run/Debug PreviewTask [Win].run.xml
index 26ba1dc..c192504 100644
--- a/.run/Debug PreviewTask [Win].run.xml	
+++ b/.run/Debug PreviewTask [Win].run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Debug PreviewTask [Win]" type="RunExe" factoryName=".NET Executable">
-    <option name="EXE_PATH" value="C:/Program Files/dotnet/sdk/5.0.201/MSBuild.dll" />
+    <option name="EXE_PATH" value="C:/Program Files/dotnet/sdk/5.0.202/MSBuild.dll" />
     <option name="PROGRAM_PARAMETERS" value="-t:Rebuild" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/AvaloniaProjectInfoResolver.PreviewTask.Debug" />
     <option name="PASS_PARENT_ENVS" value="1" />
diff --git a/Directory.Build.props b/Directory.Build.props
index d8e95bc..5b26596 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>0.0.1</VersionPrefix>
+    <VersionPrefix>0.0.2</VersionPrefix>
     <VersionSuffix>alpha</VersionSuffix>
     <Description>A utility to resolve Avalonia features from MSBuild Project File</Description>
     <Authors>AvaloniaProjectInfoResolver Contributors</Authors>
diff --git a/src/AvaloniaProjectInfoResolver.App/AvaloniaProjectInfoResolver.App.csproj b/src/AvaloniaProjectInfoResolver.App/AvaloniaProjectInfoResolver.App.csproj
index 71f4659..6dc342f 100644
--- a/src/AvaloniaProjectInfoResolver.App/AvaloniaProjectInfoResolver.App.csproj
+++ b/src/AvaloniaProjectInfoResolver.App/AvaloniaProjectInfoResolver.App.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
+    <!-- For test netcoreapp3.1 -->
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AvaloniaVersion>0.10.0</AvaloniaVersion>
+    <AvaloniaVersion>0.10.10</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
diff --git a/src/AvaloniaProjectInfoResolver.App/MainWindow.axaml.cs b/src/AvaloniaProjectInfoResolver.App/MainWindow.axaml.cs
index 9595911..d56df87 100644
--- a/src/AvaloniaProjectInfoResolver.App/MainWindow.axaml.cs
+++ b/src/AvaloniaProjectInfoResolver.App/MainWindow.axaml.cs
@@ -18,7 +18,7 @@ public MainWindow()
             this.AttachDevTools();
 #endif
             this.WhenActivated(d => d(
-                ViewModel.ShowOpenFileDialog.RegisterHandler(ShowOpenFileDialog)));
+                ViewModel!.ShowOpenFileDialog.RegisterHandler(ShowOpenFileDialog)));
         }
 
         private void InitializeComponent()
@@ -30,7 +30,7 @@ private async Task ShowOpenFileDialog(InteractionContext<Unit, string?> interact
         {
             var dialog = new OpenFileDialog();
             var fileNames = await dialog.ShowAsync(this);
-            interaction.SetOutput(fileNames.FirstOrDefault());
+            interaction.SetOutput(fileNames?.FirstOrDefault());
         }
     }
 }
diff --git a/src/AvaloniaProjectInfoResolver.App/MainWindowViewModel.cs b/src/AvaloniaProjectInfoResolver.App/MainWindowViewModel.cs
index bfb1a32..fd577fa 100644
--- a/src/AvaloniaProjectInfoResolver.App/MainWindowViewModel.cs
+++ b/src/AvaloniaProjectInfoResolver.App/MainWindowViewModel.cs
@@ -86,11 +86,11 @@ private async Task UpdateTreeViewAsync(string fileName, CancellationToken cancel
             var (avaloniaProjectProps, errors) = await Task.Run(
                 async () =>
                 {
-                    var result = await ProjectInfoResolver.ResolvePreviewProjectInfoAsync(
+                    var result = await ProjectInfoResolver.ResolvePreviewInfoAsync(
                         fileName, cancellationToken);
                     var rootNode = cancellationToken.IsCancellationRequested || result.HasError
                         ? null
-                        : NodesHelper.SelectRootNode(result.ProjectInfo!);
+                        : NodesHelper.SelectRootNode(result.PreviewInfo!);
                     return (rootNode, result.Error);
                 },
                 cancellationToken);
diff --git a/src/AvaloniaProjectInfoResolver.App/Nodes/NodesHelper.cs b/src/AvaloniaProjectInfoResolver.App/Nodes/NodesHelper.cs
index 063004d..98f91fd 100644
--- a/src/AvaloniaProjectInfoResolver.App/Nodes/NodesHelper.cs
+++ b/src/AvaloniaProjectInfoResolver.App/Nodes/NodesHelper.cs
@@ -6,23 +6,31 @@ namespace AvaloniaProjectInfoResolver.App.Nodes
 {
     internal static class NodesHelper
     {
-        public static RootNode SelectRootNode(ProjectInfo projectInfo)
+        public static RootNode SelectRootNode(PreviewInfo previewInfo)
         {
             var rootNode = new RootNode();
-            foreach (var property in GetProperties(typeof(ProjectInfo)))
+            foreach (var property in GetProperties(typeof(PreviewInfo)))
             {
-                if (property.Name == nameof(ProjectInfo.ProjectInfoByTfmArray))
+                switch (property.Name)
                 {
-                    foreach (var info in projectInfo.ProjectInfoByTfmArray)
+                    case nameof(PreviewInfo.AppExecInfoCollection):
                     {
-                        var node = new PropertyCollectionNode(rootNode, info);
+                        var node = new PropertyCollectionNode(rootNode, previewInfo.AppExecInfoCollection);
                         rootNode.Children.Add(node);
+                        break;
+                    }
+                    case nameof(PreviewInfo.XamlFileInfo):
+                    {
+                        var node = new PropertyCollectionNode(rootNode, previewInfo.XamlFileInfo);
+                        rootNode.Children.Add(node);
+                        break;
+                    }
+                    default:
+                    {
+                        var node = new PropertyNode(rootNode, property.Name, (string)property.GetValue(previewInfo, null)!);
+                        rootNode.Children.Add(node);
+                        break;
                     }
-                }
-                else
-                {
-                    var node = new PropertyNode(rootNode, property.Name, (string)property.GetValue(projectInfo, null)!);
-                    rootNode.Children.Add(node);
                 }
             }
 
diff --git a/src/AvaloniaProjectInfoResolver.App/Nodes/PropertyCollectionNode.cs b/src/AvaloniaProjectInfoResolver.App/Nodes/PropertyCollectionNode.cs
index edc04f2..88138b6 100644
--- a/src/AvaloniaProjectInfoResolver.App/Nodes/PropertyCollectionNode.cs
+++ b/src/AvaloniaProjectInfoResolver.App/Nodes/PropertyCollectionNode.cs
@@ -1,6 +1,6 @@
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reflection;
 
 namespace AvaloniaProjectInfoResolver.App.Nodes
 {
@@ -12,14 +12,47 @@ internal class PropertyCollectionNode : INode
 
         public ObservableCollection<INode> Children { get; }
 
-        public PropertyCollectionNode(RootNode parent, ProjectInfoByTfm projectInfoByTfm)
+        public PropertyCollectionNode(RootNode parent, IReadOnlyList<AppExecInfo> appExecInfoCollection)
         {
             Parent = parent;
-            Header = nameof(ProjectInfoByTfm);
+            Header = nameof(PreviewInfo.AppExecInfoCollection);
+            Children = new ObservableCollection<INode>();
+            foreach (var info in appExecInfoCollection)
+            {
+                var node = new PropertyCollectionNode(this, info);
+                Children.Add(node);
+            }
+        }
+
+        public PropertyCollectionNode(INode parent, XamlFileInfo xamlFileInfo)
+        {
+            Parent = parent;
+            Header = nameof(PreviewInfo.XamlFileInfo);
             Children = new ObservableCollection<INode>(
-                NodesHelper.GetProperties(typeof(ProjectInfoByTfm))
+                NodesHelper.GetProperties(typeof(XamlFileInfo))
+                    .Where(x => x.Name != nameof(XamlFileInfo.ReferenceXamlFileInfoCollection))
                     .Select(x =>
-                        new PropertyNode(this, x.Name, (string)x.GetValue(projectInfoByTfm, null)!)));
+                        new PropertyNode(this, x.Name, (string)x.GetValue(xamlFileInfo, null)!)));
+            Children.Add(new PropertyCollectionNode(this, xamlFileInfo.ReferenceXamlFileInfoCollection));
+        }
+
+        private PropertyCollectionNode(PropertyCollectionNode parent, AppExecInfo appExecInfo)
+        {
+            Parent = parent;
+            Header = nameof(AppExecInfo);
+            Children = new ObservableCollection<INode>(
+                NodesHelper.GetProperties(typeof(AppExecInfo))
+                    .Select(x =>
+                        new PropertyNode(this, x.Name, (string)x.GetValue(appExecInfo, null)!)));
+        }
+
+        private PropertyCollectionNode(
+            PropertyCollectionNode parent, IReadOnlyList<XamlFileInfo> referenceXamlFileInfoCollection)
+        {
+            Parent = parent;
+            Header = nameof(XamlFileInfo.ReferenceXamlFileInfoCollection);
+            Children = new ObservableCollection<INode>(
+                referenceXamlFileInfoCollection.Select(x => new PropertyCollectionNode(this, x)));
         }
     }
 }
diff --git a/src/AvaloniaProjectInfoResolver.IntegrationTests/AvaloniaProjectInfoResolver.IntegrationTests.csproj b/src/AvaloniaProjectInfoResolver.IntegrationTests/AvaloniaProjectInfoResolver.IntegrationTests.csproj
index 0b344e0..2470114 100644
--- a/src/AvaloniaProjectInfoResolver.IntegrationTests/AvaloniaProjectInfoResolver.IntegrationTests.csproj
+++ b/src/AvaloniaProjectInfoResolver.IntegrationTests/AvaloniaProjectInfoResolver.IntegrationTests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.0.3">
+        <PackageReference Include="coverlet.collector" Version="3.1.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
@@ -21,4 +21,9 @@
       <ProjectReference Include="..\AvaloniaProjectInfoResolver\AvaloniaProjectInfoResolver.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Content Include="data\ConsoleApp1\ConsoleApp1.fsproj" CopyToOutputDirectory="PreserveNewest" />
+      <Content Include="data\ConsoleApp1\Program.fs" CopyToOutputDirectory="PreserveNewest" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/AvaloniaProjectInfoResolver.IntegrationTests/ProjectInfoResolverTests.cs b/src/AvaloniaProjectInfoResolver.IntegrationTests/ProjectInfoResolverTests.cs
index aaf41bd..34738d3 100644
--- a/src/AvaloniaProjectInfoResolver.IntegrationTests/ProjectInfoResolverTests.cs
+++ b/src/AvaloniaProjectInfoResolver.IntegrationTests/ProjectInfoResolverTests.cs
@@ -1,3 +1,4 @@
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
@@ -13,26 +14,25 @@ public async Task Should_ResolvePreviewProjectInfoAsync_App_References_Avalonia(
         {
             var projectInfoResolver = new ProjectInfoResolver();
 
-            var result = await projectInfoResolver.ResolvePreviewProjectInfoAsync(AvaloniaAppProjPath);
+            var result = await projectInfoResolver.ResolvePreviewInfoAsync(AvaloniaAppProjPath);
 
             Assert.False(result.HasError);
             Assert.Equal(result.Error, string.Empty);
 
-            var info = result.ProjectInfo!;
+            var info = result.PreviewInfo!;
             Assert.NotNull(info);
             Assert.False(string.IsNullOrEmpty(info.AvaloniaPreviewerNetCoreToolPath));
             Assert.False(string.IsNullOrEmpty(info.AvaloniaPreviewerNetFullToolPath));
-            Assert.Equal(string.Empty, info.AvaloniaResource);
-            Assert.False(string.IsNullOrEmpty(info.AvaloniaXaml));
-            Assert.Equal(string.Empty, info.TargetFrameworks);
+            Assert.Equal(string.Empty, info.XamlFileInfo.AvaloniaResource);
+            Assert.False(string.IsNullOrEmpty(info.XamlFileInfo.AvaloniaXaml));
 
-            var infoByTfm = info.ProjectInfoByTfmArray;
-            Assert.Single(infoByTfm);
-            Assert.Equal("netcoreapp3.1", infoByTfm[0].TargetFramework);
-            Assert.False(string.IsNullOrEmpty(infoByTfm[0].TargetPath));
-            Assert.Equal(".NETCoreApp", infoByTfm[0].TargetFrameworkIdentifier);
-            Assert.False(string.IsNullOrEmpty(infoByTfm[0].ProjectDepsFilePath));
-            Assert.False(string.IsNullOrEmpty(infoByTfm[0].ProjectRuntimeConfigFilePath));
+            var appExecInfoCollection = info.AppExecInfoCollection;
+            Assert.Single(appExecInfoCollection);
+            Assert.Equal("netcoreapp3.1", appExecInfoCollection[0].TargetFramework);
+            Assert.False(string.IsNullOrEmpty(appExecInfoCollection[0].TargetPath));
+            Assert.Equal(".NETCoreApp", appExecInfoCollection[0].TargetFrameworkIdentifier);
+            Assert.False(string.IsNullOrEmpty(appExecInfoCollection[0].ProjectDepsFilePath));
+            Assert.False(string.IsNullOrEmpty(appExecInfoCollection[0].ProjectRuntimeConfigFilePath));
         }
 
         [Fact]
@@ -41,25 +41,26 @@ public async Task Should_ResolvePreviewProjectInfoAsync_App_References_Avalonia_
             var projectInfoResolver = new ProjectInfoResolver();
             using var cancellationTokenSource = new CancellationTokenSource(100);
 
-            var result = await projectInfoResolver.ResolvePreviewProjectInfoAsync(
+            var result = await projectInfoResolver.ResolvePreviewInfoAsync(
                 AvaloniaAppProjPath, cancellationTokenSource.Token);
 
             Assert.False(result.HasError);
             Assert.Equal(result.Error, string.Empty);
-            Assert.Null(result.ProjectInfo);
+            Assert.Null(result.PreviewInfo);
         }
 
         [Fact]
         public async Task Should_ResolvePreviewProjectInfoAsync_TaskDebug_Not_References_Avalonia()
         {
             var projectInfoResolver = new ProjectInfoResolver();
-            var projPath = "../../../../../AvaloniaProjectInfoResolver/AvaloniaProjectInfoResolver.csproj";
+            var projPath = "./data/ConsoleApp1/ConsoleApp1.fsproj";
+            projPath = new FileInfo(projPath).FullName;
 
-            var result = await projectInfoResolver.ResolvePreviewProjectInfoAsync(projPath);
+            var result = await projectInfoResolver.ResolvePreviewInfoAsync(projPath);
 
             Assert.True(result.HasError);
             Assert.Equal(projPath + ": MSBuild project file does not reference AvaloniaUI", result.Error);
-            Assert.Null(result.ProjectInfo);
+            Assert.Null(result.PreviewInfo);
         }
     }
 }
diff --git a/src/AvaloniaProjectInfoResolver.IntegrationTests/data/ConsoleApp1/ConsoleApp1.fsproj b/src/AvaloniaProjectInfoResolver.IntegrationTests/data/ConsoleApp1/ConsoleApp1.fsproj
new file mode 100644
index 0000000..1945fe3
--- /dev/null
+++ b/src/AvaloniaProjectInfoResolver.IntegrationTests/data/ConsoleApp1/ConsoleApp1.fsproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/AvaloniaProjectInfoResolver.IntegrationTests/data/ConsoleApp1/Program.fs b/src/AvaloniaProjectInfoResolver.IntegrationTests/data/ConsoleApp1/Program.fs
new file mode 100644
index 0000000..f337c00
--- /dev/null
+++ b/src/AvaloniaProjectInfoResolver.IntegrationTests/data/ConsoleApp1/Program.fs
@@ -0,0 +1,13 @@
+// Learn more about F# at http://docs.microsoft.com/dotnet/fsharp
+
+open System
+
+// Define a function to construct a message to print
+let from whom =
+    sprintf "from %s" whom
+
+[<EntryPoint>]
+let main argv =
+    let message = from "F#" // Call the function
+    printfn "Hello world %s" message
+    0 // return an integer exit code
\ No newline at end of file
diff --git a/src/AvaloniaProjectInfoResolver.PreviewTask.Debug/AvaloniaProjectInfoResolver.PreviewTask.Debug.csproj b/src/AvaloniaProjectInfoResolver.PreviewTask.Debug/AvaloniaProjectInfoResolver.PreviewTask.Debug.csproj
index bc77ebc..787378d 100644
--- a/src/AvaloniaProjectInfoResolver.PreviewTask.Debug/AvaloniaProjectInfoResolver.PreviewTask.Debug.csproj
+++ b/src/AvaloniaProjectInfoResolver.PreviewTask.Debug/AvaloniaProjectInfoResolver.PreviewTask.Debug.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
   </PropertyGroup>
 
diff --git a/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewInner.targets b/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewInner.targets
index fcbca57..8d990a5 100644
--- a/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewInner.targets
+++ b/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewInner.targets
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <Target Name="SelectInfoProjectReference" Returns="@(ProjectReference)" />
+  <Target Name="SelectInfoProjectPath" Returns="$(ProjectPath)" />
+  <Target Name="SelectInfoOutputType" Returns="$(OutputType)" />
+
   <Target Name="SelectInfoAvaloniaResource" Returns="@(AvaloniaResource)" />
   <Target Name="SelectInfoAvaloniaXaml" Returns="@(AvaloniaXaml)" />
 
diff --git a/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewTask.csproj b/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewTask.csproj
index ec00d1f..e734c7e 100644
--- a/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewTask.csproj
+++ b/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewTask.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
+    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
   
   <ItemGroup>
@@ -24,10 +25,10 @@
     </Content>
   </ItemGroup>
 
-  <!-- Needs for sdk <= 3.1 -->
+  <!-- Needs for sdk <= 3.1 (tests) -->
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
-                      Version="1.0.0"
+                      Version="1.0.2"
                       PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoTypes.cs b/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoTypes.cs
index 1705505..f3f017e 100644
--- a/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoTypes.cs
+++ b/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoTypes.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
@@ -6,21 +7,74 @@
 // ReSharper disable once CheckNamespace
 namespace AvaloniaProjectInfoResolver
 {
-    public class ProjectInfo : IXmlSerializable
+    public class PreviewInfo : IXmlSerializable
     {
-        private static readonly XmlSerializer SerializerForTfm = new(typeof(ProjectInfoByTfm));
+        private static readonly XmlSerializer SerializerForXamlFileInfo
+            = new(typeof(XamlFileInfo), new XmlRootAttribute(nameof(XamlFileInfo)));
+
+        private static readonly XmlSerializer SerializerForAppExecInfo = new(typeof(AppExecInfo));
 
         public string AvaloniaPreviewerNetCoreToolPath { get; internal set; } = string.Empty;
 
         public string AvaloniaPreviewerNetFullToolPath { get; internal set; } = string.Empty;
 
+        public IReadOnlyList<AppExecInfo> AppExecInfoCollection { get; internal set; } = Array.Empty<AppExecInfo>();
+
+        public XamlFileInfo XamlFileInfo { get; internal set; } = new();
+
+        public XmlSchema? GetSchema() => null;
+
+        public void ReadXml(XmlReader reader)
+        {
+            var wasEmpty = reader.IsEmptyElement;
+            reader.Read();
+            if (wasEmpty)
+                return;
+
+            AvaloniaPreviewerNetCoreToolPath = reader.ReadElementString();
+            AvaloniaPreviewerNetFullToolPath = reader.ReadElementString();
+
+            reader.ReadStartElement(nameof(AppExecInfoCollection));
+
+            var result = new List<AppExecInfo>();
+            while (SerializerForAppExecInfo.CanDeserialize(reader))
+            {
+                var info = (AppExecInfo)SerializerForAppExecInfo.Deserialize(reader);
+                result.Add(info);
+            }
+            AppExecInfoCollection = result;
+
+            reader.ReadEndElement();
+            reader.Read();
+
+            XamlFileInfo = (XamlFileInfo)SerializerForXamlFileInfo.Deserialize(reader);
+        }
+
+        public void WriteXml(XmlWriter writer)
+        {
+            writer.WriteElementString(nameof(AvaloniaPreviewerNetCoreToolPath), AvaloniaPreviewerNetCoreToolPath);
+            writer.WriteElementString(nameof(AvaloniaPreviewerNetFullToolPath), AvaloniaPreviewerNetFullToolPath);
+
+            writer.WriteStartElement(nameof(AppExecInfoCollection));
+            foreach (var projectInfoByTfm in AppExecInfoCollection)
+                SerializerForAppExecInfo.Serialize(writer, projectInfoByTfm);
+            writer.WriteEndElement();
+
+            SerializerForXamlFileInfo.Serialize(writer, XamlFileInfo);
+        }
+    }
+
+    public class XamlFileInfo : IXmlSerializable
+    {
+        private static readonly XmlSerializer SerializerForXamlFileInfo = new(typeof(XamlFileInfo));
+
+        public string ProjectPath { get; internal set; } = string.Empty;
+
         public string AvaloniaResource { get; internal set; } = string.Empty;
 
         public string AvaloniaXaml { get; internal set; } = string.Empty;
 
-        public string TargetFrameworks { get; internal set; } = string.Empty;
-
-        public ProjectInfoByTfm[] ProjectInfoByTfmArray { get; internal set; } = new ProjectInfoByTfm[0];
+        public IReadOnlyList<XamlFileInfo> ReferenceXamlFileInfoCollection { get; internal set; } = Array.Empty<XamlFileInfo>();
 
         public XmlSchema? GetSchema() => null;
 
@@ -31,42 +85,37 @@ public void ReadXml(XmlReader reader)
             if (wasEmpty)
                 return;
 
-            AvaloniaPreviewerNetCoreToolPath = reader.ReadElementString();
-            AvaloniaPreviewerNetFullToolPath = reader.ReadElementString();
+            ProjectPath = reader.ReadElementString();
             AvaloniaResource = reader.ReadElementString();
             AvaloniaXaml = reader.ReadElementString();
-            TargetFrameworks = reader.ReadElementString();
 
-            reader.ReadStartElement(nameof(ProjectInfoByTfmArray));
+            reader.ReadStartElement(nameof(ReferenceXamlFileInfoCollection));
 
-            var result = new List<ProjectInfoByTfm>();
-            while (SerializerForTfm.CanDeserialize(reader))
+            var result = new List<XamlFileInfo>();
+            while (SerializerForXamlFileInfo.CanDeserialize(reader))
             {
-                var info = (ProjectInfoByTfm)SerializerForTfm.Deserialize(reader);
+                var info = (XamlFileInfo)SerializerForXamlFileInfo.Deserialize(reader);
                 result.Add(info);
             }
-
-            ProjectInfoByTfmArray = result.ToArray();
+            ReferenceXamlFileInfoCollection = result;
 
             reader.ReadEndElement();
         }
 
         public void WriteXml(XmlWriter writer)
         {
-            writer.WriteElementString(nameof(AvaloniaPreviewerNetCoreToolPath), AvaloniaPreviewerNetCoreToolPath);
-            writer.WriteElementString(nameof(AvaloniaPreviewerNetFullToolPath), AvaloniaPreviewerNetFullToolPath);
+            writer.WriteElementString(nameof(ProjectPath), ProjectPath);
             writer.WriteElementString(nameof(AvaloniaResource), AvaloniaResource);
             writer.WriteElementString(nameof(AvaloniaXaml), AvaloniaXaml);
-            writer.WriteElementString(nameof(TargetFrameworks), TargetFrameworks);
 
-            writer.WriteStartElement(nameof(ProjectInfoByTfmArray));
-            foreach (var projectInfoByTfm in ProjectInfoByTfmArray)
-                SerializerForTfm.Serialize(writer, projectInfoByTfm);
+            writer.WriteStartElement(nameof(ReferenceXamlFileInfoCollection));
+            foreach (var xamlFileInfo in ReferenceXamlFileInfoCollection)
+                SerializerForXamlFileInfo.Serialize(writer, xamlFileInfo);
             writer.WriteEndElement();
         }
     }
 
-    public class ProjectInfoByTfm : IXmlSerializable
+    public class AppExecInfo : IXmlSerializable
     {
         public string ProjectDepsFilePath { get; internal set; } = string.Empty;
 
diff --git a/src/AvaloniaProjectInfoResolver.PreviewTask/ContextAwareTask.cs b/src/AvaloniaProjectInfoResolver.PreviewTask/ContextAwareTask.cs
index 1fc0654..0bfc47b 100644
--- a/src/AvaloniaProjectInfoResolver.PreviewTask/ContextAwareTask.cs
+++ b/src/AvaloniaProjectInfoResolver.PreviewTask/ContextAwareTask.cs
@@ -14,7 +14,7 @@ namespace AvaloniaProjectInfoResolver.PreviewTask
     public abstract class ContextAwareTask : Task
     {
         protected virtual string ManagedDllDirectory =>
-            Path.GetDirectoryName(new Uri(GetType().GetTypeInfo().Assembly.CodeBase).LocalPath);
+            Path.GetDirectoryName(new Uri(GetType().GetTypeInfo().Assembly.CodeBase).LocalPath)!;
 
         protected virtual string? UnmanagedDllDirectory => null;
 
@@ -46,8 +46,8 @@ from outerProperty in outerProperties.Values
             }
 
             var executeInnerMethod =
-                innerTaskType.GetMethod(nameof(ExecuteInner), BindingFlags.Instance | BindingFlags.NonPublic);
-            var result = (bool)executeInnerMethod.Invoke(innerTask, new object[0]);
+                innerTaskType.GetMethod(nameof(ExecuteInner), BindingFlags.Instance | BindingFlags.NonPublic)!;
+            var result = (bool)executeInnerMethod.Invoke(innerTask, Array.Empty<object>());
 
             foreach (var propertyPair in outputPropertiesMap)
             {
diff --git a/src/AvaloniaProjectInfoResolver.PreviewTask/PreviewInfoResolverTask.cs b/src/AvaloniaProjectInfoResolver.PreviewTask/PreviewInfoResolverTask.cs
index a52730f..2169d97 100644
--- a/src/AvaloniaProjectInfoResolver.PreviewTask/PreviewInfoResolverTask.cs
+++ b/src/AvaloniaProjectInfoResolver.PreviewTask/PreviewInfoResolverTask.cs
@@ -1,10 +1,12 @@
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.IO.Pipes;
+using System.Linq;
 using System.Xml.Serialization;
 using Microsoft.Build.Framework;
 
@@ -14,6 +16,9 @@ namespace AvaloniaProjectInfoResolver.PreviewTask
     public class PreviewInfoResolverTask : ContextAwareTask
     {
         // ReSharper disable InconsistentNaming
+        private const string SelectInfoProjectReference = nameof(SelectInfoProjectReference);
+        private const string SelectInfoProjectPath = nameof(SelectInfoProjectPath);
+        private const string SelectInfoOutputType = nameof(SelectInfoOutputType);
         private const string SelectInfoAvaloniaResource = nameof(SelectInfoAvaloniaResource);
         private const string SelectInfoAvaloniaXaml = nameof(SelectInfoAvaloniaXaml);
         private const string SelectInfoAvaloniaPreviewerNetCoreToolPath =
@@ -31,13 +36,14 @@ public class PreviewInfoResolverTask : ContextAwareTask
         private static readonly string[] TargetNamesCommon =
         {
             "Restore",
+            SelectInfoProjectPath,
             SelectInfoAvaloniaResource,
             SelectInfoAvaloniaXaml,
             SelectInfoAvaloniaPreviewerNetCoreToolPath,
             SelectInfoAvaloniaPreviewerNetFullToolPath,
         };
 
-        private static readonly string[] TargetNamesByTfm =
+        private static readonly string[] TargetNamesAppExecInfo =
         {
             SelectInfoTargetPath,
             SelectInfoProjectRuntimeConfigFilePath,
@@ -46,6 +52,10 @@ public class PreviewInfoResolverTask : ContextAwareTask
             SelectInfoTargetFrameworkIdentifier,
         };
 
+        private static readonly string[] TargetGetProjectReference = {SelectInfoProjectReference};
+
+        private static readonly string[] TargetGetOutput = {SelectInfoOutputType};
+
         private static readonly string[] TargetGetTfms = {SelectInfoTargetFrameworks};
 
         private readonly Dictionary<string, string> _globalPropertiesCommon;
@@ -83,107 +93,221 @@ public PreviewInfoResolverTask()
 
         protected override bool ExecuteInner()
         {
-            var isSuccess = TryResolveProjectInfoTfms(out var targetFrameworks);
-            if (!isSuccess)
+            if (!TryResolvePreviewInfoOutputType(ProjectFile, out var outputType))
                 return false;
 
-            isSuccess = TryResolveProjectInfoCommon(out var projectInfo, targetFrameworks);
-            if (!isSuccess)
+            if (outputType == "Library")
+            {
+                LogProjectNotExe();
                 return false;
+            }
 
-            if (!IsReferencesAvalonia(projectInfo))
+            if (!TryResolvePreviewInfoTfms(ProjectFile, out var targetFrameworks))
                 return false;
 
-            var projectInfoTfmCollection = new List<ProjectInfoByTfm>(targetFrameworks.Length);
+            if (!TryResolvePreviewInfoCommon(targetFrameworks, out var previewInfo))
+                return false;
+
+            var appExecInfoCollection = new List<AppExecInfo>(targetFrameworks.Length);
             foreach (var tfm in targetFrameworks)
             {
-                isSuccess = TryResolveProjectInfoByTfm(out var projectInfoTfm, tfm);
-                if (!isSuccess)
+                if (!TryResolveAppExecInfo(out var appExecInfo, tfm))
                     return false;
-                projectInfoTfmCollection.Add(projectInfoTfm);
+                appExecInfoCollection.Add(appExecInfo);
             }
+            previewInfo.AppExecInfoCollection = appExecInfoCollection;
 
-            projectInfo.ProjectInfoByTfmArray = projectInfoTfmCollection.ToArray();
-
-            SendMessage(projectInfo);
+            SendMessage(previewInfo);
             return true;
         }
 
-        private bool IsReferencesAvalonia(ProjectInfo projectInfo)
+        private bool TryResolvePreviewInfoOutputType(string projectFile, out string outputType)
         {
-            var isPreviewContains = !string.IsNullOrEmpty(projectInfo.AvaloniaPreviewerNetCoreToolPath)
-                                 || !string.IsNullOrEmpty(projectInfo.AvaloniaPreviewerNetFullToolPath);
-            if (isPreviewContains)
-                return true;
+            var targetOutputs = new Dictionary<string, ITaskItem[]>();
 
-            BuildEngine.LogErrorEvent(new BuildErrorEventArgs(
-                "APIR",
-                string.Empty,
-                ProjectFile,
-                0,
-                0,
-                0,
-                0,
-                "MSBuild project file does not reference AvaloniaUI",
-                string.Empty,
-                string.Empty));
+            if (BuildEngine.BuildProjectFile(projectFile, TargetGetOutput, _globalPropertiesCommon, targetOutputs))
+            {
+                outputType = targetOutputs.ResultFromSingle(SelectInfoOutputType);
+                return true;
+            }
 
+            outputType = default!;
             return false;
         }
 
-        private bool TryResolveProjectInfoTfms(out string[] targetFrameworks)
+        private bool TryResolvePreviewInfoTfms(string projectFile, out string[] targetFrameworks)
         {
+            var targetOutputs = new Dictionary<string, ITaskItem[]>();
+
+            if (BuildEngine.BuildProjectFile(projectFile, TargetGetTfms, _globalPropertiesCommon, targetOutputs))
+            {
+                targetFrameworks = targetOutputs.ResultFromArray(SelectInfoTargetFrameworks);
+                return true;
+            }
+
             targetFrameworks = default!;
+            return false;
+        }
+
+        // ReSharper disable once SuggestBaseTypeForParameter
+        private bool TryResolvePreviewInfoCommon(string[] targetFrameworks, out PreviewInfo previewInfo)
+        {
             var targetOutputs = new Dictionary<string, ITaskItem[]>();
+            var props = GetGlobalProperties(targetFrameworks[0]);
 
-            var isSuccess = BuildEngine.BuildProjectFile(
-                ProjectFile, TargetGetTfms, _globalPropertiesCommon, targetOutputs);
-            if (!isSuccess)
+            if (!BuildEngine.BuildProjectFile(ProjectFile, TargetNamesCommon, props, targetOutputs))
+            {
+                previewInfo = default!;
                 return false;
+            }
+
+            previewInfo = SelectPreviewInfoCommon(targetOutputs);
+            if (ShouldReferencesAvalonia(previewInfo))
+            {
+                var xamlFileInfoCollection = ResolveReferenceXamlFileInfoCollection(
+                    previewInfo.XamlFileInfo.ProjectPath, props, new List<string>());
+                previewInfo.XamlFileInfo.ReferenceXamlFileInfoCollection = xamlFileInfoCollection;
+
+                return true;
+            }
 
-            targetFrameworks = targetOutputs.ResultFromArray(SelectInfoTargetFrameworks);
+            LogProjectNotAvalonia();
 
-            return true;
+            previewInfo = default!;
+            return false;
         }
 
-        private bool TryResolveProjectInfoCommon(out ProjectInfo projectInfo, string[] targetFrameworks)
+        private List<XamlFileInfo> ResolveReferenceXamlFileInfoCollection(
+            // ReSharper disable once SuggestBaseTypeForParameter
+            // ReSharper disable once ParameterTypeCanBeEnumerable.Local
+            string parentProjectPath, Dictionary<string, string> props, IReadOnlyList<string> projectReadies)
         {
-            projectInfo = default!;
             var targetOutputs = new Dictionary<string, ITaskItem[]>();
-            var props = GetGlobalProperties(targetFrameworks[0]);
+            var xamlFileInfoCollection = new List<XamlFileInfo>();
+            // ReSharper disable once InvertIf
+            if (BuildEngine.BuildProjectFile(parentProjectPath, TargetGetProjectReference, props, targetOutputs))
+            {
+                var currentProjectDirectory = Directory.GetParent(parentProjectPath)!.FullName;
+
+                var projectReferenceCollection = targetOutputs.ResultFromArray(SelectInfoProjectReference);
+                if (string.IsNullOrEmpty(projectReferenceCollection[0]))
+                    return xamlFileInfoCollection;
+
+                var projectReadiesInner = projectReadies.ToList();
+                foreach (var project in projectReferenceCollection)
+                {
+                    var path = Path.Combine(currentProjectDirectory, project);
+                    // ReSharper disable once InvertIf
+                    if (TryResolvePreviewInfoCommonProjectReference(path, projectReadiesInner, out var xamlFileInfo))
+                    {
+                        xamlFileInfoCollection.Add(new XamlFileInfo
+                        {
+                            ProjectPath = xamlFileInfo.ProjectPath,
+                            AvaloniaResource = xamlFileInfo.AvaloniaResource,
+                            AvaloniaXaml = xamlFileInfo.AvaloniaXaml,
+                        });
+                        xamlFileInfoCollection.AddRange(xamlFileInfo.ReferenceXamlFileInfoCollection);
+                        
+                        projectReadiesInner.Add(xamlFileInfo.ProjectPath);
+                        projectReadiesInner.AddRange(xamlFileInfo.ReferenceXamlFileInfoCollection.Select(x => x.ProjectPath));
+                    }
+                }
+            }
 
-            var isSuccess = BuildEngine.BuildProjectFile(ProjectFile, TargetNamesCommon, props, targetOutputs);
-            if (!isSuccess)
+            return xamlFileInfoCollection;
+        }
+
+        private bool TryResolvePreviewInfoCommonProjectReference(
+            string projectReference, IReadOnlyList<string> readies, out XamlFileInfo xamlFileInfo)
+        {
+            if (!TryResolvePreviewInfoTfms(projectReference, out var targetFrameworks))
+            {
+                xamlFileInfo = default!;
                 return false;
+            }
 
-            projectInfo = SelectProjectInfoCommon(targetOutputs, targetFrameworks);
+            var targetOutputs = new Dictionary<string, ITaskItem[]>();
+            var props = GetGlobalProperties(targetFrameworks[0]);
 
-            return true;
+            if (BuildEngine.BuildProjectFile(projectReference, TargetNamesCommon, props, targetOutputs))
+            {
+                var projectPath = targetOutputs.ResultFromSingle(SelectInfoProjectPath);
+                if (readies.Contains(projectPath, StringComparer.OrdinalIgnoreCase))
+                {
+                    xamlFileInfo = default!;
+                    return false;
+                }
+
+                xamlFileInfo = new XamlFileInfo
+                {
+                    ProjectPath = projectPath,
+                    AvaloniaResource = targetOutputs.ResultFromArrayAsSingleSkipNonXaml(SelectInfoAvaloniaResource),
+                    AvaloniaXaml = targetOutputs.ResultFromArrayAsSingle(SelectInfoAvaloniaXaml),
+                };
+
+                xamlFileInfo.ReferenceXamlFileInfoCollection = ResolveReferenceXamlFileInfoCollection(
+                    xamlFileInfo.ProjectPath, props, readies);
+
+                return true;
+            }
+
+            xamlFileInfo = default!;
+            return false;
         }
 
-        private bool TryResolveProjectInfoByTfm(out ProjectInfoByTfm projectInfoByTfm, string targetFramework = "")
+        private bool TryResolveAppExecInfo(out AppExecInfo appExecInfo, string targetFramework = "")
         {
-            projectInfoByTfm = default!;
             var targetOutputs = new Dictionary<string, ITaskItem[]>();
             var props = GetGlobalProperties(targetFramework);
 
-            var isSuccess = BuildEngine.BuildProjectFile(ProjectFile, TargetNamesByTfm, props, targetOutputs);
-            if (!isSuccess)
-                return false;
-
-            projectInfoByTfm = SelectProjectInfoByTfm(targetOutputs);
+            if (BuildEngine.BuildProjectFile(ProjectFile, TargetNamesAppExecInfo, props, targetOutputs))
+            {
+                appExecInfo = SelectAppExecInfo(targetOutputs);
+                return true;
+            }
 
-            return true;
+            appExecInfo = default!;
+            return false;
         }
 
+        private static bool ShouldReferencesAvalonia(PreviewInfo previewInfo) =>
+            !string.IsNullOrEmpty(previewInfo.AvaloniaPreviewerNetCoreToolPath)
+            || !string.IsNullOrEmpty(previewInfo.AvaloniaPreviewerNetFullToolPath);
+
+        private void LogProjectNotAvalonia() =>
+            BuildEngine.LogErrorEvent(new BuildErrorEventArgs(
+                "APIR",
+                "001",
+                ProjectFile,
+                0,
+                0,
+                0,
+                0,
+                "MSBuild project file does not reference AvaloniaUI",
+                string.Empty,
+                string.Empty));
+
+        private void LogProjectNotExe() =>
+            BuildEngine.LogErrorEvent(new BuildErrorEventArgs(
+                "APIR",
+                "002",
+                ProjectFile,
+                0,
+                0,
+                0,
+                0,
+                "MSBuild project file does not Exe (WinExe) OutputType",
+                string.Empty,
+                string.Empty));
+
         private Dictionary<string, string> GetGlobalProperties(string targetFramework) =>
             string.IsNullOrEmpty(targetFramework)
                 ? _globalPropertiesCommon
                 : new Dictionary<string, string>(_globalPropertiesCommon) {{"TargetFramework", targetFramework}};
 
-        private void SendMessage(ProjectInfo projectInfo)
+        private void SendMessage(PreviewInfo previewInfo)
         {
-            var message = SerializeToXml(projectInfo);
+            var message = SerializeToXml(previewInfo);
             if (string.IsNullOrWhiteSpace(ParentId))
             {
                 Log.LogMessage(MessageImportance.High, message);
@@ -198,20 +322,23 @@ private void SendMessage(ProjectInfo projectInfo)
         }
 
         // ReSharper disable once InconsistentNaming
-        private static ProjectInfo SelectProjectInfoCommon(Dictionary<string, ITaskItem[]> targetOutputs, string[] tfms) =>
+        private static PreviewInfo SelectPreviewInfoCommon(Dictionary<string, ITaskItem[]> targetOutputs) =>
             new()
             {
                 AvaloniaPreviewerNetCoreToolPath = targetOutputs
                     .ResultFromSingle(SelectInfoAvaloniaPreviewerNetCoreToolPath),
                 AvaloniaPreviewerNetFullToolPath = targetOutputs
                     .ResultFromSingle(SelectInfoAvaloniaPreviewerNetFullToolPath),
-                AvaloniaResource = targetOutputs.ResultFromArrayAsSingleSkipNonXaml(SelectInfoAvaloniaResource),
-                AvaloniaXaml = targetOutputs.ResultFromArrayAsSingle(SelectInfoAvaloniaXaml),
-                TargetFrameworks = string.Join(";", tfms),
+                XamlFileInfo =
+                {
+                    ProjectPath = targetOutputs.ResultFromSingle(SelectInfoProjectPath),
+                    AvaloniaResource = targetOutputs.ResultFromArrayAsSingleSkipNonXaml(SelectInfoAvaloniaResource),
+                    AvaloniaXaml = targetOutputs.ResultFromArrayAsSingle(SelectInfoAvaloniaXaml),
+                }
             };
 
         // ReSharper disable once InconsistentNaming
-        private static ProjectInfoByTfm SelectProjectInfoByTfm(Dictionary<string, ITaskItem[]> targetOutputs) =>
+        private static AppExecInfo SelectAppExecInfo(Dictionary<string, ITaskItem[]> targetOutputs) =>
             new()
             {
                 TargetFramework = targetOutputs.ResultFromSingle(SelectInfoTargetFramework),
@@ -221,7 +348,7 @@ private static ProjectInfoByTfm SelectProjectInfoByTfm(Dictionary<string, ITaskI
                 ProjectRuntimeConfigFilePath = targetOutputs.ResultFromSingle(SelectInfoProjectRuntimeConfigFilePath),
             };
 
-        private static string SerializeToXml(ProjectInfo data)
+        private static string SerializeToXml(PreviewInfo data)
         {
             using var stringWriter = new StringWriter(CultureInfo.InvariantCulture);
 
diff --git a/src/AvaloniaProjectInfoResolver/AvaloniaProjectInfoResult.cs b/src/AvaloniaProjectInfoResolver/AvaloniaPreviewInfoResult.cs
similarity index 51%
rename from src/AvaloniaProjectInfoResolver/AvaloniaProjectInfoResult.cs
rename to src/AvaloniaProjectInfoResolver/AvaloniaPreviewInfoResult.cs
index c8b0a8b..df9423e 100644
--- a/src/AvaloniaProjectInfoResolver/AvaloniaProjectInfoResult.cs
+++ b/src/AvaloniaProjectInfoResolver/AvaloniaPreviewInfoResult.cs
@@ -1,16 +1,16 @@
 namespace AvaloniaProjectInfoResolver
 {
-    public class AvaloniaProjectInfoResult
+    public class AvaloniaPreviewInfoResult
     {
-        public ProjectInfo? ProjectInfo { get; }
+        public PreviewInfo? PreviewInfo { get; }
 
         public string Error { get; }
 
         public bool HasError => Error.Length > 0;
 
-        public AvaloniaProjectInfoResult(ProjectInfo? projectInfo, string error)
+        public AvaloniaPreviewInfoResult(PreviewInfo? previewInfo, string error)
         {
-            ProjectInfo = projectInfo;
+            PreviewInfo = previewInfo;
             Error = error;
         }
     }
diff --git a/src/AvaloniaProjectInfoResolver/IProjectInfoResolver.cs b/src/AvaloniaProjectInfoResolver/IProjectInfoResolver.cs
index fff66fa..0b754a4 100644
--- a/src/AvaloniaProjectInfoResolver/IProjectInfoResolver.cs
+++ b/src/AvaloniaProjectInfoResolver/IProjectInfoResolver.cs
@@ -5,7 +5,7 @@ namespace AvaloniaProjectInfoResolver
 {
     public interface IProjectInfoResolver
     {
-        Task<AvaloniaProjectInfoResult> ResolvePreviewProjectInfoAsync(
+        Task<AvaloniaPreviewInfoResult> ResolvePreviewInfoAsync(
             string projectFilePath, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/AvaloniaProjectInfoResolver/ProjectInfoResolver.cs b/src/AvaloniaProjectInfoResolver/ProjectInfoResolver.cs
index 530dfb8..186f54e 100644
--- a/src/AvaloniaProjectInfoResolver/ProjectInfoResolver.cs
+++ b/src/AvaloniaProjectInfoResolver/ProjectInfoResolver.cs
@@ -14,7 +14,7 @@ public class ProjectInfoResolver : IProjectInfoResolver
         private static readonly string SelfDirectoryPath =
             Path.GetDirectoryName(typeof(ProjectInfoResolver).Assembly.Location)!;
 
-        public async Task<AvaloniaProjectInfoResult> ResolvePreviewProjectInfoAsync(
+        public async Task<AvaloniaPreviewInfoResult> ResolvePreviewInfoAsync(
             string projectFilePath, CancellationToken cancellationToken = default)
         {
             var receiverTask = new AnonymousPipeServerStream(PipeDirection.In, HandleInheritability.Inheritable);
@@ -47,20 +47,20 @@ public async Task<AvaloniaProjectInfoResult> ResolvePreviewProjectInfoAsync(
             if (cancellationToken.IsCancellationRequested)
             {
                 proc?.Kill();
-                return new AvaloniaProjectInfoResult(null, string.Empty);
+                return new AvaloniaPreviewInfoResult(null, string.Empty);
             }
 
             cancellationToken.Register(() => proc?.Kill());
 
-            var info = await ResolvePreviewProjectInfoAsync(receiverTask).ConfigureAwait(false);
+            var info = await ResolvePreviewInfoAsync(receiverTask).ConfigureAwait(false);
             var error = await ResolveLoggerProjectInfoAsync(receiverLogger).ConfigureAwait(false);
 
-            return new AvaloniaProjectInfoResult(
+            return new AvaloniaPreviewInfoResult(
                 cancellationToken.IsCancellationRequested ? null : info,
                 error);
         }
 
-        private static async Task<ProjectInfo?> ResolvePreviewProjectInfoAsync(AnonymousPipeServerStream receiver)
+        private static async Task<PreviewInfo?> ResolvePreviewInfoAsync(AnonymousPipeServerStream receiver)
         {
             string line;
             var sb = new StringBuilder();
@@ -72,7 +72,7 @@ public async Task<AvaloniaProjectInfoResult> ResolvePreviewProjectInfoAsync(
             var xmlData = sb.ToString();
             return string.IsNullOrEmpty(xmlData)
                 ? null
-                : (ProjectInfo)DeserializeFromXml(xmlData, typeof(ProjectInfo));
+                : (PreviewInfo)DeserializeFromXml(xmlData, typeof(PreviewInfo));
         }
 
         private static async Task<string> ResolveLoggerProjectInfoAsync(AnonymousPipeServerStream receiver)