From 2514f625ecda6669312173b4bc776014be46e683 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 16:44:31 -0300 Subject: [PATCH 01/25] begin adding api diff. --- NuGet.Config | 2 ++ src/Avalonia.Base/Avalonia.Base.csproj | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/NuGet.Config b/NuGet.Config index 2a1e0af74d4..3abd236d420 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,7 +1,9 @@  + + diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index cbcf7a7386d..69afc8b304b 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -13,4 +13,12 @@ + + + + + + + + From 54989145320a33e0075ed8f507650bde414f6759 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 17:01:49 -0300 Subject: [PATCH 02/25] api diff on all projects. --- build/Base.props | 2 ++ src/Avalonia.Base/Avalonia.Base.csproj | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build/Base.props b/build/Base.props index 100c9088cdf..0957c058922 100644 --- a/build/Base.props +++ b/build/Base.props @@ -2,5 +2,7 @@ + + diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 69afc8b304b..cbcf7a7386d 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -13,12 +13,4 @@ - - - - - - - - From ffb4d5303a694173be7fd27d885435f769a0642b Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 17:11:33 -0300 Subject: [PATCH 03/25] add api diff for avalonia.base --- Avalonia.sln | 1 + build/ApiDiff.props | 7 +++++++ build/Base.props | 2 -- src/Avalonia.Base/Avalonia.Base.csproj | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 build/ApiDiff.props diff --git a/Avalonia.sln b/Avalonia.sln index ccaa41f552b..ffd7b4d4f45 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -150,6 +150,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1 build\System.Memory.props = build\System.Memory.props build\UnitTests.NetFX.props = build\UnitTests.NetFX.props build\XUnit.props = build\XUnit.props + build\ApiDiff.props = build\ApiDiff.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6FAF79-58B4-482F-9122-0668C346364C}" diff --git a/build/ApiDiff.props b/build/ApiDiff.props new file mode 100644 index 00000000000..651021f456f --- /dev/null +++ b/build/ApiDiff.props @@ -0,0 +1,7 @@ + + + + + + + diff --git a/build/Base.props b/build/Base.props index 0957c058922..100c9088cdf 100644 --- a/build/Base.props +++ b/build/Base.props @@ -2,7 +2,5 @@ - - diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index cbcf7a7386d..d368edbe2bb 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -13,4 +13,5 @@ + From 3b79d92b4bae43ee924a26bc71897b71048b28bd Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 17:24:37 -0300 Subject: [PATCH 04/25] 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 651021f456f..e5ae761c7fa 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -1,7 +1,10 @@  - - - - - + + 0.10.0-preview1 + + + + + + diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index d368edbe2bb..0528e7e62c9 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -4,6 +4,7 @@ Avalonia.Base Avalonia True + Avalonia diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index 32331d29aba..e3933113d45 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -1,6 +1,7 @@  netstandard2.0 + Avalonia @@ -14,4 +15,5 @@ + From 26d68e99583848a5a22c813069632306260ec6ab Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 17:58:41 -0300 Subject: [PATCH 05/25] add api diff to most projects. --- build/ApiDiff.props | 3 ++- src/Avalonia.Animation/Avalonia.Animation.csproj | 3 ++- src/Avalonia.Base/Avalonia.Base.csproj | 3 +-- .../Avalonia.Controls.DataGrid.csproj | 1 + src/Avalonia.Controls/Avalonia.Controls.csproj | 3 +-- src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj | 2 ++ src/Avalonia.Desktop/Avalonia.Desktop.csproj | 4 ++++ src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj | 1 + src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj | 2 ++ src/Avalonia.Dialogs/Avalonia.Dialogs.csproj | 2 ++ src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj | 1 + src/Avalonia.Headless/Avalonia.Headless.csproj | 2 ++ src/Avalonia.Input/Avalonia.Input.csproj | 1 + src/Avalonia.Interactivity/Avalonia.Interactivity.csproj | 1 + src/Avalonia.Layout/Avalonia.Layout.csproj | 1 + src/Avalonia.OpenGL/Avalonia.OpenGL.csproj | 1 + src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj | 1 + src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj | 1 + src/Avalonia.Styling/Avalonia.Styling.csproj | 1 + src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj | 1 + src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj | 1 + src/Avalonia.Visuals/Avalonia.Visuals.csproj | 1 + .../Avalonia.LinuxFramebuffer.csproj | 3 ++- .../Avalonia.Markup.Xaml.Loader.csproj | 1 + src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj | 1 + src/Markup/Avalonia.Markup/Avalonia.Markup.csproj | 1 + src/Skia/Avalonia.Skia/Avalonia.Skia.csproj | 1 + src/Windows/Avalonia.Win32/Avalonia.Win32.csproj | 1 + 28 files changed, 38 insertions(+), 7 deletions(-) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index e5ae761c7fa..88143d741b9 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -1,10 +1,11 @@  0.10.0-preview1 + Avalonia - + diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj index 73c619942ef..ee91acf45e7 100644 --- a/src/Avalonia.Animation/Avalonia.Animation.csproj +++ b/src/Avalonia.Animation/Avalonia.Animation.csproj @@ -1,9 +1,10 @@  - netstandard2.0 + netstandard2.0 + diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 0528e7e62c9..9bfd387ca97 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -3,8 +3,7 @@ netstandard2.0 Avalonia.Base Avalonia - True - Avalonia + True diff --git a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj index 27853a15408..6975642db20 100644 --- a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj +++ b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj @@ -22,4 +22,5 @@ + diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index e3933113d45..480dcfcb857 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -1,7 +1,6 @@  - netstandard2.0 - Avalonia + netstandard2.0 diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index 76ea8a3445b..35bd0f97e13 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -9,6 +9,7 @@ 0.7.0 CS1591 true + Avalonia @@ -26,4 +27,5 @@ + diff --git a/src/Avalonia.Desktop/Avalonia.Desktop.csproj b/src/Avalonia.Desktop/Avalonia.Desktop.csproj index 72b7b5c1e7a..c967268bee4 100644 --- a/src/Avalonia.Desktop/Avalonia.Desktop.csproj +++ b/src/Avalonia.Desktop/Avalonia.Desktop.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj b/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj index c0e46416c16..805aae2d1ab 100644 --- a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj +++ b/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj @@ -17,4 +17,5 @@ + diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index 5f49a46839d..db8684747d5 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -2,6 +2,7 @@ netstandard2.0 Avalonia + Avalonia.Diagnostics @@ -28,4 +29,5 @@ + diff --git a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj index f54ddf32bec..dd476e2559c 100644 --- a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj +++ b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj @@ -15,4 +15,6 @@ + + diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj index d9fd3b78a2b..6c2a84af2d0 100644 --- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj +++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj @@ -12,4 +12,5 @@ + diff --git a/src/Avalonia.Headless/Avalonia.Headless.csproj b/src/Avalonia.Headless/Avalonia.Headless.csproj index b871316a2c1..da28c17113f 100644 --- a/src/Avalonia.Headless/Avalonia.Headless.csproj +++ b/src/Avalonia.Headless/Avalonia.Headless.csproj @@ -5,4 +5,6 @@ + + diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index ea560ce2eaa..2204778afe9 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -10,4 +10,5 @@ + diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 730ca2bd6e8..2da23410d66 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -11,4 +11,5 @@ + \ No newline at end of file diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 410a0791b1a..076ec56cd65 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -8,4 +8,5 @@ + diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj index 72132eed930..2e23f24deb3 100644 --- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj +++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj @@ -11,4 +11,5 @@ + diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj index 64145b9c3c7..d01a4951081 100644 --- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj +++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj @@ -8,4 +8,5 @@ + diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj index 6684772bfee..bc7217aa5c4 100644 --- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj +++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj @@ -8,4 +8,5 @@ + \ No newline at end of file diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index b4f6c2c942f..d9f0cef3dad 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -8,4 +8,5 @@ + diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index c44cc358e81..153e21761e0 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -19,4 +19,5 @@ + diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj index c2a1359e8a2..72f1fbf9730 100644 --- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj +++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj @@ -17,4 +17,5 @@ + diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index 576200a996c..802a120e036 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -14,4 +14,5 @@ + diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj index 48095a4c25b..48cccc56db2 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj +++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj @@ -7,5 +7,6 @@ - + + diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj index 768545eb7e7..24860e41949 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj @@ -11,4 +11,5 @@ + diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 24428253aa0..7ee3eafb8ca 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -64,4 +64,5 @@ + diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index aca39dd8b06..90d29d0ae1d 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -16,4 +16,5 @@ + diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj index d5ad70b9440..1a4284e70ac 100644 --- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj +++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj @@ -17,4 +17,5 @@ + diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj index 49700710e97..bb8bcf2e2ab 100644 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj +++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj @@ -9,4 +9,5 @@ + From 4e5662cb6d5dd5fa962d0b0cb0f10366d036308a Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:08:02 -0300 Subject: [PATCH 06/25] fix builds --- build/ApiDiff.props | 5 +++-- src/Avalonia.Desktop/Avalonia.Desktop.csproj | 6 ++---- .../Avalonia.LinuxFramebuffer.csproj | 2 +- .../Avalonia.Markup.Xaml.Loader.csproj | 2 +- src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj | 2 +- src/Markup/Avalonia.Markup/Avalonia.Markup.csproj | 2 +- src/Skia/Avalonia.Skia/Avalonia.Skia.csproj | 2 +- src/Windows/Avalonia.Win32/Avalonia.Win32.csproj | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index 88143d741b9..57d2a50969d 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -1,11 +1,12 @@  0.10.0-preview1 - Avalonia + $(PackageId) + Avalonia - + diff --git a/src/Avalonia.Desktop/Avalonia.Desktop.csproj b/src/Avalonia.Desktop/Avalonia.Desktop.csproj index c967268bee4..a9589b7f2ba 100644 --- a/src/Avalonia.Desktop/Avalonia.Desktop.csproj +++ b/src/Avalonia.Desktop/Avalonia.Desktop.csproj @@ -11,8 +11,6 @@ - - - - + + diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj index 48cccc56db2..22599200bc4 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj +++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj @@ -8,5 +8,5 @@ - + diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj index 24860e41949..b8065975f7e 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj @@ -11,5 +11,5 @@ - + diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 7ee3eafb8ca..44a082e2df1 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -64,5 +64,5 @@ - + diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index 90d29d0ae1d..89e2c096eef 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -16,5 +16,5 @@ - + diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj index 1a4284e70ac..ef955eb8be4 100644 --- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj +++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj @@ -17,5 +17,5 @@ - + diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj index bb8bcf2e2ab..bcbdde322cb 100644 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj +++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj @@ -9,5 +9,5 @@ - + From c859e8b9cc9e349e262bd52314e236072ed8f219 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:13:26 -0300 Subject: [PATCH 07/25] add baselines. --- .../ApiCompatBaseline.txt | 1 + src/Avalonia.Controls/ApiCompatBaseline.txt | 20 +++++++++++++++++++ .../ApiCompatBaseline.txt | 1 + src/Avalonia.Desktop/ApiCompatBaseline.txt | 1 + .../ApiCompatBaseline.txt | 1 + src/Avalonia.Dialogs/ApiCompatBaseline.txt | 1 + src/Avalonia.ReactiveUI/ApiCompatBaseline.txt | 1 + .../ApiCompatBaseline.txt | 1 + .../ApiCompatBaseline.txt | 1 + .../Avalonia.Markup.Xaml.Loader.csproj | 3 +-- .../ApiCompatBaseline.txt | 15 ++++++++++++++ src/Skia/Avalonia.Skia/ApiCompatBaseline.txt | 1 + .../Avalonia.Win32/ApiCompatBaseline.txt | 3 +++ 13 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Controls/ApiCompatBaseline.txt create mode 100644 src/Avalonia.DesignerSupport/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Desktop/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Diagnostics/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Dialogs/ApiCompatBaseline.txt create mode 100644 src/Avalonia.ReactiveUI/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Themes.Default/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt create mode 100644 src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt create mode 100644 src/Skia/Avalonia.Skia/ApiCompatBaseline.txt create mode 100644 src/Windows/Avalonia.Win32/ApiCompatBaseline.txt diff --git a/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt b/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt new file mode 100644 index 00000000000..bda399801a9 --- /dev/null +++ b/src/Avalonia.Controls/ApiCompatBaseline.txt @@ -0,0 +1,20 @@ +Compat issues with assembly Avalonia.Controls: +MembersMustExist : Member 'public Avalonia.Controls.TextBlock Avalonia.Controls.TextBlock Avalonia.Controls.TimePicker._periodText' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void Avalonia.Controls.Chrome.TitleBar..ctor(Avalonia.Controls.Window)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void Avalonia.Controls.Chrome.TitleBar.Attach()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void Avalonia.Controls.Chrome.TitleBar.Detach()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Double Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Scaling.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Scaling.set(System.Double)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public Avalonia.Controls.Primitives.ChromeOverlayLayer Avalonia.Controls.Primitives.ChromeOverlayLayer.GetOverlayLayer(Avalonia.VisualTree.IVisual)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Boolean Avalonia.Controls.Templates.FuncDataTemplate.SupportsRecycling.get()' does not exist in the implementation but it does exist in the contract. +InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.Templates.IDataTemplate.SupportsRecycling' is present in the contract but not in the implementation. +InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.Templates.IDataTemplate.SupportsRecycling.get()' is present in the contract but not in the implementation. +MembersMustExist : Member 'public System.Boolean Avalonia.Controls.Templates.IDataTemplate.SupportsRecycling.get()' does not exist in the implementation but it does exist in the contract. +InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.ITopLevelImpl.RenderScaling' is present in the implementation but not in the contract. +InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.ITopLevelImpl.Scaling' is present in the contract but not in the implementation. +InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.ITopLevelImpl.RenderScaling.get()' is present in the implementation but not in the contract. +InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.ITopLevelImpl.Scaling.get()' is present in the contract but not in the implementation. +MembersMustExist : Member 'public System.Double Avalonia.Platform.ITopLevelImpl.Scaling.get()' does not exist in the implementation but it does exist in the contract. +InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.IWindowBaseImpl.DesktopScaling' is present in the implementation but not in the contract. +InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.IWindowBaseImpl.DesktopScaling.get()' is present in the implementation but not in the contract. +Total Issues: 18 diff --git a/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt b/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Desktop/ApiCompatBaseline.txt b/src/Avalonia.Desktop/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Desktop/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Diagnostics/ApiCompatBaseline.txt b/src/Avalonia.Diagnostics/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Diagnostics/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Dialogs/ApiCompatBaseline.txt b/src/Avalonia.Dialogs/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Dialogs/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.ReactiveUI/ApiCompatBaseline.txt b/src/Avalonia.ReactiveUI/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.ReactiveUI/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Themes.Default/ApiCompatBaseline.txt b/src/Avalonia.Themes.Default/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Themes.Default/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj index b8065975f7e..d2b9a372bed 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj @@ -10,6 +10,5 @@ - - + diff --git a/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt b/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt new file mode 100644 index 00000000000..ba4a7b7f6a5 --- /dev/null +++ b/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt @@ -0,0 +1,15 @@ +Compat issues with assembly Avalonia.Markup.Xaml: +CannotMakeTypeAbstract : Type 'Avalonia.Markup.Xaml.AvaloniaXamlLoader' is abstract in the implementation but is not abstract in the contract. +CannotSealType : Type 'Avalonia.Markup.Xaml.AvaloniaXamlLoader' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract. +MembersMustExist : Member 'public void Avalonia.Markup.Xaml.AvaloniaXamlLoader..ctor()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Boolean Avalonia.Markup.Xaml.AvaloniaXamlLoader.IsDesignMode.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void Avalonia.Markup.Xaml.AvaloniaXamlLoader.IsDesignMode.set(System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Object Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(System.IO.Stream, System.Reflection.Assembly, System.Object, System.Uri)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Object Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(System.String, System.Reflection.Assembly, System.Object)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Object Avalonia.Markup.Xaml.AvaloniaXamlLoader.Parse(System.String, System.Reflection.Assembly)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public T Avalonia.Markup.Xaml.AvaloniaXamlLoader.Parse(System.String, System.Reflection.Assembly)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Boolean Avalonia.Markup.Xaml.Templates.DataTemplate.SupportsRecycling.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void Avalonia.Markup.Xaml.Templates.DataTemplate.SupportsRecycling.set(System.Boolean)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Boolean Avalonia.Markup.Xaml.Templates.TreeDataTemplate.SupportsRecycling.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void Avalonia.Markup.Xaml.Templates.TreeDataTemplate.SupportsRecycling.set(System.Boolean)' does not exist in the implementation but it does exist in the contract. +Total Issues: 13 diff --git a/src/Skia/Avalonia.Skia/ApiCompatBaseline.txt b/src/Skia/Avalonia.Skia/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Skia/Avalonia.Skia/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Windows/Avalonia.Win32/ApiCompatBaseline.txt b/src/Windows/Avalonia.Win32/ApiCompatBaseline.txt new file mode 100644 index 00000000000..1665a04a687 --- /dev/null +++ b/src/Windows/Avalonia.Win32/ApiCompatBaseline.txt @@ -0,0 +1,3 @@ +Compat issues with assembly Avalonia.Win32: +MembersMustExist : Member 'public System.Double Avalonia.Win32.WindowImpl.Scaling.get()' does not exist in the implementation but it does exist in the contract. +Total Issues: 1 From c4f1ed0ccf73c83de976bde6fe4a42bcccfde8e1 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:20:51 -0300 Subject: [PATCH 08/25] fix diff build. --- build/ApiDiff.props | 5 ++++- src/Avalonia.Base/ApiCompatBaseline.txt | 3 +++ .../Avalonia.Markup.Xaml.Loader.csproj | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/Avalonia.Base/ApiCompatBaseline.txt diff --git a/build/ApiDiff.props b/build/ApiDiff.props index 57d2a50969d..1d29ba71c53 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -6,7 +6,10 @@ + + + - + diff --git a/src/Avalonia.Base/ApiCompatBaseline.txt b/src/Avalonia.Base/ApiCompatBaseline.txt new file mode 100644 index 00000000000..83eb49d21ae --- /dev/null +++ b/src/Avalonia.Base/ApiCompatBaseline.txt @@ -0,0 +1,3 @@ +Compat issues with assembly Avalonia.Base: +MembersMustExist : Member 'public void Avalonia.Threading.AvaloniaSynchronizationContext..ctor()' does not exist in the implementation but it does exist in the contract. +Total Issues: 1 diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj index d2b9a372bed..514556d0b93 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj @@ -3,6 +3,7 @@ netstandard2.0 true + Avalonia.Markup.Xaml.Loader From 77b47f6c8a0b795fa24e4d972225f6aa84d4169a Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:32:43 -0300 Subject: [PATCH 09/25] fix linux build --- build/ApiDiff.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index 1d29ba71c53..9ff5bcd90ed 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -10,6 +10,6 @@ - + From d76047e7bba778c35d3f99c901bfc6bc2996aed1 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:32:56 -0300 Subject: [PATCH 10/25] dont diff implementations / backends. --- src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj | 6 ++---- src/Avalonia.Headless/Avalonia.Headless.csproj | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj index 6c2a84af2d0..260d7350d25 100644 --- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj +++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.0 @@ -10,7 +10,5 @@ - - - + diff --git a/src/Avalonia.Headless/Avalonia.Headless.csproj b/src/Avalonia.Headless/Avalonia.Headless.csproj index da28c17113f..ac591b68a81 100644 --- a/src/Avalonia.Headless/Avalonia.Headless.csproj +++ b/src/Avalonia.Headless/Avalonia.Headless.csproj @@ -1,10 +1,9 @@  netstandard2.0 + - - - + From 462c08199bcfb3e33beeb2f47f9a7ddc8a35ec8b Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:33:11 -0300 Subject: [PATCH 11/25] api compat baseline for visuals. --- src/Avalonia.Visuals/ApiCompatBaseline.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/Avalonia.Visuals/ApiCompatBaseline.txt diff --git a/src/Avalonia.Visuals/ApiCompatBaseline.txt b/src/Avalonia.Visuals/ApiCompatBaseline.txt new file mode 100644 index 00000000000..2822c0f36eb --- /dev/null +++ b/src/Avalonia.Visuals/ApiCompatBaseline.txt @@ -0,0 +1,12 @@ +Compat issues with assembly Avalonia.Visuals: +EnumValuesMustMatch : Enum value 'Avalonia.Media.TextWrapping Avalonia.Media.TextWrapping.NoWrap' is (System.Int32)0 in the implementation but (System.Int32)1 in the contract. +EnumValuesMustMatch : Enum value 'Avalonia.Media.TextWrapping Avalonia.Media.TextWrapping.Wrap' is (System.Int32)1 in the implementation but (System.Int32)2 in the contract. +EnumValuesMustMatch : Enum value 'Avalonia.Media.TextWrapping Avalonia.Media.TextWrapping.WrapWithOverflow' is (System.Int32)2 in the implementation but (System.Int32)0 in the contract. +MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.GenericTextParagraphProperties..ctor(Avalonia.Media.TextFormatting.TextRunProperties, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Media.TextTrimming, System.Double)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public Avalonia.Media.TextTrimming Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextTrimming.get()' does not exist in the implementation but it does exist in the contract. +CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextLine.HasCollapsed' is abstract in the implementation but is missing in the contract. +CannotAddAbstractMembers : Member 'public Avalonia.Media.TextFormatting.TextLine Avalonia.Media.TextFormatting.TextLine.Collapse(Avalonia.Media.TextFormatting.TextCollapsingProperties[])' is abstract in the implementation but is missing in the contract. +CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextLine.HasCollapsed.get()' is abstract in the implementation but is missing in the contract. +MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLineMetrics..ctor(Avalonia.Size, System.Double, Avalonia.Media.TextFormatting.TextRange)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public Avalonia.Media.TextTrimming Avalonia.Media.TextFormatting.TextParagraphProperties.TextTrimming.get()' does not exist in the implementation but it does exist in the contract. +Total Issues: 10 From 2892dcf8d1ea60b11c1f10a708cc7635ee35d1b3 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:38:10 -0300 Subject: [PATCH 12/25] use targetframework var. --- build/ApiDiff.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index 9ff5bcd90ed..457adf6d490 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -10,6 +10,6 @@ - + From e75d17f4018c156bff60c2d2a38a6839d44bfb34 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:38:21 -0300 Subject: [PATCH 13/25] fix diff of Avalonia.Remote.Protocol. --- src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj index bc7217aa5c4..6c241bbc75f 100644 --- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj +++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj @@ -4,6 +4,7 @@ AVALONIA_REMOTE_PROTOCOL;$(DefineConstants) true Key.snk + Avalonia.Remote.Protocol From b5790582f9073065e7a8366d9c1f8c72a349dad7 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:41:05 -0300 Subject: [PATCH 14/25] download more packages for diffs. --- build/ApiDiff.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index 457adf6d490..d2b1cbb688d 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -8,7 +8,8 @@ - + + From 53b779937cb91e076f432f9fef6f7fb9efca52eb Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:46:10 -0300 Subject: [PATCH 15/25] download datagrid for apidiff. --- build/ApiDiff.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index d2b1cbb688d..dadb7786cd0 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -10,6 +10,7 @@ + From d480e9345f0ab387553d22d6cb9cf763d48d12c5 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:54:14 -0300 Subject: [PATCH 16/25] download avalonia.diagnostics for api diff. --- build/ApiDiff.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index dadb7786cd0..c1792761e4b 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -10,7 +10,8 @@ - + + From 84c217faaf348f4c6a41ad0a0fcc7ce0b839d322 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 18:59:41 -0300 Subject: [PATCH 17/25] pre-download avalonia.reactiveui for api diff. --- build/ApiDiff.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index c1792761e4b..bcb504b2397 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -12,6 +12,7 @@ + From 793fa0decdd1d58bbee88fdc04bdb54579c0a3ba Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Jul 2020 19:05:22 -0300 Subject: [PATCH 18/25] pre-download avalonia.win32 for diff. --- build/ApiDiff.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index bcb504b2397..8d2fe4a50f4 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -13,6 +13,7 @@ + From 841a33ba027209b30a8f79f54f71825fe3a1ace3 Mon Sep 17 00:00:00 2001 From: danwalmsley Date: Wed, 22 Jul 2020 19:39:33 -0300 Subject: [PATCH 19/25] package download with variable. Co-authored-by: Jeremy Koritzinsky --- build/ApiDiff.props | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index 8d2fe4a50f4..c1c80e39cca 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -5,15 +5,7 @@ Avalonia - - - - - - - - - + From fd817c06b0b571fe9df1c5baa185dc841af34058 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 23 Jul 2020 12:23:51 -0300 Subject: [PATCH 20/25] add baselines. --- src/Avalonia.Animation/ApiCompatBaseline.txt | 1 + src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt | 1 + src/Avalonia.Input/ApiCompatBaseline.txt | 1 + src/Avalonia.Interactivity/ApiCompatBaseline.txt | 1 + src/Avalonia.Layout/ApiCompatBaseline.txt | 1 + src/Avalonia.OpenGL/ApiCompatBaseline.txt | 1 + src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt | 1 + src/Avalonia.Styling/ApiCompatBaseline.txt | 1 + src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt | 1 + src/Markup/Avalonia.Markup/ApiCompatBaseline.txt | 1 + 10 files changed, 10 insertions(+) create mode 100644 src/Avalonia.Animation/ApiCompatBaseline.txt create mode 100644 src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Input/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Interactivity/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Layout/ApiCompatBaseline.txt create mode 100644 src/Avalonia.OpenGL/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Styling/ApiCompatBaseline.txt create mode 100644 src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt create mode 100644 src/Markup/Avalonia.Markup/ApiCompatBaseline.txt diff --git a/src/Avalonia.Animation/ApiCompatBaseline.txt b/src/Avalonia.Animation/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Animation/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt b/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Input/ApiCompatBaseline.txt b/src/Avalonia.Input/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Input/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Interactivity/ApiCompatBaseline.txt b/src/Avalonia.Interactivity/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Interactivity/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Layout/ApiCompatBaseline.txt b/src/Avalonia.Layout/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Layout/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.OpenGL/ApiCompatBaseline.txt b/src/Avalonia.OpenGL/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.OpenGL/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Styling/ApiCompatBaseline.txt b/src/Avalonia.Styling/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Styling/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt b/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 From 7b3329c9e2acffb197a20f6fd7c2944225faf1b5 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 23 Jul 2020 12:04:00 -0300 Subject: [PATCH 21/25] add api attributes. --- src/Avalonia.Base/Metadata/InternalApiAttribute.cs | 9 +++++++++ src/Avalonia.Base/Metadata/PrivateApiAttribute.cs | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 src/Avalonia.Base/Metadata/InternalApiAttribute.cs create mode 100644 src/Avalonia.Base/Metadata/PrivateApiAttribute.cs diff --git a/src/Avalonia.Base/Metadata/InternalApiAttribute.cs b/src/Avalonia.Base/Metadata/InternalApiAttribute.cs new file mode 100644 index 00000000000..9f5c5977991 --- /dev/null +++ b/src/Avalonia.Base/Metadata/InternalApiAttribute.cs @@ -0,0 +1,9 @@ +using System; + +namespace Avalonia.Metadata +{ + public class InternalApiAttribute : Attribute + { + + } +} diff --git a/src/Avalonia.Base/Metadata/PrivateApiAttribute.cs b/src/Avalonia.Base/Metadata/PrivateApiAttribute.cs new file mode 100644 index 00000000000..9deecde8d72 --- /dev/null +++ b/src/Avalonia.Base/Metadata/PrivateApiAttribute.cs @@ -0,0 +1,9 @@ +using System; + +namespace Avalonia.Metadata +{ + public class PrivateApiAttribute : Attribute + { + + } +} From c1e8aa993b96d77b87eb0022dff6e9462196368f Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 23 Jul 2020 12:36:57 -0300 Subject: [PATCH 22/25] upgrade apicompat. --- build/ApiDiff.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ApiDiff.props b/build/ApiDiff.props index c1c80e39cca..2fa269fdcbc 100644 --- a/build/ApiDiff.props +++ b/build/ApiDiff.props @@ -6,7 +6,7 @@ - + From 451ee7c0b7885f85274c12d87e4f457671d59613 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 23 Jul 2020 12:37:08 -0300 Subject: [PATCH 23/25] Revert "add baselines." This reverts commit fd817c06b0b571fe9df1c5baa185dc841af34058. --- src/Avalonia.Animation/ApiCompatBaseline.txt | 1 - src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt | 1 - src/Avalonia.Input/ApiCompatBaseline.txt | 1 - src/Avalonia.Interactivity/ApiCompatBaseline.txt | 1 - src/Avalonia.Layout/ApiCompatBaseline.txt | 1 - src/Avalonia.OpenGL/ApiCompatBaseline.txt | 1 - src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt | 1 - src/Avalonia.Styling/ApiCompatBaseline.txt | 1 - src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt | 1 - src/Markup/Avalonia.Markup/ApiCompatBaseline.txt | 1 - 10 files changed, 10 deletions(-) delete mode 100644 src/Avalonia.Animation/ApiCompatBaseline.txt delete mode 100644 src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt delete mode 100644 src/Avalonia.Input/ApiCompatBaseline.txt delete mode 100644 src/Avalonia.Interactivity/ApiCompatBaseline.txt delete mode 100644 src/Avalonia.Layout/ApiCompatBaseline.txt delete mode 100644 src/Avalonia.OpenGL/ApiCompatBaseline.txt delete mode 100644 src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt delete mode 100644 src/Avalonia.Styling/ApiCompatBaseline.txt delete mode 100644 src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt delete mode 100644 src/Markup/Avalonia.Markup/ApiCompatBaseline.txt diff --git a/src/Avalonia.Animation/ApiCompatBaseline.txt b/src/Avalonia.Animation/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Avalonia.Animation/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt b/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Avalonia.Input/ApiCompatBaseline.txt b/src/Avalonia.Input/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Avalonia.Input/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Avalonia.Interactivity/ApiCompatBaseline.txt b/src/Avalonia.Interactivity/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Avalonia.Interactivity/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Avalonia.Layout/ApiCompatBaseline.txt b/src/Avalonia.Layout/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Avalonia.Layout/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Avalonia.OpenGL/ApiCompatBaseline.txt b/src/Avalonia.OpenGL/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Avalonia.OpenGL/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Avalonia.Styling/ApiCompatBaseline.txt b/src/Avalonia.Styling/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Avalonia.Styling/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt b/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 diff --git a/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt deleted file mode 100644 index fcc74cf8643..00000000000 --- a/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt +++ /dev/null @@ -1 +0,0 @@ -Total Issues: 0 From 7d92a5183ea89d778e7c9e9c1850d9adf6a2dbc3 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 23 Jul 2020 12:38:25 -0300 Subject: [PATCH 24/25] add baselines. --- src/Avalonia.Animation/ApiCompatBaseline.txt | 1 + src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt | 1 + src/Avalonia.Input/ApiCompatBaseline.txt | 1 + src/Avalonia.Interactivity/ApiCompatBaseline.txt | 1 + src/Avalonia.Layout/ApiCompatBaseline.txt | 1 + src/Avalonia.OpenGL/ApiCompatBaseline.txt | 1 + src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt | 1 + src/Avalonia.Styling/ApiCompatBaseline.txt | 1 + src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt | 1 + src/Markup/Avalonia.Markup/ApiCompatBaseline.txt | 1 + 10 files changed, 10 insertions(+) create mode 100644 src/Avalonia.Animation/ApiCompatBaseline.txt create mode 100644 src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Input/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Interactivity/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Layout/ApiCompatBaseline.txt create mode 100644 src/Avalonia.OpenGL/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt create mode 100644 src/Avalonia.Styling/ApiCompatBaseline.txt create mode 100644 src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt create mode 100644 src/Markup/Avalonia.Markup/ApiCompatBaseline.txt diff --git a/src/Avalonia.Animation/ApiCompatBaseline.txt b/src/Avalonia.Animation/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Animation/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt b/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.DesktopRuntime/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Input/ApiCompatBaseline.txt b/src/Avalonia.Input/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Input/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Interactivity/ApiCompatBaseline.txt b/src/Avalonia.Interactivity/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Interactivity/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Layout/ApiCompatBaseline.txt b/src/Avalonia.Layout/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Layout/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.OpenGL/ApiCompatBaseline.txt b/src/Avalonia.OpenGL/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.OpenGL/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Avalonia.Styling/ApiCompatBaseline.txt b/src/Avalonia.Styling/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Avalonia.Styling/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt b/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Linux/Avalonia.LinuxFramebuffer/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 diff --git a/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt new file mode 100644 index 00000000000..fcc74cf8643 --- /dev/null +++ b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt @@ -0,0 +1 @@ +Total Issues: 0 From 3826b2fdc4890e2a730ae5c7e078ab1d3c0f2f33 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 23 Jul 2020 12:39:34 -0300 Subject: [PATCH 25/25] Revert "add api attributes." This reverts commit 7b3329c9e2acffb197a20f6fd7c2944225faf1b5. --- src/Avalonia.Base/Metadata/InternalApiAttribute.cs | 9 --------- src/Avalonia.Base/Metadata/PrivateApiAttribute.cs | 9 --------- 2 files changed, 18 deletions(-) delete mode 100644 src/Avalonia.Base/Metadata/InternalApiAttribute.cs delete mode 100644 src/Avalonia.Base/Metadata/PrivateApiAttribute.cs diff --git a/src/Avalonia.Base/Metadata/InternalApiAttribute.cs b/src/Avalonia.Base/Metadata/InternalApiAttribute.cs deleted file mode 100644 index 9f5c5977991..00000000000 --- a/src/Avalonia.Base/Metadata/InternalApiAttribute.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace Avalonia.Metadata -{ - public class InternalApiAttribute : Attribute - { - - } -} diff --git a/src/Avalonia.Base/Metadata/PrivateApiAttribute.cs b/src/Avalonia.Base/Metadata/PrivateApiAttribute.cs deleted file mode 100644 index 9deecde8d72..00000000000 --- a/src/Avalonia.Base/Metadata/PrivateApiAttribute.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace Avalonia.Metadata -{ - public class PrivateApiAttribute : Attribute - { - - } -}