Started using Directory.Build.props for shared propeties, moved Narra…

…tiveCharts.Console to samples folder.
natekford · Feb 1, 2024 · dbfc4d6 · dbfc4d6
1 parent 4cf6471
commit dbfc4d6
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 41 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<LangVersion>preview</LangVersion>
+	</PropertyGroup>
+</Project>
diff --git a/NarrativeCharts.sln b/NarrativeCharts.sln
@@ -5,25 +5,26 @@ VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts", "src\NarrativeCharts\NarrativeCharts.csproj", "{13908C1D-BA8B-4D29-AEB0-BAF401EDF615}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Plot", "src\NarrativeCharts.Plot\NarrativeCharts.Plot.csproj", "{5D894EE9-1195-4020-8DD6-BA5FED8C1542}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Skia", "src\NarrativeCharts.Skia\NarrativeCharts.Skia.csproj", "{0EF44B4C-496B-41B6-9C09-0467264D0C9C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Tests", "tests\NarrativeCharts.Tests\NarrativeCharts.Tests.csproj", "{A0812769-E99D-4516-9AE2-BD2EA578D852}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Bookworm", "samples\NarrativeCharts.Bookworm\NarrativeCharts.Bookworm.csproj", "{683BA082-84B0-48A8-9DD3-411835270F05}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Plot", "src\NarrativeCharts.Plot\NarrativeCharts.Plot.csproj", "{5D894EE9-1195-4020-8DD6-BA5FED8C1542}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Console", "samples\NarrativeCharts.Console\NarrativeCharts.Console.csproj", "{9A57B871-240C-406A-AB59-29FC8F8809EA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{015136BB-5A88-447C-A3E1-0A8755271554}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Skia", "src\NarrativeCharts.Skia\NarrativeCharts.Skia.csproj", "{0EF44B4C-496B-41B6-9C09-0467264D0C9C}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{4F362A65-EA80-402E-937B-7515C97E9F17}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{47BFC64C-BD10-4028-A735-DEDB8471730B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Tests", "tests\NarrativeCharts.Tests\NarrativeCharts.Tests.csproj", "{A0812769-E99D-4516-9AE2-BD2EA578D852}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NarrativeCharts.Console", "src\NarrativeCharts.Console\NarrativeCharts.Console.csproj", "{9A57B871-240C-406A-AB59-29FC8F8809EA}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +62,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{683BA082-84B0-48A8-9DD3-411835270F05} = {4F362A65-EA80-402E-937B-7515C97E9F17}
 		{A0812769-E99D-4516-9AE2-BD2EA578D852} = {47BFC64C-BD10-4028-A735-DEDB8471730B}
+		{9A57B871-240C-406A-AB59-29FC8F8809EA} = {4F362A65-EA80-402E-937B-7515C97E9F17}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {16B4C0A3-EB33-46B5-9A8F-A4A19857B026}

diff --git a/samples/NarrativeCharts.Bookworm/NarrativeCharts.Bookworm.csproj b/samples/NarrativeCharts.Bookworm/NarrativeCharts.Bookworm.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<LangVersion>preview</LangVersion>
 		<OutputType>Exe</OutputType>
 	</PropertyGroup>
 

diff --git a/samples/NarrativeCharts.Console/NarrativeCharts.Console.csproj b/samples/NarrativeCharts.Console/NarrativeCharts.Console.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\..\src\NarrativeCharts.Skia\NarrativeCharts.Skia.csproj" />
+	  <ProjectReference Include="..\..\src\NarrativeCharts\NarrativeCharts.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/NarrativeCharts.Console/Program.cs → samples/NarrativeCharts.Console/Program.cs b/src/NarrativeCharts.Console/Program.cs → samples/NarrativeCharts.Console/Program.cs
diff --git a/src/NarrativeCharts.Console/NarrativeCharts.Console.csproj b/src/NarrativeCharts.Console/NarrativeCharts.Console.csproj
diff --git a/src/NarrativeCharts.Plot/NarrativeCharts.Plot.csproj b/src/NarrativeCharts.Plot/NarrativeCharts.Plot.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<LangVersion>preview</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/NarrativeCharts.Skia/NarrativeCharts.Skia.csproj b/src/NarrativeCharts.Skia/NarrativeCharts.Skia.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<LangVersion>preview</LangVersion>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	</PropertyGroup>
 

diff --git a/src/NarrativeCharts/NarrativeCharts.csproj b/src/NarrativeCharts/NarrativeCharts.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<LangVersion>preview</LangVersion>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	</PropertyGroup>
 </Project>
diff --git a/tests/NarrativeCharts.Tests/NarrativeCharts.Tests.csproj b/tests/NarrativeCharts.Tests/NarrativeCharts.Tests.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<LangVersion>preview</LangVersion>
 		<IsPackable>false</IsPackable>
 		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>