Skip to content

Commit 161a2f3

Browse files
authored
Support .NET 9.0 (#9)
* Add .NET 9.0; Remove .NET 7.0, .NET 5.0 and .NETCoreApp 3.1.0 * Drop unused TeamCity.VSTest.TestAdapter * Consolidate Directory.Build.targets * Update Github Actions * Update README * Refactor * Add Upload artifacts * Refactor Github Actions
1 parent e5b33e1 commit 161a2f3

17 files changed

+241
-138
lines changed

.azure/pipelines/azure-pipelines.yml

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ strategy:
2121
matrix:
2222
linux:
2323
imageName: "ubuntu-latest"
24-
mac:
25-
imageName: "macos-latest"
24+
# mac:
25+
# imageName: "macos-latest"
2626
windows:
2727
imageName: "windows-latest"
2828
maxParallel: 3
@@ -32,30 +32,20 @@ pool:
3232

3333
steps:
3434
- task: UseDotNet@2
35-
displayName: "Use .NET SDK 8.x"
35+
displayName: "Use .NET SDK 9.x"
3636
inputs:
37-
version: 8.x
37+
version: 9.x
3838

3939
- task: UseDotNet@2
40-
displayName: "Use .NET SDK 7.x"
40+
displayName: "Use .NET SDK 8.x"
4141
inputs:
42-
version: 7.x
43-
42+
version: 8.x
43+
4444
- task: UseDotNet@2
4545
displayName: "Use .NET SDK 6.x"
4646
inputs:
4747
version: 6.x
48-
49-
- task: UseDotNet@2
50-
displayName: "Use .NET SDK 5.x"
51-
inputs:
52-
version: 5.x
53-
54-
- task: UseDotNet@2
55-
displayName: "Use .NET Core SDK 3.1.x"
56-
inputs:
57-
version: 3.1.x
58-
48+
5949
- script: dotnet --info
6050
displayName: "dotnet info"
6151

.github/workflows/dotnet-core.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: .NET Core
22

33
on:
44
push:
5-
branches: [main, "dev*"]
5+
branches: [main, "dev*", "dev/*"]
66
tags: ["*.*.*"]
77
pull_request:
88
branches: [main]
@@ -12,23 +12,22 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
runs-on: [macos-11, ubuntu-22.04, windows-latest]
15+
#runs-on: [macos-latest, ubuntu-22.04, windows-latest]
16+
runs-on: [ubuntu-22.04, windows-latest]
1617
name: ${{ matrix.runs-on }}
1718
runs-on: ${{ matrix.runs-on }}
1819
steps:
19-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2021
with:
2122
fetch-depth: 0
2223

23-
- name: Setup .NET Core 8.0.x, 7.0.x, 6.0.x, 5.0.x and 3.1.x
24-
uses: actions/setup-dotnet@v3
24+
- name: Setup .NET Core 9.0.x, 8.0.x and 6.0.x
25+
uses: actions/setup-dotnet@v4
2526
with:
2627
dotnet-version: |
27-
3.1.x
28-
5.0.x
2928
6.0.x
30-
7.0.x
3129
8.0.x
30+
9.0.x
3231
3332
- name: dotnet info
3433
run: dotnet --info
@@ -45,6 +44,13 @@ jobs:
4544
- name: Pack
4645
run: dotnet pack -c Release -o ./artifacts/packages/ --no-build --verbosity normal
4746

47+
- name: Upload artifacts
48+
if: ${{ success() && runner.os == 'Windows' && github.event_name == 'push' }}
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: DotnetAppSettings
52+
path: artifacts/packages
53+
4854
- if: ${{ success() && runner.os == 'Windows' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) }}
4955
name: Push MyGet
5056
run: dotnet nuget push .\artifacts\packages\*.nupkg -s https://www.myget.org/F/netlah/api/v2/package -k ${{ secrets.MYGET }}

Common.props

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

33
<PropertyGroup>
4-
<CurrentFrameworkVersion>6.0.26;7.0.15;8.0.1</CurrentFrameworkVersion>
4+
<CurrentFrameworkVersion>6.0.36;8.0.11;9.0.0</CurrentFrameworkVersion>
55
<ImportedCommonProps>True</ImportedCommonProps>
66

77
<NET_ID>$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))</NET_ID>
@@ -31,39 +31,59 @@
3131
<NET_10_0 Condition="'$(NET_VER)' == '10.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_10_0>
3232

3333
<NET_3_1_LESS>False</NET_3_1_LESS>
34+
<NET_3_1_UP>False</NET_3_1_UP>
3435
<NET_5_0_LESS>False</NET_5_0_LESS>
36+
<NET_5_0_UP>False</NET_5_0_UP>
3537
<NET_6_0_LESS>False</NET_6_0_LESS>
3638
<NET_6_0_UP>False</NET_6_0_UP>
3739
<NET_7_0_LESS>False</NET_7_0_LESS>
3840
<NET_7_0_UP>False</NET_7_0_UP>
3941
<NET_8_0_LESS>False</NET_8_0_LESS>
4042
<NET_8_0_UP>False</NET_8_0_UP>
43+
<NET_9_0_LESS>False</NET_9_0_LESS>
44+
<NET_9_0_UP>False</NET_9_0_UP>
4145
<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>
4247
<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>
4349
<NET_6_0_LESS Condition="'$(NET_VER)' &lt; '7.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_6_0_LESS>
4450
<NET_6_0_UP Condition="'$(NET_VER)' &gt;= '6.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_6_0_UP>
4551
<NET_7_0_LESS Condition="'$(NET_VER)' &lt; '8.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_7_0_LESS>
4652
<NET_7_0_UP Condition="'$(NET_VER)' &gt;= '7.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_7_0_UP>
4753
<NET_8_0_LESS Condition="'$(NET_VER)' &lt;= '8.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_8_0_LESS>
4854
<NET_8_0_UP Condition="'$(NET_VER)' &gt;= '8.0' And '$(NET_ID)' == '.NETCoreApp'">True</NET_8_0_UP>
49-
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>
57+
5058
<NET_3_1_LESS_OR_STD>False</NET_3_1_LESS_OR_STD>
59+
<NET_3_1_UP_OR_STD>False</NET_3_1_UP_OR_STD>
5160
<NET_5_0_LESS_OR_STD>False</NET_5_0_LESS_OR_STD>
61+
<NET_5_0_UP_OR_STD>False</NET_5_0_UP_OR_STD>
5262
<NET_6_0_LESS_OR_STD>False</NET_6_0_LESS_OR_STD>
5363
<NET_6_0_UP_OR_STD>False</NET_6_0_UP_OR_STD>
5464
<NET_7_0_LESS_OR_STD>False</NET_7_0_LESS_OR_STD>
5565
<NET_7_0_UP_OR_STD>False</NET_7_0_UP_OR_STD>
5666
<NET_8_0_LESS_OR_STD>False</NET_8_0_LESS_OR_STD>
5767
<NET_8_0_UP_OR_STD>False</NET_8_0_UP_OR_STD>
68+
<NET_9_0_LESS_OR_STD>False</NET_9_0_LESS_OR_STD>
69+
<NET_9_0_UP_OR_STD>False</NET_9_0_UP_OR_STD>
5870
<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>
71+
<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>
5972
<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>
73+
<NET_5_0_UP_OR_STD Condition="'$(NET_5_0_UP)' == true Or '$(NET_STD_2_X)' == true">True</NET_5_0_UP_OR_STD>
6074
<NET_6_0_LESS_OR_STD Condition="'$(NET_6_0_LESS)' == true Or '$(NET_STD_2_X)' == true">True</NET_6_0_LESS_OR_STD>
6175
<NET_6_0_UP_OR_STD Condition="'$(NET_6_0_UP)' == true Or '$(NET_STD_2_X)' == true">True</NET_6_0_UP_OR_STD>
6276
<NET_7_0_LESS_OR_STD Condition="'$(NET_7_0_LESS)' == true Or '$(NET_STD_2_X)' == true">True</NET_7_0_LESS_OR_STD>
6377
<NET_7_0_UP_OR_STD Condition="'$(NET_7_0_UP)' == true Or '$(NET_STD_2_X)' == true">True</NET_7_0_UP_OR_STD>
6478
<NET_8_0_LESS_OR_STD Condition="'$(NET_8_0_LESS)' == true Or '$(NET_STD_2_X)' == true">True</NET_8_0_LESS_OR_STD>
6579
<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>
80+
<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>
81+
<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>
82+
83+
</PropertyGroup>
6684

85+
<PropertyGroup>
86+
<DefineConstants Condition="'$(NET_6_0_LESS)' == true">NET_6_0_LESS</DefineConstants>
6787
</PropertyGroup>
6888

6989
<Import Project="$(MSBuildThisFileDirectory)Common.override.props" Condition="Exists('$(MSBuildThisFileDirectory)Common.override.props')" />

0 commit comments

Comments
 (0)