tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix builds

api-diff-demo
Dan Walmsley 6 years ago
parent
54caeeccd2
commit
4e5662cb6d
8 changed files with 11 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      build/ApiDiff.props
  2. 6
      src/Avalonia.Desktop/Avalonia.Desktop.csproj
  3. 2
      src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
  4. 2
      src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
  5. 2
      src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
  6. 2
      src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
  7. 2
      src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
  8. 2
      src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

5
build/ApiDiff.props
View File

@ -1,11 +1,12 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ApiContractPackageVersion>0.10.0-preview1</ApiContractPackageVersion> <ApiContractPackageVersion>0.10.0-preview1</ApiContractPackageVersion>
<PackageId Condition="'$(PackageId)' == ''">Avalonia</PackageId> <NugetPackageName Condition="'$(PackageId)' != ''">$(PackageId)</NugetPackageName>
<NugetPackageName Condition="'$(PackageId)' == ''">Avalonia</NugetPackageName>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageDownload Include="Avalonia" Version="[$(ApiContractPackageVersion)]" /> <PackageDownload Include="Avalonia" Version="[$(ApiContractPackageVersion)]" />
<PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20364.3" PrivateAssets="All" /> <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20364.3" PrivateAssets="All" />
<ResolvedMatchingContract Include="$(NuGetPackageRoot)\$(PackageId)\$(ApiContractPackageVersion)\lib\netstandard2.0\$(AssemblyName).dll" /> <ResolvedMatchingContract Include="$(NuGetPackageRoot)\$(NugetPackageName)\$(ApiContractPackageVersion)\lib\netstandard2.0\$(AssemblyName).dll" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/Avalonia.Desktop/Avalonia.Desktop.csproj
View File

@ -11,8 +11,6 @@
<ProjectReference Include="../../packages/Avalonia/Avalonia.csproj" /> <ProjectReference Include="../../packages/Avalonia/Avalonia.csproj" />
<ProjectReference Include="../Avalonia.X11/Avalonia.X11.csproj" /> <ProjectReference Include="../Avalonia.X11/Avalonia.X11.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <Import Project="..\..\build\ApiDiff.props" />
<Import Project="..\..\build\ApiDiff.props" />
</ItemGroup>
</Project> </Project>

2
src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
View File

@ -8,5 +8,5 @@
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" /> <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
<ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" /> <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\build\ApiDiff.props" /> <Import Project="..\..\..\build\ApiDiff.props" />
</Project> </Project>

2
src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
View File

@ -11,5 +11,5 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" /> <ProjectReference Include="..\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\build\ApiDiff.props" /> <Import Project="..\..\..\build\ApiDiff.props" />
</Project> </Project>

2
src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
View File

@ -64,5 +64,5 @@
<ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" /> <ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\..\build\Rx.props" /> <Import Project="..\..\..\build\Rx.props" />
<Import Project="..\..\build\ApiDiff.props" /> <Import Project="..\..\..\build\ApiDiff.props" />
</Project> </Project>

2
src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
View File

@ -16,5 +16,5 @@
</ItemGroup> </ItemGroup>
<Import Project="..\..\..\build\Rx.props" /> <Import Project="..\..\..\build\Rx.props" />
<Import Project="..\..\..\build\System.Memory.props" /> <Import Project="..\..\..\build\System.Memory.props" />
<Import Project="..\..\build\ApiDiff.props" /> <Import Project="..\..\..\build\ApiDiff.props" />
</Project> </Project>

2
src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
View File

@ -17,5 +17,5 @@
<Import Project="..\..\..\build\SkiaSharp.props" /> <Import Project="..\..\..\build\SkiaSharp.props" />
<Import Project="..\..\..\build\HarfBuzzSharp.props" /> <Import Project="..\..\..\build\HarfBuzzSharp.props" />
<Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" /> <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
<Import Project="..\..\build\ApiDiff.props" /> <Import Project="..\..\..\build\ApiDiff.props" />
</Project> </Project>

2
src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
View File

@ -9,5 +9,5 @@
<PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" /> <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />
<Import Project="..\..\build\ApiDiff.props" /> <Import Project="..\..\..\build\ApiDiff.props" />
</Project> </Project>

Write Preview
Loading…
Cancel
Save