Skip to content

Commit 9c7a468

Browse files
HavenDVHavenDV
committed
feat: Update to net9.
1 parent 137d356 commit 9c7a468

File tree

10 files changed

+34
-19
lines changed

10 files changed

+34
-19
lines changed

‎.github/workflows/auto-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
auto-merge:
1313
runs-on: ubuntu-latest
14-
if: ${{ (github.actor == 'dependabot[bot]' || github.actor == 'HavenDV') && github.repository_owner == 'tryAGI' }}
14+
if: ${{ github.event.pull_request.draft == false && (github.actor == 'dependabot[bot]' || github.actor == 'HavenDV') && github.repository_owner == 'tryAGI' }}
1515
steps:
1616
- name: Dependabot metadata
1717
if: ${{ github.actor == 'dependabot[bot]' }}

‎.github/workflows/auto-update.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ jobs:
2929
git checkout -b ${{ steps.branch.outputs.branch_name }} origin/main
3030
git rebase main
3131
32+
- name: Setup .NET
33+
uses: actions/setup-dotnet@v4
34+
with:
35+
dotnet-version: 9.0.x
36+
3237
- name: Generate code
3338
run: |
3439
cd src/libs/HuggingFace

‎.github/workflows/mkdocs.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,20 @@ jobs:
3232
- name: Setup Pages
3333
uses: actions/configure-pages@v5
3434

35-
- name: Install dependencies
36-
run: pip install mkdocs-material
35+
- name: Setup .NET
36+
uses: actions/setup-dotnet@v4
37+
with:
38+
dotnet-version: 9.0.x
3739

3840
- name: Generate docs
3941
run: dotnet run --project src/helpers/GenerateDocs/GenerateDocs.csproj .
4042

4143
- name: Build with MkDocs
42-
run: mkdocs build -d ./_site
44+
run: |
45+
python -m venv myenv
46+
source myenv/bin/activate
47+
pip install mkdocs-material
48+
mkdocs build -d ./_site
4349
4450
- name: Upload artifact
4551
uses: actions/upload-pages-artifact@v3

‎.github/workflows/pull-request.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
jobs:
88
test:
99
name: Test
10+
if: github.event.pull_request.draft == false
1011
uses: HavenDV/workflows/.github/workflows/dotnet_build-test-publish.yml@main
1112
with:
1213
generate-build-number: false

‎HuggingFace.sln‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
LICENSE = LICENSE
1212
docs\openapi.yaml = docs\openapi.yaml
1313
README.md = README.md
14-
.github\workflows\pull-request.yml = .github\workflows\pull-request.yml
15-
.github\workflows\auto-merge.yml = .github\workflows\auto-merge.yml
16-
.github\workflows\auto-update.yml = .github\workflows\auto-update.yml
17-
.github\workflows\mkdocs.yml = .github\workflows\mkdocs.yml
1814
EndProjectSection
1915
EndProject
2016
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{61E7E11E-4558-434C-ACE8-06316A3097B3}"
@@ -36,6 +32,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateDocs", "src\helpers
3632
EndProject
3733
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrimmingHelper", "src\helpers\TrimmingHelper\TrimmingHelper.csproj", "{09123BEF-FA17-43F9-9079-668A0AFE345D}"
3834
EndProject
35+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{BE082135-26FA-4463-9010-3FA0F02E5247}"
36+
ProjectSection(SolutionItems) = preProject
37+
.github\workflows\auto-merge.yml = .github\workflows\auto-merge.yml
38+
.github\workflows\auto-update.yml = .github\workflows\auto-update.yml
39+
.github\workflows\mkdocs.yml = .github\workflows\mkdocs.yml
40+
.github\workflows\pull-request.yml = .github\workflows\pull-request.yml
41+
EndProjectSection
42+
EndProject
3943
Global
4044
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4145
Debug|Any CPU = Debug|Any CPU
@@ -72,6 +76,7 @@ Global
7276
{ADEF41C1-879B-4FA3-907B-5445F625690C} = {A5A32AAF-6934-4380-9E7D-2DD73EC6E362}
7377
{F04DA4A2-E231-4355-BB82-B55AE6DC5424} = {A5A32AAF-6934-4380-9E7D-2DD73EC6E362}
7478
{09123BEF-FA17-43F9-9079-668A0AFE345D} = {A5A32AAF-6934-4380-9E7D-2DD73EC6E362}
79+
{BE082135-26FA-4463-9010-3FA0F02E5247} = {E793AF18-4371-4EBD-96FC-195EB1798855}
7580
EndGlobalSection
7681
GlobalSection(ExtensibilityGlobals) = postSolution
7782
SolutionGuid = {CED9A020-DBA5-4BE6-8096-75E528648EC1}

‎src/helpers/FixOpenApiSpec/FixOpenApiSpec.csproj‎

Lines changed: 1 addition & 1 deletion
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
<OutputType>Exe</OutputType>
66
<LangVersion>preview</LangVersion>
77
<Nullable>enable</Nullable>

‎src/helpers/GenerateDocs/GenerateDocs.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

‎src/helpers/TrimmingHelper/TrimmingHelper.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77

88
<PublishTrimmed>true</PublishTrimmed>

‎src/libs/HuggingFace/HuggingFace.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net4.6.2;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net4.6.2;net8.0;net9.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);CA1034</NoWarn>
66
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
77
</PropertyGroup>
@@ -18,11 +18,11 @@
1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
2020
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.0.1-preview.1.24570.5" />
21-
<PackageReference Include="PolySharp" Version="1.14.1">
21+
<PackageReference Include="PolySharp" Version="1.15.0">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>
25-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
25+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
2626
</ItemGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'net4.6.2'">

‎src/tests/HuggingFace.IntegrationTests/HuggingFace.IntegrationTests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66

7-
<ItemGroup Label="Base packages">
7+
<ItemGroup>
8+
<PackageReference Include="MSTest" Version="3.6.3" />
89
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
910
<PrivateAssets>all</PrivateAssets>
1011
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1112
</PackageReference>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
14-
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
1513
<PackageReference Include="FluentAssertions" Version="6.12.2" />
1614
</ItemGroup>
1715

0 commit comments

Comments
 (0)