Merge pull request #61 from Stillpoint-Software/develop

varndellwagglebee · web-flow · commit de67e7e40800 · 2026-01-21T13:16:59.000-05:00
Develop
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,15 +1,14 @@
 <Project>
-  <!-- Shared package refs -->
+  <PropertyGroup>
+    <!-- Suppress NU1507 (multiple package sources with CPM) -->
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
+  </PropertyGroup>
   <ItemGroup>
-    <!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
     <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
-
-    <!-- SourceLink for GitHub -->
     <PackageReference Include="Microsoft.SourceLink.GitHub" >
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting"/>
   </ItemGroup>
 
@@ -50,6 +49,7 @@
   <!-- Global project properies -->
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
-    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+    <!-- Primary target: .NET 10 (next LTS), with .NET 9 for current support, .NET 8 for compatibility -->
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,13 +5,20 @@
   <ItemGroup>
     <!-- Core Application Dependencies -->
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
-   <!-- Development Tools -->
+    <!-- Development Tools -->
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
-     <!-- Testing Framework -->
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" >
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <!-- Testing Framework -->
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" >
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
     <PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
-    </ItemGroup>
-  </Project>
+
+  </ItemGroup>
+</Project>
diff --git a/Hyperbee.Resources.slnx b/Hyperbee.Resources.slnx
@@ -3,6 +3,7 @@
     <File Path="Directory.Build.props" />
     <File Path="Directory.Packages.props" />
     <File Path="LICENSE" />
+    <File Path="NuGet.Config" />
     <File Path="README.md" />
     <File Path="version.json" />
     <Project Path="docs/docs.shproj" />
diff --git a/src/Hyperbee.Resources/Hyperbee.Resources.csproj b/src/Hyperbee.Resources/Hyperbee.Resources.csproj
@@ -4,14 +4,13 @@
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>true</IsPackable>
-
     <Authors>Stillpoint Software, Inc.</Authors>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageTags>resources;NET;embedded resources</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Resources/</PackageProjectUrl>
-    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageId>Hyperbee.Resources</PackageId>
     <Copyright>Stillpoint Software, Inc.</Copyright>
     <Title>Hyperbee Resources</Title>
     <Description>
@@ -33,10 +32,7 @@
       <PackagePath>\</PackagePath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <PackageReference Update="Microsoft.SourceLink.GitHub">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Update="Microsoft.SourceLink.GitHub"/>
     <PackageReference Update="Nerdbank.GitVersioning" />
   </ItemGroup>
 
diff --git a/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj b/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj
@@ -15,10 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="coverlet.collector" />
+
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="MSTest.TestAdapter" />
     <PackageReference Include="MSTest.TestFramework" />
@@ -33,10 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" >
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" />
     <PackageReference Update="Nerdbank.GitVersioning"  />
   </ItemGroup>
 
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.0.4",
+  "version": "2.1.1",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
     "^refs/heads/hotfix$",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "2.0.4",`
	`3`	`+ "version": "2.1.1",`
`4`	`4`	`"publicReleaseRefSpec": [`
`5`	`5`	`"^refs/heads/main$",`
`6`	`6`	`"^refs/heads/hotfix$",`