From 167397fbff064394f712309443aabfe985364fb4 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 15 Nov 2025 15:35:21 +0100 Subject: [PATCH 1/2] Directory.Build.Props inheritance. --- Directory.Build.props | 8 ++ LinkDotNet.Blog.sln | 26 +++--- src/Directory.Build.props | 24 +++--- .../LinkDotNet.Blog.Domain.csproj | 11 ++- .../LinkDotNet.Blog.Infrastructure.csproj | 37 +++++---- .../LinkDotNet.Blog.Web.csproj | 6 +- tests/Directory.Build.props | 81 ++++++++++--------- .../LinkDotNet.Blog.IntegrationTests.csproj | 32 ++++---- .../LinkDotNet.Blog.TestUtilities.csproj | 13 +-- .../LinkDotNet.Blog.UnitTests.csproj | 19 +++-- tools/Directory.Build.props | 24 +++--- .../LinkDotNet.Blog.CriticalCSS.csproj | 16 ++-- 12 files changed, 149 insertions(+), 148 deletions(-) create mode 100644 Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..c29ff7f5 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,8 @@ + + + + net10.0 + enable + + + diff --git a/LinkDotNet.Blog.sln b/LinkDotNet.Blog.sln index 9146ab35..a5112d62 100644 --- a/LinkDotNet.Blog.sln +++ b/LinkDotNet.Blog.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinkDotNet.Blog.Web", "src\LinkDotNet.Blog.Web\LinkDotNet.Blog.Web.csproj", "{6D6519BF-9265-488D-AA3B-C879F427930F}" EndProject @@ -17,25 +17,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinkDotNet.Blog.TestUtiliti EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6AF0B6E-14FB-4737-A69B-13B0D7195E2B}" ProjectSection(SolutionItems) = preProject - Readme.md = Readme.md .editorconfig = .editorconfig - MIGRATION.md = MIGRATION.md + Directory.Build.props = Directory.Build.props Directory.Packages.props = Directory.Packages.props + MIGRATION.md = MIGRATION.md + Readme.md = Readme.md EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{86FD0EB5-13F9-4F1C-ADA1-072EEFEFF1E9}" ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props src\.editorconfig = src\.editorconfig + src\Directory.Build.props = src\Directory.Build.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CAD2F4A3-1282-49B5-B0AB-655CDBED0A35}" ProjectSection(SolutionItems) = preProject - tests\Directory.Build.props = tests\Directory.Build.props tests\.editorconfig = tests\.editorconfig + tests\Directory.Build.props = tests\Directory.Build.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A931171C-22A6-4DB5-802B-67286B536BD2}" + ProjectSection(SolutionItems) = preProject + tools\Directory.Build.props = tools\Directory.Build.props + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinkDotNet.Blog.CriticalCSS", "tools\LinkDotNet.Blog.CriticalCSS\LinkDotNet.Blog.CriticalCSS.csproj", "{8CB83177-C078-4953-BC27-8968D2A6E0FE}" EndProject @@ -77,16 +81,16 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {FB9B0642-F1F0-4BD8-9EDD-15C95F082180} - EndGlobalSection GlobalSection(NestedProjects) = preSolution + {6D6519BF-9265-488D-AA3B-C879F427930F} = {86FD0EB5-13F9-4F1C-ADA1-072EEFEFF1E9} {18F8E09D-FF0B-4FF9-93A9-971A388D0E2A} = {86FD0EB5-13F9-4F1C-ADA1-072EEFEFF1E9} {E8ED38D2-FCD3-473D-BD78-43EE78E08EE6} = {86FD0EB5-13F9-4F1C-ADA1-072EEFEFF1E9} - {6D6519BF-9265-488D-AA3B-C879F427930F} = {86FD0EB5-13F9-4F1C-ADA1-072EEFEFF1E9} + {5B868911-7C93-4190-AEE4-3A6694F2FFCE} = {CAD2F4A3-1282-49B5-B0AB-655CDBED0A35} {DEFDA17A-9586-4E50-83FB-8F75AC29D39A} = {CAD2F4A3-1282-49B5-B0AB-655CDBED0A35} {310ABEE1-C131-43E6-A759-F2DB75A483DD} = {CAD2F4A3-1282-49B5-B0AB-655CDBED0A35} - {5B868911-7C93-4190-AEE4-3A6694F2FFCE} = {CAD2F4A3-1282-49B5-B0AB-655CDBED0A35} {8CB83177-C078-4953-BC27-8968D2A6E0FE} = {A931171C-22A6-4DB5-802B-67286B536BD2} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {FB9B0642-F1F0-4BD8-9EDD-15C95F082180} + EndGlobalSection EndGlobal diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 766cfac7..ff19a867 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,20 +1,22 @@ - - AllEnabledByDefault - true - latest - true - critical - enable - + + + + AllEnabledByDefault + true + latest + true + critical + enable + - - true - + + true + diff --git a/src/LinkDotNet.Blog.Domain/LinkDotNet.Blog.Domain.csproj b/src/LinkDotNet.Blog.Domain/LinkDotNet.Blog.Domain.csproj index c79cfb53..690008fc 100644 --- a/src/LinkDotNet.Blog.Domain/LinkDotNet.Blog.Domain.csproj +++ b/src/LinkDotNet.Blog.Domain/LinkDotNet.Blog.Domain.csproj @@ -1,9 +1,8 @@ - - net10.0 - enable - LinkDotNet.Blog.Domain - LinkDotNet.Blog.Domain - + + LinkDotNet.Blog.Domain + LinkDotNet.Blog.Domain + + diff --git a/src/LinkDotNet.Blog.Infrastructure/LinkDotNet.Blog.Infrastructure.csproj b/src/LinkDotNet.Blog.Infrastructure/LinkDotNet.Blog.Infrastructure.csproj index ea6489f7..6e65f1be 100644 --- a/src/LinkDotNet.Blog.Infrastructure/LinkDotNet.Blog.Infrastructure.csproj +++ b/src/LinkDotNet.Blog.Infrastructure/LinkDotNet.Blog.Infrastructure.csproj @@ -1,24 +1,23 @@ - - net10.0 - LinkDotNet.Blog.Infrastructure - LinkDotNet.Blog.Infrastructure - enable - + + LinkDotNet.Blog.Infrastructure + LinkDotNet.Blog.Infrastructure + - - - - - - - - - - + + + + + + + + + + + + + + - - - diff --git a/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj b/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj index 5cbf0174..8de1167b 100644 --- a/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj +++ b/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj @@ -1,10 +1,5 @@ - - net10.0 - enable - - @@ -28,4 +23,5 @@ + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 98b8803f..c3b7ed27 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,47 +1,48 @@ - - - critical - $(InterceptorsPreviewNamespaces);Bunit - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + critical + $(InterceptorsPreviewNamespaces);Bunit + - - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - true - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + true + diff --git a/tests/LinkDotNet.Blog.IntegrationTests/LinkDotNet.Blog.IntegrationTests.csproj b/tests/LinkDotNet.Blog.IntegrationTests/LinkDotNet.Blog.IntegrationTests.csproj index ecc3a43e..7a11eda7 100644 --- a/tests/LinkDotNet.Blog.IntegrationTests/LinkDotNet.Blog.IntegrationTests.csproj +++ b/tests/LinkDotNet.Blog.IntegrationTests/LinkDotNet.Blog.IntegrationTests.csproj @@ -1,23 +1,21 @@ - - net10.0 - Exe - enable - false - + + Exe + false + - - - - - - + + + + + + - - - - - + + + + + \ No newline at end of file diff --git a/tests/LinkDotNet.Blog.TestUtilities/LinkDotNet.Blog.TestUtilities.csproj b/tests/LinkDotNet.Blog.TestUtilities/LinkDotNet.Blog.TestUtilities.csproj index 8bea7f44..e8c85208 100644 --- a/tests/LinkDotNet.Blog.TestUtilities/LinkDotNet.Blog.TestUtilities.csproj +++ b/tests/LinkDotNet.Blog.TestUtilities/LinkDotNet.Blog.TestUtilities.csproj @@ -1,13 +1,8 @@ - - net10.0 - enable - - - - - - + + + + \ No newline at end of file diff --git a/tests/LinkDotNet.Blog.UnitTests/LinkDotNet.Blog.UnitTests.csproj b/tests/LinkDotNet.Blog.UnitTests/LinkDotNet.Blog.UnitTests.csproj index 5f0ca85c..2ef0b5af 100644 --- a/tests/LinkDotNet.Blog.UnitTests/LinkDotNet.Blog.UnitTests.csproj +++ b/tests/LinkDotNet.Blog.UnitTests/LinkDotNet.Blog.UnitTests.csproj @@ -1,14 +1,13 @@ - - net10.0 - Exe - enable - false - + + Exe + false + + + + + + - - - - \ No newline at end of file diff --git a/tools/Directory.Build.props b/tools/Directory.Build.props index 766cfac7..ff19a867 100644 --- a/tools/Directory.Build.props +++ b/tools/Directory.Build.props @@ -1,20 +1,22 @@ - - AllEnabledByDefault - true - latest - true - critical - enable - + + + + AllEnabledByDefault + true + latest + true + critical + enable + - - true - + + true + diff --git a/tools/LinkDotNet.Blog.CriticalCSS/LinkDotNet.Blog.CriticalCSS.csproj b/tools/LinkDotNet.Blog.CriticalCSS/LinkDotNet.Blog.CriticalCSS.csproj index a5282240..c673fbfb 100644 --- a/tools/LinkDotNet.Blog.CriticalCSS/LinkDotNet.Blog.CriticalCSS.csproj +++ b/tools/LinkDotNet.Blog.CriticalCSS/LinkDotNet.Blog.CriticalCSS.csproj @@ -1,15 +1,13 @@  - - Exe - net10.0 - enable - enable - + + Exe + enable + - - - + + + From 44b7e9631e3a8714f1731a3b0165848970592382 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 15 Nov 2025 20:34:53 +0100 Subject: [PATCH 2/2] Moved TreatWarningsAsErrors to root Directory.Build.props --- Directory.Build.props | 4 ++++ src/Directory.Build.props | 4 ---- tests/Directory.Build.props | 4 ---- tools/Directory.Build.props | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c29ff7f5..f71a0060 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,4 +5,8 @@ enable + + true + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ff19a867..324edff1 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -15,8 +15,4 @@ - - true - - diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index c3b7ed27..497075b7 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -41,8 +41,4 @@ - - true - - diff --git a/tools/Directory.Build.props b/tools/Directory.Build.props index ff19a867..324edff1 100644 --- a/tools/Directory.Build.props +++ b/tools/Directory.Build.props @@ -15,8 +15,4 @@ - - true - -