From 7b4b2a0a4389c70c8576c90ccc8d5d39a3550eeb Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 30 Oct 2018 10:29:33 +0000 Subject: [PATCH 1/5] add previewer location as an msbuild property. --- Avalonia.sln | 1 + build/Avalonia.Designer.HostApp.props | 8 ++++++++ packages/Avalonia/Avalonia.csproj | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 build/Avalonia.Designer.HostApp.props diff --git a/Avalonia.sln b/Avalonia.sln index 7fa5f7736a..bf75c35d10 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -128,6 +128,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.NetCore", "s EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A}" ProjectSection(SolutionItems) = preProject + build\Avalonia.Designer.HostApp.props = build\Avalonia.Designer.HostApp.props build\Base.props = build\Base.props build\Binding.props = build\Binding.props build\JetBrains.Annotations.props = build\JetBrains.Annotations.props diff --git a/build/Avalonia.Designer.HostApp.props b/build/Avalonia.Designer.HostApp.props new file mode 100644 index 0000000000..c3a9ce20a7 --- /dev/null +++ b/build/Avalonia.Designer.HostApp.props @@ -0,0 +1,8 @@ + + + $(MSBuildThisFileDirectory)\..\..\tools\netcoreapp2.0\designer\Avalonia.Designer.HostApp.dll + + + $(MSBuildThisFileDirectory)\..\..\tools\net461\designer\Avalonia.Designer.HostApp.exe + + diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index ae209f085e..32a953ea9e 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -1,4 +1,4 @@ - + netstandard2.0;net461;netcoreapp2.0 @@ -27,6 +27,11 @@ false None + <_PackageFiles Include="../../build/Avalonia.Designer.HostApp.props"> + build/Avalonia.props + false + None + From 52e5f6fd23d738fb4481647965a5b14b8b8f1eac Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 30 Oct 2018 12:08:55 +0000 Subject: [PATCH 2/5] suggested changes --- Avalonia.sln | 1 - {build => packages/Avalonia}/Avalonia.Designer.HostApp.props | 2 ++ packages/Avalonia/Avalonia.csproj | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename {build => packages/Avalonia}/Avalonia.Designer.HostApp.props (81%) diff --git a/Avalonia.sln b/Avalonia.sln index bf75c35d10..7fa5f7736a 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -128,7 +128,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.NetCore", "s EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A}" ProjectSection(SolutionItems) = preProject - build\Avalonia.Designer.HostApp.props = build\Avalonia.Designer.HostApp.props build\Base.props = build\Base.props build\Binding.props = build\Binding.props build\JetBrains.Annotations.props = build\JetBrains.Annotations.props diff --git a/build/Avalonia.Designer.HostApp.props b/packages/Avalonia/Avalonia.Designer.HostApp.props similarity index 81% rename from build/Avalonia.Designer.HostApp.props rename to packages/Avalonia/Avalonia.Designer.HostApp.props index c3a9ce20a7..fd7ecc9d12 100644 --- a/build/Avalonia.Designer.HostApp.props +++ b/packages/Avalonia/Avalonia.Designer.HostApp.props @@ -1,8 +1,10 @@  $(MSBuildThisFileDirectory)\..\..\tools\netcoreapp2.0\designer\Avalonia.Designer.HostApp.dll + dotnet exec $(MSBuildThisFileDirectory)\..\..\tools\net461\designer\Avalonia.Designer.HostApp.exe + exe diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index 32a953ea9e..61e29b8016 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -27,7 +27,7 @@ false None - <_PackageFiles Include="../../build/Avalonia.Designer.HostApp.props"> + <_PackageFiles Include="build/Avalonia.Designer.HostApp.props"> build/Avalonia.props false None From 93b507fc116a8a63bfb0a5d35075a1d0c20ffc85 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 30 Oct 2018 12:25:49 +0000 Subject: [PATCH 3/5] rename props file. --- packages/Avalonia/Avalonia.csproj | 2 +- .../{Avalonia.Designer.HostApp.props => Avalonia.props} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/Avalonia/{Avalonia.Designer.HostApp.props => Avalonia.props} (100%) diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index 61e29b8016..4cb2877b2f 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -27,7 +27,7 @@ false None - <_PackageFiles Include="build/Avalonia.Designer.HostApp.props"> + <_PackageFiles Include="build/Avalonia.props"> build/Avalonia.props false None diff --git a/packages/Avalonia/Avalonia.Designer.HostApp.props b/packages/Avalonia/Avalonia.props similarity index 100% rename from packages/Avalonia/Avalonia.Designer.HostApp.props rename to packages/Avalonia/Avalonia.props From 2eceba9e741bcea404f3633488dd7c436f4b962e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 30 Oct 2018 13:34:32 +0000 Subject: [PATCH 4/5] fix location of avalonia.props. --- packages/Avalonia/Avalonia.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index 4cb2877b2f..dee42fb795 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -27,7 +27,7 @@ false None - <_PackageFiles Include="build/Avalonia.props"> + <_PackageFiles Include="Avalonia.props"> build/Avalonia.props false None From 1db82552a2977f4e246b6ef20c549abc823ef80c Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Tue, 30 Oct 2018 17:14:15 +0300 Subject: [PATCH 5/5] Separate previewer properties --- packages/Avalonia/Avalonia.props | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/Avalonia/Avalonia.props b/packages/Avalonia/Avalonia.props index fd7ecc9d12..8234dc4fde 100644 --- a/packages/Avalonia/Avalonia.props +++ b/packages/Avalonia/Avalonia.props @@ -1,10 +1,6 @@ - - - $(MSBuildThisFileDirectory)\..\..\tools\netcoreapp2.0\designer\Avalonia.Designer.HostApp.dll - dotnet exec - - - $(MSBuildThisFileDirectory)\..\..\tools\net461\designer\Avalonia.Designer.HostApp.exe - exe + + + $(MSBuildThisFileDirectory)\..\tools\netcoreapp2.0\designer\Avalonia.Designer.HostApp.dll + $(MSBuildThisFileDirectory)\..\tools\net461\designer\Avalonia.Designer.HostApp.exe