Merge branch 'release/v0.6.1' into develop

VitalElement · Mar 29, 2019 · 92cfb53 · 92cfb53
2 parents b360897 + 729d36a
commit 92cfb53
Show file tree

Hide file tree

Showing 13 changed files with 146 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -241,3 +241,7 @@ $RECYCLE.BIN/
 AvalonStudio/AvalonStudioBuild/Properties/launchSettings\.json
 
 AvalonStudio/ToolchainUploader/Properties/launchSettings\.json
+
+AvalonStudio/AvalonStudio\.Windows\.Installer/ComponentsGeneratedASB\.wxs
+
+AvalonStudio/AvalonStudio\.Windows\.Installer/ComponentsGeneratedAS\.wxs
diff --git a/...onStudio/SetupProject1/Assets/License.rtf → ...udio.Windows.Installer/Assets/License.rtf b/...onStudio/SetupProject1/Assets/License.rtf → ...udio.Windows.Installer/Assets/License.rtf
diff --git a/...upProject1/AvalonStudio.Installer.wixproj → ....Installer/AvalonStudio.Installer.wixproj b/...upProject1/AvalonStudio.Installer.wixproj → ....Installer/AvalonStudio.Installer.wixproj
@@ -30,7 +30,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Components.wxs" />
-    <Compile Include="ComponentsGenerated.wxs" />
+    <Compile Include="ComponentsGeneratedAS.wxs" />
+    <Compile Include="ComponentsGeneratedASB.wxs" />
     <Compile Include="Directories.wxs" />
     <Compile Include="Product.wxs" />
   </ItemGroup>
@@ -44,6 +45,14 @@
     </WixExtension>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\AvalonStudioBuild\AvalonStudioBuild.csproj">
+      <Name>AvalonStudioBuild</Name>
+      <Project>{d7720520-9184-45d3-9817-7c12983c075c}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\AvalonStudio\AvalonStudio.csproj">
       <Name>AvalonStudio</Name>
       <Project>{8e501956-b9a6-430e-86ac-350ed94b44e4}</Project>
@@ -66,13 +75,15 @@
   </Target>
   <Target Name="BeforeBuild">
     <Exec Command="dotnet publish ..\AvalonStudio\AvalonStudio.csproj -c $(Configuration) -f netcoreapp2.2 -r win7-x64" />
+    <Exec Command="dotnet publish ..\AvalonStudioBuild\AvalonStudioBuild.csproj -c $(Configuration) -f netcoreapp2.2 -r win7-x64" />
     <GetAssemblyIdentity AssemblyFiles="..\AvalonStudio\bin\$(Configuration)\netcoreapp2.2\win7-x64\AvalonStudio.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyVersion" />
     </GetAssemblyIdentity>
     <PropertyGroup>
-      <DefineConstants>BuildVersion=%(AssemblyVersion.Version);BasePath=..\AvalonStudio\bin\$(Configuration)\netcoreapp2.2\win7-x64\publish</DefineConstants>
+      <DefineConstants>BuildVersion=%(AssemblyVersion.Version);BasePathAS=..\AvalonStudio\bin\$(Configuration)\netcoreapp2.2\win7-x64\publish;BasePathAB=..\AvalonStudioBuild\bin\$(Configuration)\netcoreapp2.2\win7-x64\publish</DefineConstants>
     </PropertyGroup>
-    <HeatDirectory OutputFile="ComponentsGenerated.wxs" PreprocessorVariable="var.BasePath" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="PublishedComponents" SuppressCom="True" Directory="..\AvalonStudio\bin\$(Configuration)\netcoreapp2.2\win7-x64\publish" SuppressFragments="True" SuppressRegistry="True" SuppressRootDirectory="True" AutoGenerateGuids="False" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" />
+    <HeatDirectory OutputFile="ComponentsGeneratedAS.wxs" PreprocessorVariable="var.BasePathAS" DirectoryRefId="INSTALLASFOLDER" ComponentGroupName="PublishedComponentsAS" SuppressCom="True" Directory="..\AvalonStudio\bin\$(Configuration)\netcoreapp2.2\win7-x64\publish" SuppressFragments="True" SuppressRegistry="True" SuppressRootDirectory="True" AutoGenerateGuids="False" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" />
+    <HeatDirectory OutputFile="ComponentsGeneratedASB.wxs" PreprocessorVariable="var.BasePathAB" DirectoryRefId="INSTALLABFOLDER" ComponentGroupName="PublishedComponentsAB" SuppressCom="True" Directory="..\AvalonStudioBuild\bin\$(Configuration)\netcoreapp2.2\win7-x64\publish" SuppressFragments="True" SuppressRegistry="True" SuppressRootDirectory="True" AutoGenerateGuids="False" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" />
   </Target>
   <Target Name="AfterBuild">
   </Target>

diff --git a/AvalonStudio/SetupProject1/Common.wxl → ...AvalonStudio.Windows.Installer/Common.wxl b/AvalonStudio/SetupProject1/Common.wxl → ...AvalonStudio.Windows.Installer/Common.wxl
diff --git a/AvalonStudio/AvalonStudio.Windows.Installer/Components.wxs b/AvalonStudio/AvalonStudio.Windows.Installer/Components.wxs
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+
+      <ComponentRef Id="MainAppShortcut" />
+      <ComponentRef Id="ASBuildComponent" />
+
+    </ComponentGroup>
+
+    <DirectoryRef Id="INSTALLASFOLDER" FileSource="..\AvalonStudio\bin\Release\netcoreapp2.2\win7-x64\publish\">
+      <Component Id="MainAppShortcut" Guid="{52CCFB0B-489A-4A7D-9BD3-E8704792C8FF}">
+        <Shortcut Id="MainAppShortcut"
+                  Name="AvalonStudio"
+                  Target="[INSTALLASFOLDER]AvalonStudio.exe"
+                  Directory="InstallProgramMenuFolder"
+                  WorkingDirectory="INSTALLASFOLDER"
+                  Icon="app.icon" />
+
+        <RegistryValue Id="RegShortcutKet" Root="HKCU" Key="SOFTWARE\AvalonStudio" Name="Shortcut" Value="1" Type="integer" KeyPath="yes" />
+
+        <CreateFolder Directory="ExtensionsASFolder" />
+
+        <RemoveFolder Id="RemoveStartMenu" Directory="InstallProgramMenuFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveVESmFolder" Directory="VitalElementFolder" On="uninstall" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="INSTALLABFOLDER" FileSource="..\AvalonStudioBuild\bin\Release\netcoreapp2.2\win7-x64\publish\">
+      <Component Id="ASBuildComponent" Guid="{89C57461-C489-47FB-80D1-80345C25B335}">
+        <CreateFolder />
+        <CreateFolder Directory="ExtensionsABFolder" />
+        <Environment
+                  Id="Environment"
+                  Name="PATH"
+                  Part="last"
+                  System="yes"
+                  Value="[INSTALLABFOLDER]"
+                  Action="set" />
+      </Component>
+    </DirectoryRef>
+
+  </Fragment>
+</Wix>
diff --git a/AvalonStudio/AvalonStudio.Windows.Installer/Directories.wxs b/AvalonStudio/AvalonStudio.Windows.Installer/Directories.wxs
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="VitalElementFolder" Name="VitalElement">
+          <Directory Id="InstallProgramMenuFolder" Name="AvalonStudio" />
+        </Directory>
+      </Directory>
+
+      <Directory Id="ProgramFiles64Folder">
+        <Directory Id="VITALELEMENTFOLDER" Name="VitalElement">
+          <Directory Id="INSTALLASFOLDER" Name="AvalonStudio">
+            <Directory Id="ExtensionsASFolder" Name="Extensions" />
+          </Directory>
+          <Directory Id="INSTALLABFOLDER" Name="AvalonBuild">
+            <Directory Id="ExtensionsABFolder" Name="Extensions" />
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+  </Fragment>
+</Wix>
diff --git a/AvalonStudio/SetupProject1/Product.wxs → ...valonStudio.Windows.Installer/Product.wxs b/AvalonStudio/SetupProject1/Product.wxs → ...valonStudio.Windows.Installer/Product.wxs
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define UpgradeCode = "{03E9955F-4EA1-40AF-A7E2-16994046922C}"?>
-	<Product Id="{90701A97-B91F-4BBA-AA1E-EC9AD158E981}" 
+  <!-- TODO Change Product Id every time a new version is released. -->
+	<Product Id="{38E525A5-DD08-4636-8487-AF117E61ACEA}" 
            Name="!(loc.ProductName)" Language="1033" 
            Version="$(var.BuildVersion)" 
            Manufacturer="VitalElement" 
            UpgradeCode="b9bca33e-4d27-49a0-b633-ed6a628a6615">
 		<Package InstallerVersion="200" 
              Compressed="yes" 
-             InstallScope="perMachine"
-
-             />
+             InstallScope="perMachine"/>
 
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallInitialize" />
 		<MediaTemplate EmbedCab="yes" />
 
     <Icon Id="app.icon" SourceFile="$(var.AvalonStudio.ProjectDir)..\AvalonStudio.Controls.Standard\AboutScreen\Assets\logo-256.ico" />
@@ -27,10 +25,8 @@
 
 		<Feature Id="ProductFeature" Title="AvalonStudio" Level="1">
 			<ComponentGroupRef Id="ProductComponents" />
-      <ComponentGroupRef Id="PublishedComponents" />
+      <ComponentGroupRef Id="PublishedComponentsAS" />
+      <ComponentGroupRef Id="PublishedComponentsAB" />
 		</Feature>
 	</Product>
-
-
-
 </Wix>
diff --git a/AvalonStudio/AvalonStudio.sln b/AvalonStudio/AvalonStudio.sln
@@ -132,14 +132,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageManager", "PackageMa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonStudio.Controls.Editor", "AvalonStudio.Controls.Editor\AvalonStudio.Controls.Editor.csproj", "{9B27D7BA-7C52-412B-A2FB-492964551B5F}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "AvalonStudio.Installer", "SetupProject1\AvalonStudio.Installer.wixproj", "{0ECB963D-916C-442E-80FB-4A066C9558DE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonStudio.Terminals", "..\AvalonStudio.TerminalEmulator\src\AvalonStudio.Terminals\AvalonStudio.Terminals.csproj", "{F38E0471-853E-46CF-A59E-791A8240DDDF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VtNetCore.Avalonia", "..\AvalonStudio.TerminalEmulator\VtNetCore.Avalonia\VtNetCore.Avalonia\VtNetCore.Avalonia.csproj", "{52C760C6-5C02-43B8-B5F4-017795CE97C7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VtNetCore", "..\AvalonStudio.TerminalEmulator\VtNetCore.Avalonia\VtNetCore\VtNetCore\VtNetCore.csproj", "{B6A3285E-AE13-4D1A-A93D-3EBCB16CFB25}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "AvalonStudio.Installer", "AvalonStudio.Windows.Installer\AvalonStudio.Installer.wixproj", "{0ECB963D-916C-442E-80FB-4A066C9558DE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shell", "Shell", "{A12B5AC1-6892-47E6-9D30-6D0EB14DC092}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{6E640CCC-3A68-4684-8E1F-90E4FE4BD5EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{9578F3AA-3F10-449C-9B68-8040DACDF308}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IDE", "IDE", "{B289F4EC-4D3B-499D-8B03-6B59550A0F37}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1032,19 +1040,6 @@ Global
 		{9B27D7BA-7C52-412B-A2FB-492964551B5F}.Release|x64.Build.0 = Release|Any CPU
 		{9B27D7BA-7C52-412B-A2FB-492964551B5F}.Release|x86.ActiveCfg = Release|Any CPU
 		{9B27D7BA-7C52-412B-A2FB-492964551B5F}.Release|x86.Build.0 = Release|Any CPU
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|ARM.ActiveCfg = Debug|x86
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|x64.ActiveCfg = Debug|x64
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|x64.Build.0 = Debug|x64
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|x86.ActiveCfg = Debug|x86
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|x86.Build.0 = Debug|x86
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|Any CPU.ActiveCfg = Release|x64
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|Any CPU.Build.0 = Release|x64
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|ARM.ActiveCfg = Release|x86
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|x64.ActiveCfg = Release|x64
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|x64.Build.0 = Release|x64
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|x86.ActiveCfg = Release|x86
-		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|x86.Build.0 = Release|x86
 		{F38E0471-853E-46CF-A59E-791A8240DDDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F38E0471-853E-46CF-A59E-791A8240DDDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F38E0471-853E-46CF-A59E-791A8240DDDF}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1093,6 +1088,18 @@ Global
 		{B6A3285E-AE13-4D1A-A93D-3EBCB16CFB25}.Release|x64.Build.0 = Release|Any CPU
 		{B6A3285E-AE13-4D1A-A93D-3EBCB16CFB25}.Release|x86.ActiveCfg = Release|Any CPU
 		{B6A3285E-AE13-4D1A-A93D-3EBCB16CFB25}.Release|x86.Build.0 = Release|Any CPU
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|ARM.ActiveCfg = Debug|x86
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|x64.ActiveCfg = Debug|x64
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|x64.Build.0 = Debug|x64
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|x86.ActiveCfg = Debug|x86
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Debug|x86.Build.0 = Debug|x86
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|Any CPU.ActiveCfg = Release|x86
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|ARM.ActiveCfg = Release|x86
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|x64.ActiveCfg = Release|x64
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|x64.Build.0 = Release|x64
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|x86.ActiveCfg = Release|x86
+		{0ECB963D-916C-442E-80FB-4A066C9558DE}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1110,6 +1117,10 @@ Global
 		{EB735B57-518A-4DC5-8DFF-CA6D5DB604D2} = {5F514911-0404-4D14-B69A-458BA643F5C7}
 		{AE63AE6C-06AB-4BF0-B68F-96D77FC48730} = {5F514911-0404-4D14-B69A-458BA643F5C7}
 		{A1686D65-2F40-48EA-B04B-A775730FDD55} = {2DC36CEA-5C75-4389-B370-9AEDA400F540}
+		{2DC36CEA-5C75-4389-B370-9AEDA400F540} = {B289F4EC-4D3B-499D-8B03-6B59550A0F37}
+		{E22D2558-C9DA-4E94-9014-084F28A38431} = {B289F4EC-4D3B-499D-8B03-6B59550A0F37}
+		{528C3D32-4210-4109-AE60-B965C6BED1C3} = {B289F4EC-4D3B-499D-8B03-6B59550A0F37}
+		{471E42FB-AFA4-4DA0-8185-DDD1B0FB4BD3} = {B289F4EC-4D3B-499D-8B03-6B59550A0F37}
 		{F822E62D-2807-4FF3-B49C-35520A8D1DAD} = {0DACCA4D-C93E-45AC-8206-FF2E5C0BC587}
 		{ACDABE67-66CA-45F0-A954-88E62592E9ED} = {0DACCA4D-C93E-45AC-8206-FF2E5C0BC587}
 		{35768E41-F2C8-4519-A1A8-7194D31E31C7} = {2DC36CEA-5C75-4389-B370-9AEDA400F540}
@@ -1118,21 +1129,36 @@ Global
 		{D9A9F5BF-8C67-4EFE-AA8D-6AE0E3D004D0} = {E22D2558-C9DA-4E94-9014-084F28A38431}
 		{D88FB116-18CB-46E8-9B87-F0882833127C} = {E22D2558-C9DA-4E94-9014-084F28A38431}
 		{AFBCFA51-8ADE-410F-AD9A-B5FE998262D6} = {1EF2A059-2DC9-4C46-A28B-67C20A77BCE4}
+		{18772A88-E9AC-4B84-8838-1DD3205F17A0} = {B289F4EC-4D3B-499D-8B03-6B59550A0F37}
 		{539DD527-4375-4EE6-8C52-71F2E39E5EB8} = {18772A88-E9AC-4B84-8838-1DD3205F17A0}
 		{284DF35F-0A39-4D58-AB22-1F5CBDAE9660} = {5F514911-0404-4D14-B69A-458BA643F5C7}
 		{BF359DA0-771C-4F68-B2FB-1FD7AE2F0A87} = {5F514911-0404-4D14-B69A-458BA643F5C7}
 		{74704C00-5861-4F86-920C-865148A175C5} = {5F514911-0404-4D14-B69A-458BA643F5C7}
 		{FC39EF57-BC1B-4250-A0CC-BEC9D7C61D05} = {5F514911-0404-4D14-B69A-458BA643F5C7}
+		{17707F77-638A-448B-9189-3E2444E839AB} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
 		{0A89B721-30C0-48A2-A3AD-74CD89B99A01} = {5F514911-0404-4D14-B69A-458BA643F5C7}
 		{CA68B708-6F68-421B-B1A7-F1AB7267C0F4} = {1EF2A059-2DC9-4C46-A28B-67C20A77BCE4}
 		{BAC6029E-1591-4EC4-90AA-78EEE4E8D50D} = {528C3D32-4210-4109-AE60-B965C6BED1C3}
 		{BD674D2D-3435-4C8B-BCA1-7344E17EF3AB} = {528C3D32-4210-4109-AE60-B965C6BED1C3}
 		{952217E5-1523-40FA-9808-BBB50344C0F1} = {528C3D32-4210-4109-AE60-B965C6BED1C3}
+		{2DCD569B-82AA-4D52-AA73-321730A95AE5} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
+		{9BE22634-4CDA-49BB-AA1F-9D75E012F462} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
+		{01C464FE-E054-4F3E-87BB-2AB90668475D} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
+		{D9343750-23DB-4991-833E-921FE85025BB} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
+		{AF6BA238-3D2D-415E-827D-65DEAE2EF480} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
+		{791EC711-B1FF-4C7A-B76A-196469DFE3D3} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
+		{9A8D9A58-5F9F-457F-870E-F29263650EDB} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
+		{D00F5A20-202B-4A3D-8CE9-E86C7253C17C} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
 		{088A0AAA-0A66-401E-BDF5-1BB40914FB25} = {5F514911-0404-4D14-B69A-458BA643F5C7}
 		{95F2C9BB-D7E0-4630-A7CA-F17C0F6F39BF} = {E22D2558-C9DA-4E94-9014-084F28A38431}
 		{79EDFD78-6ED2-426D-AD07-61617DD4ED29} = {E22D2558-C9DA-4E94-9014-084F28A38431}
+		{4302F347-61C4-4D10-9A34-50B19C3C1AA8} = {A12B5AC1-6892-47E6-9D30-6D0EB14DC092}
 		{67E9AA4C-81DC-45AE-9F08-F4F4734F57E1} = {0DACCA4D-C93E-45AC-8206-FF2E5C0BC587}
 		{C5351CEE-B3DB-4D28-AAC2-E735E67DD642} = {0DACCA4D-C93E-45AC-8206-FF2E5C0BC587}
+		{4BEC4FEF-A501-4B2A-A644-E524F61567DE} = {A12B5AC1-6892-47E6-9D30-6D0EB14DC092}
+		{AD7239C9-7567-44FB-815F-13F4FE7A99C0} = {A12B5AC1-6892-47E6-9D30-6D0EB14DC092}
+		{A99AAE6F-7839-45CF-BF75-DB23AAA82102} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
+		{E23DB11F-D547-42C6-A128-AF6F23DF315A} = {9578F3AA-3F10-449C-9B68-8040DACDF308}
 		{0316DBA2-9687-4A1F-94F7-7940A7D3AFC7} = {528C3D32-4210-4109-AE60-B965C6BED1C3}
 		{DA9C8C4A-57B2-4AFA-B287-79E09F411744} = {71112312-3BD0-4EE4-8039-F4DF970ECAD9}
 		{139231DE-5F54-4AAA-A28A-E474CE713BA5} = {528C3D32-4210-4109-AE60-B965C6BED1C3}
@@ -1141,6 +1167,7 @@ Global
 		{F38E0471-853E-46CF-A59E-791A8240DDDF} = {0DACCA4D-C93E-45AC-8206-FF2E5C0BC587}
 		{52C760C6-5C02-43B8-B5F4-017795CE97C7} = {0DACCA4D-C93E-45AC-8206-FF2E5C0BC587}
 		{B6A3285E-AE13-4D1A-A93D-3EBCB16CFB25} = {0DACCA4D-C93E-45AC-8206-FF2E5C0BC587}
+		{0ECB963D-916C-442E-80FB-4A066C9558DE} = {6E640CCC-3A68-4684-8E1F-90E4FE4BD5EA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {54EEE82F-58D0-4EF3-990D-CBFA0C11A3D6}

diff --git a/AvalonStudio/AvalonStudio/App.paml.cs b/AvalonStudio/AvalonStudio/App.paml.cs
@@ -80,14 +80,18 @@ public static AppBuilder BuildAvaloniaApp()
             {
                 result
                     .UseWin32()
-                    .UseDirect2D1();
+                    .UseSkia();
             }
             else
             {
                 result.UsePlatformDetect();
             }
 
-            return result;
+            return result
+                .With(new Win32PlatformOptions { AllowEglInitialization = true, UseDeferredRendering = true })
+                .With(new MacOSPlatformOptions { ShowInDock = true })
+                .With(new AvaloniaNativePlatformOptions { UseDeferredRendering = true, UseGpu = true })
+                .With(new X11PlatformOptions { UseGpu = true, UseEGL = true });
         }
 
         public override void Initialize()

diff --git a/AvalonStudio/AvalonStudio/AvalonStudio.csproj b/AvalonStudio/AvalonStudio/AvalonStudio.csproj
@@ -35,6 +35,7 @@
     <PackageReference Include="System.Composition" Version="1.1.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Security.Principal" Version="4.3.0" />
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AvalonStudio/AvalonStudioBuild/AvalonStudioBuild.csproj b/AvalonStudio/AvalonStudioBuild/AvalonStudioBuild.csproj
@@ -36,4 +36,9 @@
     <ProjectReference Include="..\AvalonStudio.Toolchains.STM32\AvalonStudio.Toolchains.STM32.csproj" />
   </ItemGroup>
 
+  <Target Name="GetTargetPath" Returns="@(_FakeOutputPath)">
+    <ItemGroup>
+      <_FakeOutputPath Include="$(MSBuildProjectDirectory)\$(PackageOutputPath)\$(AssemblyName).UNK" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/AvalonStudio/SetupProject1/Components.wxs b/AvalonStudio/SetupProject1/Components.wxs
diff --git a/AvalonStudio/SetupProject1/Directories.wxs b/AvalonStudio/SetupProject1/Directories.wxs