From c0f8e8160f3ee4696e9c15a6e949fcd971402936 Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Fri, 15 Nov 2024 18:33:17 +0800 Subject: [PATCH] Update .NET 9.0 GA --- .github/workflows/dotnet-core.yml | 29 +++-- Common.props | 2 +- Directory.Build.targets | 102 ++++++++++-------- samples/ConsoleApp/ConsoleApp.csproj | 5 + src/Directory.Build.targets | 25 +++-- .../NetLah.Extensions.Configuration.csproj | 8 ++ ...etLah.Extensions.Configuration.Test.csproj | 5 + 7 files changed, 108 insertions(+), 68 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index e677092..afe0c0c 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -1,25 +1,33 @@ name: .NET Core - on: push: - branches: ["main", "dev*"] - tags: ["*.*.*"] + branches: + - main + - feature/** + - dev* + - dev/* + tags: + - "*.*.*" pull_request: branches: [main] +env: + DOTNET_NOLOGO: true + jobs: build: strategy: fail-fast: false matrix: - runs-on: [macos-11, ubuntu-22.04, windows-latest] + # runs-on: [macos-11, ubuntu-22.04, windows-latest] + runs-on: [ubuntu-22.04, windows-latest] name: ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup .NET 8.0.x, 7.0.x, 6.0.x, 5.0.x and 3.1.x + - name: Setup .NET 9.0.x, 8.0.x, 7.0.x, 6.0.x, 5.0.x and 3.1.x uses: actions/setup-dotnet@v4 with: dotnet-version: | @@ -28,11 +36,12 @@ jobs: 6.0.x 7.0.x 8.0.x - - name: Setup .NET 9.0.x Preview - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 9.0.x - dotnet-quality: 'preview' + 9.0.x + # - name: Setup .NET 9.0.x Preview + # uses: actions/setup-dotnet@v4 + # with: + # dotnet-version: 9.0.x + # dotnet-quality: 'preview' - name: dotnet info run: dotnet --info - name: Install dependencies diff --git a/Common.props b/Common.props index 89f5149..19d3649 100644 --- a/Common.props +++ b/Common.props @@ -1,7 +1,7 @@ - 6.0.28;7.0.17;8.0.3 + 6.0.36;8.0.11;9.0.0 True $([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework))) diff --git a/Directory.Build.targets b/Directory.Build.targets index 51bd70d..f3b11a7 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -10,9 +10,9 @@ 3.1.* - 7.* - 8.* - 9.*-* + 6.* + 8.* + 9.* $(LatestDevFrameworkVersion) @@ -22,7 +22,7 @@ 6.* 7.* 8.* - 9.*-* + 9.* $(LatestDevFrameworkVersion) @@ -31,20 +31,26 @@ 5.* 7.* 8.* - 9.*-* + 9.* $(LatestDevFrameworkVersion) + + 9.*-* + $(EFCoreFrameworkVersion) + + 4.* 8.* $(EFCoreFrameworkVersion) 6.* - 8.* + 6.* + 8.* $(FrameworkVersion) 6.3.1 - 6.5.* + 6.* @@ -59,6 +65,7 @@ + @@ -79,27 +86,29 @@ + - + - - + + - + - - - - - - + + + + + + - + + @@ -135,7 +144,7 @@ - + @@ -156,13 +165,13 @@ - + - + @@ -221,7 +230,7 @@ - + @@ -300,8 +309,9 @@ - + + @@ -337,32 +347,32 @@ - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -430,18 +440,18 @@ - - - + + + - + - + diff --git a/samples/ConsoleApp/ConsoleApp.csproj b/samples/ConsoleApp/ConsoleApp.csproj index 1713a51..0ac3cde 100644 --- a/samples/ConsoleApp/ConsoleApp.csproj +++ b/samples/ConsoleApp/ConsoleApp.csproj @@ -42,4 +42,9 @@ + + + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 1d5fe10..335e7dd 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -9,7 +9,7 @@ - 9.0.0-preview.1.* + 10.0.0-preview.1.* @@ -18,7 +18,7 @@ 6.0.0 7.0.0 8.0.0 - 9.0.0-preview.1.* + 9.0.0 $(LatestDevFrameworkVersion) @@ -34,6 +34,8 @@ 4.1.2 8.0.2 5.0.0 + 6.0.0 + 7.0.0 6.0.0 @@ -42,14 +44,15 @@ + - - - - - - - + + + + + + + @@ -62,7 +65,7 @@ - + @@ -102,7 +105,7 @@ - + diff --git a/src/NetLah.Extensions.Configuration/NetLah.Extensions.Configuration.csproj b/src/NetLah.Extensions.Configuration/NetLah.Extensions.Configuration.csproj index 44031c8..5fd9bd4 100644 --- a/src/NetLah.Extensions.Configuration/NetLah.Extensions.Configuration.csproj +++ b/src/NetLah.Extensions.Configuration/NetLah.Extensions.Configuration.csproj @@ -28,4 +28,12 @@ + + + + + + + + diff --git a/test/NetLah.Extensions.Configuration.Test/NetLah.Extensions.Configuration.Test.csproj b/test/NetLah.Extensions.Configuration.Test/NetLah.Extensions.Configuration.Test.csproj index 51a4a5f..08ad129 100644 --- a/test/NetLah.Extensions.Configuration.Test/NetLah.Extensions.Configuration.Test.csproj +++ b/test/NetLah.Extensions.Configuration.Test/NetLah.Extensions.Configuration.Test.csproj @@ -43,4 +43,9 @@ + + + + +