From 641cf8e54f947b2be1a94d04910ec9c27ec31a40 Mon Sep 17 00:00:00 2001
From: brian-reichle <18721383+brian-reichle@users.noreply.github.com>
Date: Sun, 8 Jun 2025 14:21:58 +1000
Subject: [PATCH 1/4] Use the nullability and language version specified in
Directory.Build.props, don't override it.
---
src/TextTools/TextTools.csproj | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/TextTools/TextTools.csproj b/src/TextTools/TextTools.csproj
index b065e4e..9e49a5f 100644
--- a/src/TextTools/TextTools.csproj
+++ b/src/TextTools/TextTools.csproj
@@ -1,8 +1,6 @@
net462;netstandard2.0;netstandard2.1;net8.0
- enable
- 8.0
From c51568cf63706dfcfc1e9017b36a4c534119f500 Mon Sep 17 00:00:00 2001
From: brian-reichle <18721383+brian-reichle@users.noreply.github.com>
Date: Sun, 8 Jun 2025 14:28:07 +1000
Subject: [PATCH 2/4] Move global package references to Directory.Build.props.
---
Directory.Build.props | 18 ++++++++++++++++++
src/TextTools.Test/TextTools.Test.csproj | 16 ----------------
src/TextTools/TextTools.csproj | 18 ------------------
3 files changed, 18 insertions(+), 34 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index ded337a..2e763d3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -34,4 +34,22 @@ CS1591 - Missing XML comment.
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/src/TextTools.Test/TextTools.Test.csproj b/src/TextTools.Test/TextTools.Test.csproj
index a546af2..c1aa674 100644
--- a/src/TextTools.Test/TextTools.Test.csproj
+++ b/src/TextTools.Test/TextTools.Test.csproj
@@ -3,10 +3,6 @@
net48;net8.0;net9.0
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
@@ -15,18 +11,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
diff --git a/src/TextTools/TextTools.csproj b/src/TextTools/TextTools.csproj
index 9e49a5f..4c20359 100644
--- a/src/TextTools/TextTools.csproj
+++ b/src/TextTools/TextTools.csproj
@@ -7,24 +7,6 @@
<_Parameter1>TextTools.Test, PublicKey=$(TokenSignaturePublicKey)
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
TextTemplatingFileGenerator
From 9cd2795a559cb77f94a5ecb3bc9e6daf002adfe3 Mon Sep 17 00:00:00 2001
From: brian-reichle <18721383+brian-reichle@users.noreply.github.com>
Date: Sun, 8 Jun 2025 14:37:28 +1000
Subject: [PATCH 3/4] Use CPM.
---
Directory.Build.props | 8 ++++----
Directory.Packages.props | 19 +++++++++++++++++++
src/TextTools.Test/TextTools.Test.csproj | 10 +++++-----
src/TextTools/TextTools.csproj | 4 ++--
4 files changed, 30 insertions(+), 11 deletions(-)
create mode 100644 Directory.Packages.props
diff --git a/Directory.Build.props b/Directory.Build.props
index 2e763d3..7c9355e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -35,19 +35,19 @@ CS1591 - Missing XML comment.
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..f29b454
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,19 @@
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/TextTools.Test/TextTools.Test.csproj b/src/TextTools.Test/TextTools.Test.csproj
index c1aa674..eaf0252 100644
--- a/src/TextTools.Test/TextTools.Test.csproj
+++ b/src/TextTools.Test/TextTools.Test.csproj
@@ -3,14 +3,14 @@
net48;net8.0;net9.0
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/TextTools/TextTools.csproj b/src/TextTools/TextTools.csproj
index 4c20359..179a48c 100644
--- a/src/TextTools/TextTools.csproj
+++ b/src/TextTools/TextTools.csproj
@@ -33,11 +33,11 @@
true
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
From 4dce1c00a008a4e265d2dac2c72bbaecce74d34e Mon Sep 17 00:00:00 2001
From: brian-reichle <18721383+brian-reichle@users.noreply.github.com>
Date: Sun, 8 Jun 2025 14:40:14 +1000
Subject: [PATCH 4/4] Added easy access to common solution-level files.
---
src/TextTools.sln | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/TextTools.sln b/src/TextTools.sln
index c463ffb..5055dd5 100644
--- a/src/TextTools.sln
+++ b/src/TextTools.sln
@@ -3,6 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution_", "_Solution_", "{36859437-C7AB-43C0-8B40-05AC486AA2FF}"
+ ProjectSection(SolutionItems) = preProject
+ ..\.editorconfig = ..\.editorconfig
+ ..\Directory.Build.props = ..\Directory.Build.props
+ ..\Directory.Packages.props = ..\Directory.Packages.props
+ EndProjectSection
+EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextTools", "TextTools\TextTools.csproj", "{EF1A35D6-BDBB-4C28-8B52-4CD9136AC2D3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextTools.Test", "TextTools.Test\TextTools.Test.csproj", "{835036C8-8934-4CC8-863B-021EFA812EBE}"