Skip to content

Commit 141336d

Browse files
NoggogNoggog
committed
Net9 update
1 parent 0de2cf9 commit 141336d

File tree

7 files changed

+26
-27
lines changed

7 files changed

+26
-27
lines changed

‎.github/workflows/ci-build.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ name: Build
33
on:
44
push:
55
branches:
6-
- master
6+
- main
7+
- dev
78
pull_request:
8-
branches: [ master ]
9+
branches:
10+
- main
11+
- dev
912

1013
jobs:
1114
build:
@@ -19,11 +22,11 @@ jobs:
1922
steps:
2023
- uses: actions/checkout@v4
2124
with:
22-
fetch-depth: 400
23-
- name: Setup .NET 8
25+
fetch-depth: 0
26+
- name: Setup .NET 9
2427
uses: actions/setup-dotnet@v4
2528
with:
26-
dotnet-version: 8.0.*
29+
dotnet-version: 9.0.*
2730
- name: Install dependencies
2831
run: |
2932
dotnet clean -c Release && dotnet nuget locals all --clear

‎.github/workflows/ci-publish.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v4
2222
with:
23-
fetch-depth: 400
23+
fetch-depth: 0
2424

2525
- name: Get Activity Short Circuit
2626
id: check
@@ -53,11 +53,11 @@ jobs:
5353
steps:
5454
- uses: actions/checkout@v4
5555
with:
56-
fetch-depth: 400
57-
- name: Setup .NET 8
56+
fetch-depth: 0
57+
- name: Setup .NET 9
5858
uses: actions/setup-dotnet@v4
5959
with:
60-
dotnet-version: 8.0.*
60+
dotnet-version: 9.0.*
6161
- name: Install dependencies
6262
run: |
6363
dotnet clean -c Release && dotnet nuget locals all --clear
@@ -79,11 +79,11 @@ jobs:
7979
format: YYYYMMDD-HHmmSS
8080
- uses: actions/checkout@v4
8181
with:
82-
fetch-depth: 400
83-
- name: Setup .NET 8
82+
fetch-depth: 0
83+
- name: Setup .NET 9
8484
uses: actions/setup-dotnet@v4
8585
with:
86-
dotnet-version: 8.0.*
86+
dotnet-version: 9.0.*
8787
- name: Install dependencies
8888
run: |
8989
dotnet clean -c Release && dotnet nuget locals all --clear
@@ -93,7 +93,7 @@ jobs:
9393
- name: Pack Preview
9494
if: ${{ success() && (github.event.release.prerelease || github.event_name != 'release') }}
9595
run: |
96-
dotnet pack -c Release --no-build --no-restore -o out --version-suffix "nightly-${{ steps.current-time.outputs.formattedTime }}" --include-symbols -p:SymbolPackageFormat=snupkg
96+
dotnet pack -c Release --no-build --no-restore -o out --include-symbols -p:SymbolPackageFormat=snupkg
9797
- name: Pack Release
9898
if: ${{ success() && !github.event.release.prerelease && github.event_name == 'release' }}
9999
run: |
@@ -116,8 +116,8 @@ jobs:
116116
steps:
117117
- uses: actions/checkout@v4
118118
with:
119-
fetch-depth: 400
120-
- name: Reset nightly to master
119+
fetch-depth: 0
120+
- name: Reset nightly to main
121121
run: |
122122
head_sha=$(git rev-parse --verify HEAD)
123123
echo "head_sha=$head_sha"

‎Directory.Build.targets

-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@
44
<Exec Condition="'$(IsWindows)'=='true' And $(PackageId) != ''" Command="RD /S /Q &quot;%25USERPROFILE%25\.nuget\packages\$(PackageId)&quot;" />
55
<Exec Condition="'$(IsLinux)'=='true' And $(PackageId) != ''" Command="rm -rf &quot;%25USERPROFILE%25\.nuget\packages\$(PackageId)&quot;" />
66
</Target>
7-
8-
<PropertyGroup Condition="'$(GITVERSION_NO_BUILD)' != 'true'">
9-
<GitVersionTask>true</GitVersionTask>
10-
</PropertyGroup>
117

128
</Project>

‎Directory.Packages.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="GitVersion.MsBuild" Version="6.0.5" />
4-
<PackageVersion Include="Noggog.CSharpExt" Version="2.67.3" />
5-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
6-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
3+
<PackageVersion Include="GitVersion.MsBuild" Version="6.0.5" />
4+
<PackageVersion Include="Noggog.CSharpExt" Version="2.68.0" />
5+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
6+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
77
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
8-
<PackageVersion Include="xunit" Version="2.9.0" />
8+
<PackageVersion Include="xunit" Version="2.9.2" />
99
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎Loqui.Generation/Loqui.Generation.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<LangVersion>Latest</LangVersion>
66
</PropertyGroup>
77

‎Loqui.Tests/Loqui.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
<ItemGroup>

‎Loqui/Loqui.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;netstandard2.0</TargetFrameworks>
55
<LangVersion>Latest</LangVersion>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<LangVersion>preview</LangVersion>

0 commit comments

Comments
 (0)