Skip to content

Commit 5b0ef94

Browse files
viceroypenguinviceroypenguin
authored
Modernize repository to match other ImmediatePlatform products (#84)
1 parent 7cd4f68 commit 5b0ef94

10 files changed

Lines changed: 77 additions & 70 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020

2121
- name: Setup .NET
22-
uses: actions/setup-dotnet@v4
22+
uses: actions/setup-dotnet@v5
2323
with:
2424
dotnet-version: |
2525
8.0.x
2626
9.0.x
27+
10.0.x
2728
2829
- name: Restore dependencies
2930
run: dotnet restore
3031
- name: Build
3132
run: dotnet build -c Release --no-restore
3233
- name: Test
33-
run: dotnet test -c Release --no-build --logger GitHubActions
34+
run: dotnet test -c Release --no-build
3435

3536
- name: Upload coverage reports to Codecov with GitHub Action
3637
uses: codecov/codecov-action@v5

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,24 @@ on:
66
tags:
77
- '**'
88

9-
permissions:
10-
contents: write
11-
129
jobs:
1310
release:
11+
permissions:
12+
id-token: write # enable GitHub OIDC token issuance for this job
13+
contents: write # enable github releases
1414

1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919

2020
- name: Setup .NET
21-
uses: actions/setup-dotnet@v4
21+
uses: actions/setup-dotnet@v5
2222
with:
2323
dotnet-version: |
2424
8.0.x
2525
9.0.x
26+
10.0.x
2627
2728
- name: Restore dependencies
2829
run: dotnet restore
@@ -31,8 +32,15 @@ jobs:
3132

3233
- name: Package
3334
run: dotnet pack -c Release --no-build --property:PackageOutputPath=../../nupkgs
35+
36+
- name: NuGet login (OIDC → temp API key)
37+
uses: NuGet/login@v1
38+
id: login
39+
with:
40+
user: viceroypenguin
41+
3442
- name: Push to Nuget
35-
run: dotnet nuget push "./nupkgs/*.nupkg" --source "https://api.nuget.org/v3/index.json" --api-key ${{ secrets.NUGETPUBLISHKEY }}
43+
run: dotnet nuget push "./nupkgs/*.nupkg" --source "https://api.nuget.org/v3/index.json" --api-key ${{ steps.login.outputs.NUGET_API_KEY }}
3644

3745
- name: Create Release
3846
uses: ncipollo/release-action@v1

‎Directory.Build.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<LangVersion>latest</LangVersion>
3+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
4+
<LangVersion>14</LangVersion>
45

56
<Nullable>enable</Nullable>
67
<WarningsAsErrors>$(WarningsAsErrors);nullable;</WarningsAsErrors>
@@ -11,12 +12,12 @@
1112
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1213

1314
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1515

1616
<IsPackable>false</IsPackable>
1717
</PropertyGroup>
1818

1919
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
20+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2021
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
2122
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2223
<CollectCoverage>true</CollectCoverage>

‎Directory.Packages.props‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
<ItemGroup>
77
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
88
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
9-
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
10-
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
11-
<PackageVersion Include="Immediate.Handlers" Version="2.1.0" />
12-
<PackageVersion Include="MinVer" Version="6.0.0" />
13-
<PackageVersion Include="TUnit.Engine" Version="0.19.86" />
14-
<PackageVersion Include="xunit.v3.assert" Version="2.0.1" />
9+
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="2.0.2" />
10+
<PackageVersion Include="Immediate.Handlers" Version="3.1.0" />
11+
<PackageVersion Include="MinVer" Version="7.0.0" />
12+
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
1513
</ItemGroup>
1614

1715
<ItemGroup Condition="$(TargetFramework) == 'net8.0'">
@@ -22,14 +20,21 @@
2220
</ItemGroup>
2321

2422
<ItemGroup Condition="$(TargetFramework) == 'net9.0'">
25-
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.4" />
26-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
27-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
28-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
23+
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.12" />
24+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.12" />
25+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.12" />
26+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.12" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition="$(TargetFramework) == 'net10.0'">
30+
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.2" />
31+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.2" />
32+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
33+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
2934
</ItemGroup>
3035

3136
<ItemGroup>
32-
<GlobalPackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="All" />
33-
<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.197" PrivateAssets="All" />
37+
<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.298" PrivateAssets="All" />
38+
<GlobalPackageReference Include="Meziantou.Polyfill" Version="1.0.101" PrivateAssets="All" />
3439
</ItemGroup>
3540
</Project>

‎Immediate.Cache.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<File Path=".gitignore" />
66
<File Path="Directory.Build.props" />
77
<File Path="Directory.Packages.props" />
8+
<File Path="global.json" />
89
<File Path="readme.md" />
910
</Folder>
1011
<Folder Name="/.root/workflows/">

‎global.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"test": {
3+
"runner": "Microsoft.Testing.Platform"
4+
}
5+
}

‎src/Immediate.Cache.Shared/Immediate.Cache.Shared.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
54
<RootNamespace>Immediate.Cache</RootNamespace>
65
</PropertyGroup>
76

@@ -12,8 +11,4 @@
1211
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
1312
</ItemGroup>
1413

15-
<ItemGroup>
16-
<Using Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Alias="Lock" Include="System.Object" />
17-
</ItemGroup>
18-
1914
</Project>

‎src/Immediate.Cache/Immediate.Cache.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
54
<IsPackable>true</IsPackable>
65
<IncludeBuildOutput>false</IncludeBuildOutput>
76
</PropertyGroup>

0 commit comments

Comments
 (0)