Skip to content

Commit 7583476

Browse files
thohngthohng
committed
Add .NET 10.0
1 parent be9454d commit 7583476

11 files changed

Lines changed: 267 additions & 127 deletions

File tree

‎.github/workflows/dotnet-core.yml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ name: .NET Core
22

33
on:
44
push:
5-
branches: [main, "dev*", "dev/*"]
5+
branches:
6+
- main
7+
- feature/**
8+
- release/**
9+
- dev*
10+
- dev/**
611
tags: ["*.*.*"]
712
pull_request:
8-
branches: [main]
13+
branches:
14+
- main
15+
- release/**
916

1017
jobs:
1118
build:
@@ -21,18 +28,20 @@ jobs:
2128
with:
2229
fetch-depth: 0
2330

24-
- name: Setup .NET 8.0.x and 6.0.x
31+
- name: Setup .NET 10.0.x, 9.0.x, 8.0.x and 6.0.x
2532
uses: actions/setup-dotnet@v4
2633
with:
2734
dotnet-version: |
2835
6.0.x
2936
8.0.x
37+
9.0.x
38+
10.0.x
3039
31-
- name: Setup .NET 9.0.x Preview
32-
uses: actions/setup-dotnet@v4
33-
with:
34-
dotnet-version: 9.0.x
35-
dotnet-quality: 'preview'
40+
# - name: Setup .NET 10.0.x Preview
41+
# uses: actions/setup-dotnet@v4
42+
# with:
43+
# dotnet-version: 10.0.x
44+
# dotnet-quality: "preview"
3645

3746
- name: dotnet info
3847
run: dotnet --info
@@ -49,13 +58,13 @@ jobs:
4958
- name: Pack
5059
run: dotnet pack src/ClockProvider -c Release -o ./artifacts/packages/ --no-build --verbosity normal
5160

52-
- if: ${{ success() && runner.os == 'Windows' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) }}
61+
- if: ${{ success() && runner.os == 'Windows' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') || contains(github.ref, 'refs/heads/release/')) }}
5362
name: Publish Nuget main to MyGet, GitHub and CloudSmith
5463
run: |
5564
dotnet nuget push .\artifacts\packages\*.nupkg -s https://www.myget.org/F/netlah/api/v2/package -k ${{ secrets.MYGET }}
5665
dotnet nuget push .\artifacts\packages\*.nupkg -s https://nuget.pkg.github.com/NetLah/index.json --skip-duplicate -k ${{ secrets.PUSH_GITHUB_REGISTRY_TOKEN }}
5766
dotnet nuget push .\artifacts\packages\*.nupkg -s https://nuget.cloudsmith.io/netlah/net-main1/v3/index.json --skip-duplicate -k ${{ secrets.PUSH_CLOUDSMITH_TOKEN }}
5867
5968
- name: Push CloudSmith dev
60-
if: ${{ success() && runner.os == 'Windows' && (startsWith(github.ref, 'refs/heads/dev')) }}
69+
if: ${{ success() && runner.os == 'Windows' && (startsWith(github.ref, 'refs/heads/dev') || startsWith(github.ref, 'refs/heads/feature')) }}
6170
run: dotnet nuget push .\artifacts\packages\*.nupkg -s https://nuget.cloudsmith.io/netlah/net-dev1/v3/index.json --skip-duplicate -k ${{ secrets.PUSH_CLOUDSMITH_TOKEN }}

‎Common.props‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<CurrentFrameworkVersion>6.0.33;8.0.8;9.0.0-preview.7</CurrentFrameworkVersion>
4+
<CurrentFrameworkVersion>8.0.22;9.0.11;10.0.0</CurrentFrameworkVersion>
55
<ImportedCommonProps>True</ImportedCommonProps>
66

77
<NET_ID>$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))</NET_ID>
@@ -18,6 +18,7 @@
1818
<NET_8_0>False</NET_8_0>
1919
<NET_9_0>False</NET_9_0>
2020
<NET_10_0>False</NET_10_0>
21+
<NET_11_0>False</NET_11_0>
2122

2223
<NET_STD_2_0 Condition="'$(NET_VER)' == '2.0' And '$(NET_ID)' == '.NETStandard'">True</NET_STD_2_0>
2324
<NET_STD_2_1 Condition="'$(NET_VER)' == '2.1' And '$(NET_ID)' == '.NETStandard'">True</NET_STD_2_1>
@@ -29,6 +30,7 @@
2930
<NET_8_0 Condition="'$(NET_VER)' == '8.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_8_0>
3031
<NET_9_0 Condition="'$(NET_VER)' == '9.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_9_0>
3132
<NET_10_0 Condition="'$(NET_VER)' == '10.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_10_0>
33+
<NET_11_0 Condition="'$(NET_VER)' == '11.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_11_0>
3234

3335
<NET_3_1_LESS>False</NET_3_1_LESS>
3436
<NET_3_1_UP>False</NET_3_1_UP>
@@ -42,18 +44,26 @@
4244
<NET_8_0_UP>False</NET_8_0_UP>
4345
<NET_9_0_LESS>False</NET_9_0_LESS>
4446
<NET_9_0_UP>False</NET_9_0_UP>
45-
<NET_3_1_LESS Condition="'$(NET_VER)' &lt;= '3.1' And '$(NET_ID)' == '.NETCoreApp'">True</NET_3_1_LESS>
46-
<NET_3_1_UP Condition="'$(NET_VER)' &gt;= '3.1' And '$(NET_ID)' == '.NETCoreApp'">True</NET_3_1_UP>
47-
<NET_5_0_LESS Condition="'$(NET_VER)' &lt; '6.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_5_0_LESS>
48-
<NET_5_0_UP Condition="'$(NET_VER)' &gt;= '5.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_5_0_UP>
49-
<NET_6_0_LESS Condition="'$(NET_VER)' &lt; '7.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_6_0_LESS>
50-
<NET_6_0_UP Condition="'$(NET_VER)' &gt;= '6.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_6_0_UP>
51-
<NET_7_0_LESS Condition="'$(NET_VER)' &lt; '8.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_7_0_LESS>
52-
<NET_7_0_UP Condition="'$(NET_VER)' &gt;= '7.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_7_0_UP>
53-
<NET_8_0_LESS Condition="'$(NET_VER)' &lt;= '8.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_8_0_LESS>
54-
<NET_8_0_UP Condition="'$(NET_VER)' &gt;= '8.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_8_0_UP>
55-
<NET_9_0_LESS Condition="'$(NET_VER)' &lt;= '9.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_9_0_LESS>
56-
<NET_9_0_UP Condition="'$(NET_VER)' &gt;= '9.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_9_0_UP>
47+
<NET_10_0_LESS>False</NET_10_0_LESS>
48+
<NET_10_0_UP>False</NET_10_0_UP>
49+
<NET_11_0_LESS>False</NET_11_0_LESS>
50+
<NET_11_0_UP>False</NET_11_0_UP>
51+
<NET_3_1_LESS Condition="'$(NET_10_0)' != true And '$(NET_11_0)' != true And '$(NET_VER)' &lt;= '3.1' And '$(NET_ID)' == '.NETCoreApp'">True</NET_3_1_LESS>
52+
<NET_3_1_UP Condition="'$(NET_10_0)' == true Or '$(NET_11_0)' == true Or ('$(NET_VER)' &gt;= '3.1' And '$(NET_ID)' == '.NETCoreApp')">True</NET_3_1_UP>
53+
<NET_5_0_LESS Condition="'$(NET_5_0)' == true Or '$(NET_3_1_LESS)' == true">True</NET_5_0_LESS>
54+
<NET_5_0_UP Condition="'$(NET_10_0)' == true Or '$(NET_11_0)' == true Or ('$(NET_VER)' &gt;= '5.0' And '$(NET_ID)' == '.NETCoreApp')">True</NET_5_0_UP>
55+
<NET_6_0_LESS Condition="'$(NET_6_0)' == true Or '$(NET_5_0_LESS)' == true">True</NET_6_0_LESS>
56+
<NET_6_0_UP Condition="'$(NET_10_0)' == true Or '$(NET_11_0)' == true Or ('$(NET_VER)' &gt;= '6.0' And '$(NET_ID)' == '.NETCoreApp')">True</NET_6_0_UP>
57+
<NET_7_0_LESS Condition="'$(NET_7_0)' == true Or '$(NET_6_0_LESS)' == true">True</NET_7_0_LESS>
58+
<NET_7_0_UP Condition="'$(NET_10_0)' == true Or '$(NET_11_0)' == true Or ('$(NET_VER)' &gt;= '7.0' And '$(NET_ID)' == '.NETCoreApp')">True</NET_7_0_UP>
59+
<NET_8_0_LESS Condition="'$(NET_8_0)' == true Or '$(NET_7_0_LESS)' == true">True</NET_8_0_LESS>
60+
<NET_8_0_UP Condition="'$(NET_10_0)' == true Or '$(NET_11_0)' == true Or ('$(NET_VER)' &gt;= '8.0' And '$(NET_ID)' == '.NETCoreApp')">True</NET_8_0_UP>
61+
<NET_9_0_LESS Condition="'$(NET_9_0)' == true Or '$(NET_8_0_LESS)' == true">True</NET_9_0_LESS>
62+
<NET_9_0_UP Condition="'$(NET_10_0)' == true Or '$(NET_11_0)' == true Or ('$(NET_VER)' &gt;= '9.0' And '$(NET_ID)' == '.NETCoreApp')">True</NET_9_0_UP>
63+
<NET_10_0_LESS Condition="'$(NET_10_0)' == true Or '$(NET_9_0_LESS)' == true">True</NET_10_0_LESS>
64+
<NET_10_0_UP Condition="'$(NET_10_0)' == true Or '$(NET_11_0)' == true">True</NET_10_0_UP>
65+
<NET_11_0_LESS Condition="'$(NET_11_0)' == true Or '$(NET_10_0_LESS)' == true">True</NET_11_0_LESS>
66+
<NET_11_0_UP Condition="'$(NET_11_0)' == true">True</NET_11_0_UP>
5767

5868
<NET_3_1_LESS_OR_STD>False</NET_3_1_LESS_OR_STD>
5969
<NET_3_1_UP_OR_STD>False</NET_3_1_UP_OR_STD>
@@ -67,6 +77,10 @@
6777
<NET_8_0_UP_OR_STD>False</NET_8_0_UP_OR_STD>
6878
<NET_9_0_LESS_OR_STD>False</NET_9_0_LESS_OR_STD>
6979
<NET_9_0_UP_OR_STD>False</NET_9_0_UP_OR_STD>
80+
<NET_10_0_LESS_OR_STD>False</NET_10_0_LESS_OR_STD>
81+
<NET_10_0_UP_OR_STD>False</NET_10_0_UP_OR_STD>
82+
<NET_11_0_LESS_OR_STD>False</NET_11_0_LESS_OR_STD>
83+
<NET_11_0_UP_OR_STD>False</NET_11_0_UP_OR_STD>
7084
<NET_3_1_LESS_OR_STD Condition="'$(NET_3_1_LESS)' == true Or '$(NET_STD_2_X)' == true">True</NET_3_1_LESS_OR_STD>
7185
<NET_3_1_UP_OR_STD Condition="'$(NET_3_1_UP)' == true Or '$(NET_STD_2_X)' == true">True</NET_3_1_UP_OR_STD>
7286
<NET_5_0_LESS_OR_STD Condition="'$(NET_5_0_LESS)' == true Or '$(NET_STD_2_X)' == true">True</NET_5_0_LESS_OR_STD>
@@ -79,6 +93,10 @@
7993
<NET_8_0_UP_OR_STD Condition="'$(NET_8_0_UP)' == true Or '$(NET_STD_2_X)' == true">True</NET_8_0_UP_OR_STD>
8094
<NET_9_0_LESS_OR_STD Condition="'$(NET_9_0_LESS)' == true Or '$(NET_STD_2_X)' == true">True</NET_9_0_LESS_OR_STD>
8195
<NET_9_0_UP_OR_STD Condition="'$(NET_9_0_UP)' == true Or '$(NET_STD_2_X)' == true">True</NET_9_0_UP_OR_STD>
96+
<NET_10_0_LESS_OR_STD Condition="'$(NET_10_0_LESS)' == true Or '$(NET_STD_2_X)' == true">True</NET_10_0_LESS_OR_STD>
97+
<NET_10_0_UP_OR_STD Condition="'$(NET_10_0_UP)' == true Or '$(NET_STD_2_X)' == true">True</NET_10_0_UP_OR_STD>
98+
<NET_11_0_LESS_OR_STD Condition="'$(NET_11_0_LESS)' == true Or '$(NET_STD_2_X)' == true">True</NET_11_0_LESS_OR_STD>
99+
<NET_11_0_UP_OR_STD Condition="'$(NET_11_0_UP)' == true Or '$(NET_STD_2_X)' == true">True</NET_11_0_UP_OR_STD>
82100

83101
</PropertyGroup>
84102

0 commit comments

Comments
 (0)