From 7ea36699b77ceeb9ba6bf8d7340f5f1ffde4e3a1 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 3 Jun 2025 15:51:23 +1000 Subject: [PATCH 1/2] Fix dependencies Metadata on `` items don't apply to the corresponding `` items. This meant that the `Figgle` package advertised several package dependencies that weren't actually needed. --- Directory.Build.props | 7 ++-- Directory.Packages.props | 32 ++++++------------- .../Figgle.Generator.AcceptanceTests.csproj | 8 +++-- .../Figgle.Generator.Tests.csproj | 8 +++-- Figgle.Generator/Figgle.Generator.csproj | 9 ++++-- Figgle.Tests/Figgle.Tests.csproj | 10 +++++- 6 files changed, 40 insertions(+), 34 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index ef52a0c..4688b15 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -41,8 +41,11 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 37541ef..856a837 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,31 +1,19 @@ + true true - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + + + - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + - \ No newline at end of file + + diff --git a/Figgle.Generator.AcceptanceTests/Figgle.Generator.AcceptanceTests.csproj b/Figgle.Generator.AcceptanceTests/Figgle.Generator.AcceptanceTests.csproj index 14df4ed..ceb869c 100644 --- a/Figgle.Generator.AcceptanceTests/Figgle.Generator.AcceptanceTests.csproj +++ b/Figgle.Generator.AcceptanceTests/Figgle.Generator.AcceptanceTests.csproj @@ -8,11 +8,13 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/Figgle.Generator.Tests/Figgle.Generator.Tests.csproj b/Figgle.Generator.Tests/Figgle.Generator.Tests.csproj index 84916aa..5d1c596 100644 --- a/Figgle.Generator.Tests/Figgle.Generator.Tests.csproj +++ b/Figgle.Generator.Tests/Figgle.Generator.Tests.csproj @@ -5,11 +5,13 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/Figgle.Generator/Figgle.Generator.csproj b/Figgle.Generator/Figgle.Generator.csproj index 67d3667..86dd243 100644 --- a/Figgle.Generator/Figgle.Generator.csproj +++ b/Figgle.Generator/Figgle.Generator.csproj @@ -19,9 +19,12 @@ - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/Figgle.Tests/Figgle.Tests.csproj b/Figgle.Tests/Figgle.Tests.csproj index c43548f..82e6f68 100644 --- a/Figgle.Tests/Figgle.Tests.csproj +++ b/Figgle.Tests/Figgle.Tests.csproj @@ -1,17 +1,25 @@  + $(SupportingProjectTargetFramework) + - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + \ No newline at end of file From 3aa8877c3a75bfc151c8001518cf03a20bfc1228 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 3 Jun 2025 16:06:56 +1000 Subject: [PATCH 2/2] Remove package dependency from Figgle.Generator to Figgle.Fonts --- Figgle.Generator/Figgle.Generator.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Figgle.Generator/Figgle.Generator.csproj b/Figgle.Generator/Figgle.Generator.csproj index 86dd243..701b7e5 100644 --- a/Figgle.Generator/Figgle.Generator.csproj +++ b/Figgle.Generator/Figgle.Generator.csproj @@ -41,7 +41,7 @@ - +