Browse Source

add api diff to most projects.

Dan Walmsley 5 years ago
parent
commit
26d68e9958
28 changed files with 38 additions and 7 deletions
  1. 2 1
      build/ApiDiff.props
  2. 2 1
      src/Avalonia.Animation/Avalonia.Animation.csproj
  3. 1 2
      src/Avalonia.Base/Avalonia.Base.csproj
  4. 1 0
      src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
  5. 1 2
      src/Avalonia.Controls/Avalonia.Controls.csproj
  6. 2 0
      src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
  7. 4 0
      src/Avalonia.Desktop/Avalonia.Desktop.csproj
  8. 1 0
      src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj
  9. 2 0
      src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
  10. 2 0
      src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
  11. 1 0
      src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
  12. 2 0
      src/Avalonia.Headless/Avalonia.Headless.csproj
  13. 1 0
      src/Avalonia.Input/Avalonia.Input.csproj
  14. 1 0
      src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
  15. 1 0
      src/Avalonia.Layout/Avalonia.Layout.csproj
  16. 1 0
      src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
  17. 1 0
      src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
  18. 1 0
      src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
  19. 1 0
      src/Avalonia.Styling/Avalonia.Styling.csproj
  20. 1 0
      src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
  21. 1 0
      src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
  22. 1 0
      src/Avalonia.Visuals/Avalonia.Visuals.csproj
  23. 2 1
      src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
  24. 1 0
      src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
  25. 1 0
      src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
  26. 1 0
      src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
  27. 1 0
      src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
  28. 1 0
      src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

+ 2 - 1
build/ApiDiff.props

@@ -1,10 +1,11 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ApiContractPackageVersion>0.10.0-preview1</ApiContractPackageVersion>
+    <PackageId Condition="'$(PackageId)' == ''">Avalonia</PackageId>
   </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" />
+      <ResolvedMatchingContract Include="$(NuGetPackageRoot)\$(PackageId)\$(ApiContractPackageVersion)\lib\netstandard2.0\$(AssemblyName).dll" />
     </ItemGroup>
 </Project>

+ 2 - 1
src/Avalonia.Animation/Avalonia.Animation.csproj

@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>    
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

+ 1 - 2
src/Avalonia.Base/Avalonia.Base.csproj

@@ -3,8 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Avalonia.Base</AssemblyName>
     <RootNamespace>Avalonia</RootNamespace>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <NugetPackageName>Avalonia</NugetPackageName>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>    
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"/>

+ 1 - 0
src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj

@@ -22,4 +22,5 @@
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

+ 1 - 2
src/Avalonia.Controls/Avalonia.Controls.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <NugetPackageName>Avalonia</NugetPackageName>
+    <TargetFramework>netstandard2.0</TargetFramework>    
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />

+ 2 - 0
src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj

@@ -9,6 +9,7 @@
     <Version>0.7.0</Version>
     <NoWarn>CS1591</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NugetPackageName>Avalonia</NugetPackageName>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Remote\HtmlTransport\webapp\build\**\*.gz" />
@@ -26,4 +27,5 @@
     <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

+ 4 - 0
src/Avalonia.Desktop/Avalonia.Desktop.csproj

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

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

@@ -17,4 +17,5 @@
   <Import Project="..\..\build\NetCore.props" />
   <Import Project="..\..\build\NetFX.props" />
   <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

+ 2 - 0
src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Avalonia</RootNamespace>
+    <PackageId>Avalonia.Diagnostics</PackageId>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
@@ -28,4 +29,5 @@
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

+ 2 - 0
src/Avalonia.Dialogs/Avalonia.Dialogs.csproj

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

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

@@ -12,4 +12,5 @@
     <PackageReference Include="Tmds.DBus" Version="0.7.0" />
   </ItemGroup>
 
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

+ 2 - 0
src/Avalonia.Headless/Avalonia.Headless.csproj

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

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

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

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

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

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

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

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

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

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

@@ -8,4 +8,5 @@
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

+ 1 - 0
src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj

@@ -8,4 +8,5 @@
   <ItemGroup>
     <Compile Include="..\Avalonia.Input\Key.cs" />
   </ItemGroup>
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

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

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

+ 1 - 0
src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj

@@ -19,4 +19,5 @@
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

+ 1 - 0
src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj

@@ -17,4 +17,5 @@
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>

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

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

+ 2 - 1
src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj

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

+ 1 - 0
src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj

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

+ 1 - 0
src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj

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

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

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

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

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

+ 1 - 0
src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

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