diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index c075c317f3..ae209f085e 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -7,6 +7,29 @@
+
+ ../../src/tools
+
+
+
+
+
+
+ <_PackageFiles Include="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/bin/$(Configuration)/netcoreapp2.0/Avalonia.Designer.HostApp.dll">
+ tools/netcoreapp2.0/designer
+ false
+ None
+
+ <_PackageFiles Include="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/bin/$(Configuration)/net461/Avalonia.Designer.HostApp.exe">
+ tools/net461/designer
+ false
+ None
+
+
+
+
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj b/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
deleted file mode 100644
index b34c9891ad..0000000000
--- a/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
- Exe
- net461
- Avalonia.Designer.HostApp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs b/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs
deleted file mode 100644
index da1c5a1da3..0000000000
--- a/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-
-namespace Avalonia.Designer.HostApp.NetFX
-{
- class Program
- {
- private static string s_appDir;
- public static void Main(string[] args)
- {
- s_appDir = Directory.GetCurrentDirectory();
- AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
- foreach (var dll in Directory.GetFiles(s_appDir, "*.dll"))
- {
- try
- {
- Console.WriteLine("Loading " + dll);
- Assembly.LoadFile(dll);
- }
- catch
- {
-
- }
- }
- Exec(args);
- }
-
- static void Exec(string[] args)
- {
- Avalonia.DesignerSupport.Remote.RemoteDesignerEntryPoint.Main(args);
- }
-
- private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
- {
- string assemblyPath = Path.Combine(s_appDir, new AssemblyName(args.Name).Name + ".dll");
- if (File.Exists(assemblyPath) == false) return null;
- Assembly assembly = Assembly.LoadFrom(assemblyPath);
- return assembly;
- }
- }
-}
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Properties/launchSettings.json b/src/tools/Avalonia.Designer.HostApp.NetFX/Properties/launchSettings.json
deleted file mode 100644
index 493caa2693..0000000000
--- a/src/tools/Avalonia.Designer.HostApp.NetFX/Properties/launchSettings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "profiles": {
- "Avalonia.Designer.HostApp.NetFX": {
- "commandName": "Project",
- "commandLineArgs": "--transport tcp-bson://127.0.0.1:25000/ bin/Debug/net461/ControlCatalog.Desktop.exe"
- }
- }
-}
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index 6ef1e1315e..e01055cf05 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -1,8 +1,7 @@
Exe
- netcoreapp2.0
-
+ net461;netcoreapp2.0
@@ -15,10 +14,8 @@
-
-
-
\ No newline at end of file
+
diff --git a/src/tools/Avalonia.Designer.HostApp/Program.cs b/src/tools/Avalonia.Designer.HostApp/Program.cs
index 29640ffc6f..2079214b23 100644
--- a/src/tools/Avalonia.Designer.HostApp/Program.cs
+++ b/src/tools/Avalonia.Designer.HostApp/Program.cs
@@ -1,10 +1,47 @@
-
+using System;
+using System.IO;
+using System.Reflection;
-namespace Avalonia.Designer.HostApp
+namespace Avalonia.Designer.HostApp.NetFX
{
class Program
{
- public static void Main(string[] args)
- => Avalonia.DesignerSupport.Remote.RemoteDesignerEntryPoint.Main(args);
+#if NET461
+ private static string s_appDir;
+
+ private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+ {
+ string assemblyPath = Path.Combine(s_appDir, new AssemblyName(args.Name).Name + ".dll");
+ if (File.Exists(assemblyPath) == false) return null;
+ Assembly assembly = Assembly.LoadFrom(assemblyPath);
+ return assembly;
+ }
+ public static void Main(string[] args)
+ {
+ s_appDir = Directory.GetCurrentDirectory();
+ AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+ foreach (var dll in Directory.GetFiles(s_appDir, "*.dll"))
+ {
+ try
+ {
+ Console.WriteLine("Loading " + dll);
+ Assembly.LoadFile(dll);
+ }
+ catch
+ {
+
+ }
+ }
+ Exec(args);
+ }
+
+ static void Exec(string[] args)
+#elif NETCOREAPP2_0
+ public static void Main(string[] args)
+#endif
+ {
+ Avalonia.DesignerSupport.Remote.RemoteDesignerEntryPoint.Main(args);
+ }
+
}
-}
\ No newline at end of file
+}