From 3b79d92b4bae43ee924a26bc71897b71048b28bd Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 22 Jul 2020 17:24:37 -0300
Subject: [PATCH] add properties for api diff versions and package locations.

---
 build/ApiDiff.props                            | 13 ++++++++-----
 src/Avalonia.Base/Avalonia.Base.csproj         |  1 +
 src/Avalonia.Controls/Avalonia.Controls.csproj |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/ApiDiff.props b/build/ApiDiff.props
index 651021f456..e5ae761c7f 100644
--- a/build/ApiDiff.props
+++ b/build/ApiDiff.props
@@ -1,7 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageDownload Include="Avalonia" Version="[0.10.0-preview1]" />
-    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20364.3" PrivateAssets="All" />
-    <ResolvedMatchingContract Include="$(NuGetPackageRoot)\avalonia\0.10.0-preview1\lib\netstandard2.0\$(AssemblyName).dll" />
-  </ItemGroup>
+  <PropertyGroup>
+    <ApiContractPackageVersion>0.10.0-preview1</ApiContractPackageVersion>
+  </PropertyGroup>
+    <ItemGroup>
+      <PackageDownload Include="Avalonia" Version="[$(ApiContractPackageVersion)]" />
+      <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20364.3" PrivateAssets="All" />
+      <ResolvedMatchingContract Include="$(NuGetPackageRoot)\$(NugetPackageName)\$(ApiContractPackageVersion)\lib\netstandard2.0\$(AssemblyName).dll" />
+    </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index d368edbe2b..0528e7e62c 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -4,6 +4,7 @@
     <AssemblyName>Avalonia.Base</AssemblyName>
     <RootNamespace>Avalonia</RootNamespace>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <NugetPackageName>Avalonia</NugetPackageName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"/>
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 32331d29ab..e3933113d4 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <NugetPackageName>Avalonia</NugetPackageName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@@ -14,4 +15,5 @@
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>