Skip to content

Commit e18e07c

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #71 from Stillpoint-Software/develop
.NET upgrade to 10
2 parents 99ae698 + b65b08e commit e18e07c

File tree

16 files changed

+136
-86
lines changed

16 files changed

+136
-86
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: "9.0.x"
5049
branch: ${{ needs.discover.outputs.branch_name }}
5150
secrets: inherit
5251

‎Directory.Build.props‎

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

77
<!-- SourceLink for GitHub -->
8-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11-
</PackageReference>
12-
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
8+
<PackageReference Include="Microsoft.SourceLink.GitHub"/>
9+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
1410
</ItemGroup>
1511

1612
<!-- SourceLink / build hygiene -->
@@ -45,4 +41,8 @@
4541
PackagePath="\"
4642
Link="LICENSE" />
4743
</ItemGroup>
44+
<PropertyGroup>
45+
<ImplicitUsings>enable</ImplicitUsings>
46+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
47+
</PropertyGroup>
4848
</Project>

‎Directory.Packages.props‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50">
7+
<PrivateAssets>all</PrivateAssets>
8+
</PackageVersion>
9+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
10+
<PrivateAssets>all</PrivateAssets>
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
</PackageVersion>
13+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
14+
<!-- Test packages -->
15+
<PackageVersion Include="coverlet.collector" Version="6.0.4">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageVersion>
19+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
20+
<PackageVersion Include="MSTest.TestAdapter" Version="3.9.3" />
21+
<PackageVersion Include="MSTest.TestFramework" Version="3.9.3" />
22+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
23+
<PackageVersion Include="Microsoft.AspNetCore.Http.Connections.Common" Version="10.0.1" />
24+
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.1" />
25+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
26+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
27+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
28+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
29+
</ItemGroup>
30+
</Project>

‎Hyperbee.Pipeline.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31912.275
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.1.11312.151 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{870D9301-BE3D-44EA-BF9C-FCC2E87FE4CD}"
77
ProjectSection(SolutionItems) = preProject

‎Hyperbee.Pipeline.slnx‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path="Directory.Build.props" />
4+
<File Path="LICENSE" />
5+
<File Path="README.md" />
6+
<File Path="version.json" />
7+
<Project Path="docs/docs.shproj" />
8+
</Folder>
9+
<Folder Name="/Solution Items/.github/" />
10+
<Folder Name="/Solution Items/.github/workflows/">
11+
<File Path=".github/workflows/create_release.yml" />
12+
<File Path=".github/workflows/create_test_report.yml" />
13+
<File Path=".github/workflows/format.yml" />
14+
<File Path=".github/workflows/issue_branch.yml" />
15+
<File Path=".github/workflows/pack_publish.yml" />
16+
<File Path=".github/workflows/run_tests.yml" />
17+
<File Path=".github/workflows/unlist_package.yml" />
18+
</Folder>
19+
<Folder Name="/Solution Tests/">
20+
<Project Path="test/Hyperbee.Pipeline.Auth.Tests/Hyperbee.Pipeline.Auth.Tests.csproj" />
21+
<Project Path="test/Hyperbee.Pipeline.Tests/Hyperbee.Pipeline.Tests.csproj" />
22+
<Project Path="test/Hyperbee.PipelineCaching.Tests/Hyperbee.Pipeline.Caching.Tests.csproj" />
23+
<Project Path="test/Hyperbee.Pipleline.Benchmark/Hyperbee.Pipeline.Benchmark.csproj" />
24+
</Folder>
25+
<Project Path="src/Hyperbee.Pipeline.Auth/Hyperbee.Pipeline.Auth.csproj" />
26+
<Project Path="src/Hyperbee.Pipeline/Hyperbee.Pipeline.csproj" />
27+
<Project Path="src/Hyperbee.Pipline.Caching/Hyperbee.Pipeline.Caching.csproj" />
28+
</Solution>

‎src/Hyperbee.Pipeline.Auth/Hyperbee.Pipeline.Auth.csproj‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<IsPackable>true</IsPackable>
7-
85
<Authors>Stillpoint Software, Inc.</Authors>
96
<PackageReadmeFile>README.md</PackageReadmeFile>
107
<PackageTags>pipeline;auth</PackageTags>
118
<PackageIcon>icon.png</PackageIcon>
129
<PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Pipeline/</PackageProjectUrl>
1310
<PackageReleaseNotes>https://github.com/Stillpoint-Software/hyperbee.pipeline/releases/latest</PackageReleaseNotes>
14-
<TargetFrameworks>net8.0</TargetFrameworks>
1511
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1612
<Copyright>Stillpoint Software, Inc.</Copyright>
1713
<Title>Hyperbee Pipline Auth</Title>
@@ -32,9 +28,9 @@
3228
<Pack>True</Pack>
3329
<PackagePath>\</PackagePath>
3430
</None>
35-
<PackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="9.0.7" />
31+
<PackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" />
3632
<ProjectReference Include="..\Hyperbee.Pipeline\Hyperbee.Pipeline.csproj" />
37-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
33+
<PackageReference Update="Microsoft.SourceLink.GitHub">
3834
<PrivateAssets>all</PrivateAssets>
3935
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4036
</PackageReference>

‎src/Hyperbee.Pipeline/Hyperbee.Pipeline.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<ImplicitUsings>enable</ImplicitUsings>
53
<IsPackable>true</IsPackable>
64
<Authors>Stillpoint Software, Inc.</Authors>
75
<PackageReadmeFile>README.md</PackageReadmeFile>
86
<PackageTags>pipeline;fluent-pipeline;middleware;hooks;dependency-injection</PackageTags>
97
<PackageIcon>icon.png</PackageIcon>
108
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.pipeline/</PackageProjectUrl>
119
<PackageReleaseNotes>https://github.com/Stillpoint-Software/hyperbee.pipeline/releases/latest</PackageReleaseNotes>
12-
<TargetFrameworks>net8.0</TargetFrameworks>
1310
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1411
<Copyright>Stillpoint Software, Inc.</Copyright>
1512
<Title>Hyperbee Piplines</Title>
@@ -26,11 +23,11 @@
2623
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
2724
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
2825
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
29-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
26+
<PackageReference Update="Microsoft.SourceLink.GitHub">
3027
<PrivateAssets>all</PrivateAssets>
3128
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3229
</PackageReference>
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
34-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
30+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
31+
<PackageReference Include="Microsoft.Extensions.Logging" />
3532
</ItemGroup>
3633
</Project>

‎src/Hyperbee.Pipline.Caching/Hyperbee.Pipeline.Caching.csproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
63
<IsPackable>true</IsPackable>
7-
84
<Authors>Stillpoint Software, Inc.</Authors>
95
<PackageReadmeFile>README.md</PackageReadmeFile>
106
<PackageTags>pipeline;caching</PackageTags>
117
<PackageIcon>icon.png</PackageIcon>
128
<PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Pipeline/</PackageProjectUrl>
139
<PackageReleaseNotes>https://github.com/Stillpoint-Software/hyperbee.pipeline/releases/latest</PackageReleaseNotes>
14-
<TargetFrameworks>net8.0</TargetFrameworks>
1510
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1611
<Copyright>Stillpoint Software, Inc.</Copyright>
1712
<Title>Hyperbee Piplines Caching</Title>
@@ -35,11 +30,11 @@
3530
<Pack>True</Pack>
3631
<PackagePath>\</PackagePath>
3732
</None>
38-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
33+
<PackageReference Update="Microsoft.SourceLink.GitHub">
3934
<PrivateAssets>all</PrivateAssets>
4035
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4136
</PackageReference>
42-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.7" />
37+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
4338
</ItemGroup>
4439

4540
</Project>

‎test/Hyperbee.Pipeline.Auth.Tests/Hyperbee.Pipeline.Auth.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<Nullable>enable</Nullable>
75
<IsPackable>false</IsPackable>
86
<IsTestProject>true</IsTestProject>
97
</PropertyGroup>
108

119
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="6.0.4">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
17-
<PackageReference Include="MSTest.TestAdapter" Version="3.9.3" />
18-
<PackageReference Include="MSTest.TestFramework" Version="3.9.3" />
19-
<PackageReference Include="NSubstitute" Version="5.3.0" />
10+
<PackageReference Include="coverlet.collector" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12+
<PackageReference Include="MSTest.TestAdapter"/>
13+
<PackageReference Include="MSTest.TestFramework" />
14+
<PackageReference Include="NSubstitute" />
2015
</ItemGroup>
2116

2217
<ItemGroup>

‎test/Hyperbee.Pipeline.Tests/Hyperbee.Pipeline.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
43
<IsPackable>false</IsPackable>
4+
<IsTestProject>true</IsTestProject>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="MSTest.TestAdapter" Version="3.9.3" />
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
9-
<PackageReference Include="MSTest.TestFramework" Version="3.9.3" />
10-
<PackageReference Include="NSubstitute" Version="5.3.0" />
7+
<PackageReference Include="MSTest.TestAdapter" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
9+
<PackageReference Include="MSTest.TestFramework" />
10+
<PackageReference Include="NSubstitute" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\..\src\Hyperbee.Pipeline\Hyperbee.Pipeline.csproj" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
16+
<PackageReference Update="Microsoft.SourceLink.GitHub">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

0 commit comments

Comments
 (0)