Skip to content

Commit 69bb2c2

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #59 from Stillpoint-Software/develop
Updated to .NET 10
2 parents 82cf215 + dc5a0ed commit 69bb2c2

File tree

8 files changed

+43
-19
lines changed

8 files changed

+43
-19
lines changed

‎.github/workflows/Format.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
if: ${{ needs.discover.result == 'success' }}
4747
uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main
4848
with:
49-
dotnet_version: "10.0.x"
5049
branch: ${{ needs.discover.outputs.branch_name }}
5150
secrets: inherit
5251

‎Directory.Build.props‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<!-- Shared package refs -->
33
<ItemGroup>
44
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
5-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
5+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
66

77
<!-- SourceLink for GitHub -->
8-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
8+
<PackageReference Include="Microsoft.SourceLink.GitHub" >
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>
1212

13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting"/>
1414
</ItemGroup>
1515

1616
<!-- SourceLink / build hygiene -->
@@ -46,4 +46,10 @@
4646
PackagePath="\"
4747
Link="LICENSE" />
4848
</ItemGroup>
49+
50+
<!-- Global project properies -->
51+
<PropertyGroup>
52+
<ImplicitUsings>enable</ImplicitUsings>
53+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
54+
</PropertyGroup>
4955
</Project>

‎Directory.Packages.props‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- Core Application Dependencies -->
7+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
8+
<!-- Development Tools -->
9+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
10+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
11+
<!-- Testing Framework -->
12+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
13+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
14+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
15+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
16+
</ItemGroup>
17+
</Project>

‎Hyperbee.Resources.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Solution>
22
<Folder Name="/Solution Items/">
33
<File Path="Directory.Build.props" />
4+
<File Path="Directory.Packages.props" />
45
<File Path="LICENSE" />
56
<File Path="README.md" />
67
<File Path="version.json" />

‎src/Hyperbee.Resources/Hyperbee.Resources.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<Nullable>enable</Nullable>
75
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
86
<IsPackable>true</IsPackable>
@@ -12,7 +10,7 @@
1210
<PackageTags>resources;NET;embedded resources</PackageTags>
1311
<PackageIcon>icon.png</PackageIcon>
1412
<PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Resources/</PackageProjectUrl>
15-
<TargetFrameworks>net10.0</TargetFrameworks>
13+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
1614
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1715
<Copyright>Stillpoint Software, Inc.</Copyright>
1816
<Title>Hyperbee Resources</Title>
@@ -35,11 +33,11 @@
3533
<PackagePath>\</PackagePath>
3634
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3735
</None>
38-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
36+
<PackageReference Update="Microsoft.SourceLink.GitHub">
3937
<PrivateAssets>all</PrivateAssets>
4038
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4139
</PackageReference>
42-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
40+
<PackageReference Update="Nerdbank.GitVersioning" />
4341
</ItemGroup>
4442

4543
<ItemGroup>

‎test/Hyperbee.Resources.Tests/AssemblyInfo.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
// Explicitly enable test parallelization at method level
4+
// This allows multiple test methods to run in parallel for faster execution
5+
// Safe for resource loading tests that don't share mutable state
6+
[assembly: Parallelize( Workers = 0, Scope = ExecutionScope.MethodLevel )]

‎test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<Nullable>enable</Nullable>
7-
85
<IsPackable>false</IsPackable>
96
<IsTestProject>true</IsTestProject>
107
</PropertyGroup>
@@ -18,13 +15,13 @@
1815
</ItemGroup>
1916

2017
<ItemGroup>
21-
<PackageReference Include="coverlet.collector" Version="6.0.4">
18+
<PackageReference Include="coverlet.collector">
2219
<PrivateAssets>all</PrivateAssets>
2320
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2421
</PackageReference>
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
26-
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
27-
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
23+
<PackageReference Include="MSTest.TestAdapter" />
24+
<PackageReference Include="MSTest.TestFramework" />
2825
</ItemGroup>
2926

3027
<ItemGroup>
@@ -36,11 +33,11 @@
3633
</ItemGroup>
3734

3835
<ItemGroup>
39-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
36+
<PackageReference Update="Microsoft.SourceLink.GitHub" >
4037
<PrivateAssets>all</PrivateAssets>
4138
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4239
</PackageReference>
43-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
40+
<PackageReference Update="Nerdbank.GitVersioning" />
4441
</ItemGroup>
4542

4643
</Project>

‎version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.0.3",
3+
"version": "2.0.4",
44
"publicReleaseRefSpec": [
55
"^refs/heads/main$",
66
"^refs/heads/hotfix$",

0 commit comments

Comments
 (0)