Browse Source

Merge branch 'master' into feature/keyboard-focus-within

Dan Walmsley 5 years ago
parent
commit
521c94f747
2 changed files with 2 additions and 1 deletions
  1. 2 0
      Directory.Build.props
  2. 0 1
      src/Avalonia.MicroCom/Avalonia.MicroCom.csproj

+ 2 - 0
Directory.Build.props

@@ -2,5 +2,7 @@
   <PropertyGroup>
       <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)build-intermediate/nuget</PackageOutputPath>
       <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>
 </Project>

+ 0 - 1
src/Avalonia.MicroCom/Avalonia.MicroCom.csproj

@@ -10,7 +10,6 @@
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <ExcludeAssets>all</ExcludeAssets>
-      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
     </ProjectReference>
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />