Browse Source
Merge branch 'master' into feature/keyboard-focus-within
pull/4974/head
Dan Walmsley
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
1 deletions
-
Directory.Build.props
-
src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
|
|
@ -2,5 +2,7 @@ |
|
|
<PropertyGroup> |
|
|
<PropertyGroup> |
|
|
<PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)build-intermediate/nuget</PackageOutputPath> |
|
|
<PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)build-intermediate/nuget</PackageOutputPath> |
|
|
<AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)\src\tools\Avalonia.Designer.HostApp\bin\$(Configuration)\netcoreapp2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath> |
|
|
<AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)\src\tools\Avalonia.Designer.HostApp\bin\$(Configuration)\netcoreapp2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath> |
|
|
|
|
|
<!-- https://github.com/dotnet/msbuild/issues/2661 --> |
|
|
|
|
|
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies> |
|
|
</PropertyGroup> |
|
|
</PropertyGroup> |
|
|
</Project> |
|
|
</Project> |
|
|
|
|
|
@ -10,7 +10,6 @@ |
|
|
<ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"> |
|
|
<ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"> |
|
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> |
|
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> |
|
|
<ExcludeAssets>all</ExcludeAssets> |
|
|
<ExcludeAssets>all</ExcludeAssets> |
|
|
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties> |
|
|
|
|
|
</ProjectReference> |
|
|
</ProjectReference> |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
<Import Project="..\..\build\BuildTargets.targets" /> |
|
|
<Import Project="..\..\build\BuildTargets.targets" /> |
|
|
|
