From b34f8321e7be03d00187e0746318abfe19e520da Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 17:39:09 +0100 Subject: [PATCH 01/10] implement msbuild property to give access to internal apis. --- packages/Avalonia/Avalonia.targets | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/Avalonia/Avalonia.targets b/packages/Avalonia/Avalonia.targets index 50306f2cdc..0961c82b5c 100644 --- a/packages/Avalonia/Avalonia.targets +++ b/packages/Avalonia/Avalonia.targets @@ -1,3 +1,19 @@ + + + + + + + + + + + + + + + + From a87cd48ae1aaf0b1a7e8c990d5a4a8b68ebfdf5a Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 17:45:02 +0100 Subject: [PATCH 02/10] use our own targets file for private apis. --- packages/Avalonia/Avalonia.targets | 17 +-------------- packages/Avalonia/AvaloniaPrivateApis.targets | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 packages/Avalonia/AvaloniaPrivateApis.targets diff --git a/packages/Avalonia/Avalonia.targets b/packages/Avalonia/Avalonia.targets index 0961c82b5c..eacd287b59 100644 --- a/packages/Avalonia/Avalonia.targets +++ b/packages/Avalonia/Avalonia.targets @@ -1,19 +1,4 @@ - - - - - - - - - - - - - - - - + diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets new file mode 100644 index 0000000000..fdf60a24e5 --- /dev/null +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -0,0 +1,21 @@ + + + net6.0 + netstandard2.0 + + + + + + + + + + + + + + + + + From a9e6f335c763f53565d5dcdfdd7a80c5de544b36 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 17:49:45 +0100 Subject: [PATCH 03/10] add a warning. --- packages/Avalonia/AvaloniaPrivateApis.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets index fdf60a24e5..8d44c7bbbf 100644 --- a/packages/Avalonia/AvaloniaPrivateApis.targets +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -17,5 +17,6 @@ + From c8676f275b38d3bd44389cf59f9fc907d57beb88 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 18:31:35 +0100 Subject: [PATCH 04/10] fix targets file. --- packages/Avalonia/AvaloniaPrivateApis.targets | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets index 8d44c7bbbf..a98fecce40 100644 --- a/packages/Avalonia/AvaloniaPrivateApis.targets +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -1,7 +1,7 @@ - net6.0 - netstandard2.0 + net6.0 + netstandard2.0 @@ -13,9 +13,9 @@ - - - + + + From 59fb1536a6a1c02a4b775f2f333e1432a5f53203 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 18:37:12 +0100 Subject: [PATCH 05/10] better warning message --- packages/Avalonia/AvaloniaPrivateApis.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets index a98fecce40..ec93dcb5dc 100644 --- a/packages/Avalonia/AvaloniaPrivateApis.targets +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -17,6 +17,6 @@ - + From 6f598fff06873d6f39b92cdc27b17177f7f7686e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 18:40:30 +0100 Subject: [PATCH 06/10] fix referencing unstable apis. --- packages/Avalonia/AvaloniaPrivateApis.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets index ec93dcb5dc..5f6d19773c 100644 --- a/packages/Avalonia/AvaloniaPrivateApis.targets +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -13,9 +13,9 @@ - - - + + + From c142c5a0e722a6a5e2853d5be0173d70b80d5870 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 18:43:19 +0100 Subject: [PATCH 07/10] prefix the property name --- packages/Avalonia/AvaloniaPrivateApis.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets index 5f6d19773c..95c08520a9 100644 --- a/packages/Avalonia/AvaloniaPrivateApis.targets +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -1,8 +1,4 @@ - - net6.0 - netstandard2.0 - @@ -12,9 +8,13 @@ + + net6.0 + netstandard2.0 + - - + + From 7e0c578f3e27e0e7cc4629129325c594ceeac182 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 18:45:03 +0100 Subject: [PATCH 08/10] fix bug --- packages/Avalonia/AvaloniaPrivateApis.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets index 95c08520a9..368d69322d 100644 --- a/packages/Avalonia/AvaloniaPrivateApis.targets +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -15,7 +15,7 @@ - + From 036e6c3c4f9cf6d240aed91f25c0cf16037acc0c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 18:50:55 +0100 Subject: [PATCH 09/10] add error if user is publishing a library on nuget. --- packages/Avalonia/AvaloniaPrivateApis.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets index 368d69322d..e7807aeb78 100644 --- a/packages/Avalonia/AvaloniaPrivateApis.targets +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -18,5 +18,7 @@ + From 0dc6b6b042e46f270799cd30a22e5be5cd4530ec Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 31 May 2023 19:45:57 +0100 Subject: [PATCH 10/10] ensure packing error does not occur on normal builds. --- packages/Avalonia/AvaloniaPrivateApis.targets | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets index e7807aeb78..5343559c07 100644 --- a/packages/Avalonia/AvaloniaPrivateApis.targets +++ b/packages/Avalonia/AvaloniaPrivateApis.targets @@ -1,5 +1,5 @@ - + @@ -7,7 +7,11 @@ - + + + + net6.0 netstandard2.0 @@ -18,7 +22,5 @@ -