Skip to content

Commit b69d3b0

Browse files
varndellwagglebeevarndellwagglebee
committed
Merge branch 'develop'
2 parents 3902a04 + 5beb8d4 commit b69d3b0

11 files changed

Lines changed: 49 additions & 24 deletions

File tree

‎.github/workflows/format.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
- develop
1616

1717
env:
18-
DOTNET_VERSION: '8.0.x'
18+
DOTNET_VERSION: '9.0.x'
1919

2020
jobs:
2121
format:

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
env:
99
BRANCH_NAME: ${{ github.event.release.target_commitish }}
1010
SOLUTION_NAME: ${{ vars.SOLUTION_NAME }}
11-
DOTNET_VERSION: '8.0.x'
11+
DOTNET_VERSION: '9.0.x'
1212
NUGET_SOURCE: 'https://api.nuget.org/v3/index.json'
1313
BUILD_CONFIGURATION: ''
1414
VERSION_SUFFIX: ''

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
env:
1818
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
1919
SOLUTION_NAME: ${{ vars.SOLUTION_NAME }}
20-
DOTNET_VERSION: '8.0.x'
20+
DOTNET_VERSION: '9.0.x'
2121

2222
jobs:
2323
test:

‎.github/workflows/unlist-nuget.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Unlist NuGet
2+
3+
on:
4+
workflow_dispatch:
5+
# release:
6+
# types: [deleted]
7+
8+
env:
9+
BRANCH_NAME: ${{ github.event.release.target_commitish }}
10+
PROJECT_NAME: ${{ vars.PROJECT_NAME }}
11+
12+
jobs:
13+
publish:
14+
name: unlist on nuget
15+
runs-on: windows-latest
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
20+
# Unlist
21+
- name: Unlist Deleted Tag
22+
uses: darenm/unlist-nuget@v1
23+
with:
24+
NUGET_PACKAGE: ${{ env.PROJECT_NAME }} # Full Package ID
25+
VERSION_REGEX: ${{ github.event.release.tag_name }} # Regex pattern to match version
26+
NUGET_KEY: ${{ secrets.NUGET_API_KEY }} # nuget.org API key

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<!-- Solution version numbers -->
33
<PropertyGroup>
4-
<MajorVersion>2</MajorVersion>
4+
<MajorVersion>3</MajorVersion>
55
<MinorVersion>0</MinorVersion>
6-
<PatchVersion>1</PatchVersion>
6+
<PatchVersion>0</PatchVersion>
77
</PropertyGroup>
88
<!-- Disable automatic package publishing -->
99
<PropertyGroup>

‎Hyperbee.Json.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
2828
.github\workflows\publish.yml = .github\workflows\publish.yml
2929
.github\workflows\test-report.yml = .github\workflows\test-report.yml
3030
.github\workflows\test.yml = .github\workflows\test.yml
31+
.github\workflows\unlist-nuget.yml = .github\workflows\unlist-nuget.yml
3132
.github\workflows\update-version.yml = .github\workflows\update-version.yml
3233
EndProjectSection
3334
EndProject

‎docs/_includes/nav_footer_custom.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<footer class="site-footer">
22
Hyperbee Json Docs
3-
</footer>
3+
</footer>#*

‎src/Hyperbee.Json/Hyperbee.Json.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<IsPackable>true</IsPackable>
66

@@ -9,7 +9,7 @@
99
<PackageTags>json-path;jsonpath;json-pointer;jsonpointer;json-patch;jsonpatch;query;path;patch;diff;json;rfc9535;rfc6901;rfc6902</PackageTags>
1010
<PackageIcon>icon.png</PackageIcon>
1111
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.json/</PackageProjectUrl>
12-
<TargetFrameworks>net8.0</TargetFrameworks>
12+
<TargetFrameworks>net9.0</TargetFrameworks>
1313
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1414
<Copyright>Stillpoint Software, Inc.</Copyright>
1515
<Title>Hyperbee Json</Title>

‎test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
@@ -17,8 +17,8 @@
1717
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
1818
<PackageReference Include="JsonCons.JsonPath" Version="1.1.0" />
1919
<PackageReference Include="JsonPatch.Net" Version="3.1.1" />
20-
<PackageReference Include="JsonPath.Net" Version="1.1.4" />
21-
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.7" />
20+
<PackageReference Include="JsonPath.Net" Version="1.1.6" />
21+
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.0" />
2222
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2323
</ItemGroup>
2424

‎test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -14,10 +14,9 @@
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
18-
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
19-
<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
20-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
19+
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
2120
</ItemGroup>
2221

2322
<ItemGroup>

0 commit comments

Comments
 (0)