Skip to content

Commit de407eb

Browse files
devstressdevstress
authored
Merge pull request #23 from devstress/copilot/fix-19
Fix failed GitHub workflows: Complete .NET 9 upgrade with Aspire version alignment and package dependency resolution
2 parents 6c48ac1 + a0e372a commit de407eb

32 files changed

Lines changed: 786 additions & 266 deletions

‎.github/workflows/backpressure-tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
- name: Ensure Docker is running
2727
run: docker info
2828

29-
- name: Set up .NET 8.0
29+
- name: Set up .NET 9.0
3030
uses: actions/setup-dotnet@v4
3131
with:
32-
dotnet-version: '8.0.x'
32+
dotnet-version: '9.0.x'
3333

3434
- name: Download build artifacts
3535
uses: actions/download-artifact@v4
@@ -39,7 +39,7 @@ jobs:
3939
- name: Ensure build assemblies
4040
shell: bash
4141
run: |
42-
if [ ! -f Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/FlinkDotNet.Aspire.IntegrationTests.dll ]; then
42+
if [ ! -f Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/FlinkDotNet.Aspire.IntegrationTests.dll ]; then
4343
echo "Build artifacts missing. Building solutions..."
4444
dotnet restore FlinkDotNet/FlinkDotNet.sln
4545
dotnet restore Sample/Sample.sln
@@ -97,8 +97,8 @@ jobs:
9797
**/*.trx
9898
**/allure-results/**
9999
**/allure-report/**
100-
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/allure-results/**
101-
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/allure-report/**
100+
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/allure-results/**
101+
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/allure-report/**
102102
103103
- name: Generate Backpressure Test Summary Report
104104
if: always()

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
java-version: '17'
2828
distribution: 'zulu'
2929

30-
- name: Set up .NET 8.0
30+
- name: Set up .NET 9.0
3131
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: '8.0.x'
33+
dotnet-version: '9.0.x'
3434

3535
- name: Restore .NET Solutions
3636
run: |

‎.github/workflows/integration-tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
- name: Ensure Docker is running
2323
run: docker info
2424

25-
- name: Set up .NET 8.0
25+
- name: Set up .NET 9.0
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: '8.0.x'
28+
dotnet-version: '9.0.x'
2929

3030
- name: Download build artifacts
3131
uses: actions/download-artifact@v4
@@ -35,7 +35,7 @@ jobs:
3535
- name: Ensure build assemblies
3636
shell: bash
3737
run: |
38-
if [ ! -f Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/FlinkDotNet.Aspire.IntegrationTests.dll ]; then
38+
if [ ! -f Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/FlinkDotNet.Aspire.IntegrationTests.dll ]; then
3939
echo "Build artifacts missing. Building solutions..."
4040
dotnet restore FlinkDotNet/FlinkDotNet.sln
4141
dotnet restore Sample/Sample.sln
@@ -106,5 +106,5 @@ jobs:
106106
**/*.txt
107107
**/allure-results/**
108108
**/allure-report/**
109-
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/allure-results/**
110-
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/allure-report/**
109+
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/allure-results/**
110+
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/allure-report/**

‎.github/workflows/local-testing.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
- name: Ensure Docker is running
2323
run: docker info
2424

25-
- name: Set up .NET 8.0
25+
- name: Set up .NET 9.0
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: '8.0.x'
28+
dotnet-version: '9.0.x'
2929

3030
- name: Install .NET Aspire workload
3131
run: |
@@ -48,8 +48,8 @@ jobs:
4848
run: |
4949
Write-Host "🔍 Verifying LocalTesting build artifacts..." -ForegroundColor Green
5050
51-
$appHostDll = "LocalTesting/LocalTesting.AppHost/bin/Release/net8.0/LocalTesting.AppHost.dll"
52-
$webApiDll = "LocalTesting/LocalTesting.WebApi/bin/Release/net8.0/LocalTesting.WebApi.dll"
51+
$appHostDll = "LocalTesting/LocalTesting.AppHost/bin/Release/net9.0/LocalTesting.AppHost.dll"
52+
$webApiDll = "LocalTesting/LocalTesting.WebApi/bin/Release/net9.0/LocalTesting.WebApi.dll"
5353
5454
if (Test-Path $appHostDll) {
5555
Write-Host "✅ AppHost build artifact found: $appHostDll" -ForegroundColor Green
@@ -98,7 +98,7 @@ jobs:
9898
$nugetPackages = "$HOME/.nuget/packages"
9999
100100
# Set DCP CLI path using the installed orchestration package
101-
$dcpPath = "$nugetPackages/aspire.hosting.orchestration.linux-x64/9.3.1/tools/dcp"
101+
$dcpPath = "$nugetPackages/aspire.hosting.orchestration.linux-x64/9.1.0/tools/dcp"
102102
if (Test-Path $dcpPath) {
103103
$env:DCP_CLI_PATH = $dcpPath
104104
Write-Host "✅ DCP CLI path set: $dcpPath" -ForegroundColor Green
@@ -108,7 +108,7 @@ jobs:
108108
}
109109
110110
# Set Aspire Dashboard path using the installed dashboard SDK
111-
$dashboardPath = "$nugetPackages/aspire.dashboard.sdk.linux-x64/9.3.1/tools"
111+
$dashboardPath = "$nugetPackages/aspire.dashboard.sdk.linux-x64/9.1.0/tools"
112112
if (Test-Path $dashboardPath) {
113113
$env:ASPIRE_DASHBOARD_PATH = $dashboardPath
114114
Write-Host "✅ Aspire Dashboard path set: $dashboardPath" -ForegroundColor Green
@@ -120,8 +120,8 @@ jobs:
120120
# Set all required environment variables for Aspire
121121
$env:ASPIRE_ALLOW_UNSECURED_TRANSPORT = "true"
122122
$env:ASPNETCORE_URLS = "http://localhost:15000"
123-
$env:ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL = "http://localhost:4323"
124-
$env:ASPIRE_DASHBOARD_OTLP_HTTP_ENDPOINT_URL = "http://localhost:4324"
123+
$env:DOTNET_DASHBOARD_OTLP_ENDPOINT_URL = "http://localhost:4323"
124+
$env:DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL = "http://localhost:4324"
125125
$env:ASPIRE_DASHBOARD_URL = "http://localhost:18888"
126126
$env:ASPNETCORE_ENVIRONMENT = "Development"
127127
$env:DOTNET_LAUNCH_PROFILE = ""
@@ -573,5 +573,5 @@ jobs:
573573
path: |
574574
**/*.log
575575
**/*.txt
576-
LocalTesting/**/bin/Release/net8.0/**
576+
LocalTesting/**/bin/Release/net9.0/**
577577
retention-days: 7

‎.github/workflows/reliability-tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
- name: Ensure Docker is running
2727
run: docker info
2828

29-
- name: Set up .NET 8.0
29+
- name: Set up .NET 9.0
3030
uses: actions/setup-dotnet@v4
3131
with:
32-
dotnet-version: '8.0.x'
32+
dotnet-version: '9.0.x'
3333

3434
- name: Download build artifacts
3535
uses: actions/download-artifact@v4
@@ -39,7 +39,7 @@ jobs:
3939
- name: Ensure build assemblies
4040
shell: bash
4141
run: |
42-
if [ ! -f Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/FlinkDotNet.Aspire.IntegrationTests.dll ]; then
42+
if [ ! -f Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/FlinkDotNet.Aspire.IntegrationTests.dll ]; then
4343
echo "Build artifacts missing. Building solutions..."
4444
dotnet restore FlinkDotNet/FlinkDotNet.sln
4545
dotnet restore Sample/Sample.sln
@@ -94,5 +94,5 @@ jobs:
9494
**/*.trx
9595
**/allure-results/**
9696
**/allure-report/**
97-
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/allure-results/**
98-
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/allure-report/**
97+
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/allure-results/**
98+
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/allure-report/**

‎.github/workflows/stress-tests-confluent.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
- name: Ensure Docker is running
2727
run: docker info
2828

29-
- name: Set up .NET 8.0
29+
- name: Set up .NET 9.0
3030
uses: actions/setup-dotnet@v4
3131
with:
32-
dotnet-version: '8.0.x'
32+
dotnet-version: '9.0.x'
3333

3434
- name: Download build artifacts
3535
uses: actions/download-artifact@v4
@@ -39,7 +39,7 @@ jobs:
3939
- name: Ensure build assemblies
4040
shell: bash
4141
run: |
42-
if [ ! -f Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/FlinkDotNet.Aspire.IntegrationTests.dll ]; then
42+
if [ ! -f Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/FlinkDotNet.Aspire.IntegrationTests.dll ]; then
4343
echo "Build artifacts missing. Building solutions..."
4444
dotnet restore FlinkDotNet/FlinkDotNet.sln
4545
dotnet restore Sample/Sample.sln
@@ -94,5 +94,5 @@ jobs:
9494
**/*.trx
9595
**/allure-results/**
9696
**/allure-report/**
97-
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/allure-results/**
98-
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net8.0/allure-report/**
97+
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/allure-results/**
98+
Sample/FlinkDotNet.Aspire.IntegrationTests/bin/Release/net9.0/allure-report/**

‎.github/workflows/unit-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
with:
2020
fetch-depth: 0
2121

22-
- name: Set up .NET 8.0
22+
- name: Set up .NET 9.0
2323
uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: '8.0.x'
25+
dotnet-version: '9.0.x'
2626

2727
- name: Set up JDK 17
2828
uses: actions/setup-java@v4
@@ -38,7 +38,7 @@ jobs:
3838
- name: Ensure build assemblies
3939
shell: bash
4040
run: |
41-
if [ ! -f FlinkDotNet/*/bin/Release/net8.0/*.dll ]; then
41+
if [ ! -f FlinkDotNet/*/bin/Release/net9.0/*.dll ]; then
4242
echo "Build artifacts missing. Building solutions..."
4343
dotnet restore FlinkDotNet/FlinkDotNet.sln
4444
dotnet restore Sample/Sample.sln

‎FlinkDotNet/Flink.JobBuilder/Flink.JobBuilder.csproj‎

Lines changed: 5 additions & 5 deletions
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
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77
<PackageId>Flink.JobBuilder</PackageId>
@@ -14,10 +14,10 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="System.Text.Json" Version="8.0.6" />
18-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
17+
<PackageReference Include="System.Text.Json" Version="9.0.7" />
18+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.7" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
2121
<PackageReference Include="Confluent.Kafka" Version="2.11.0" />
2222
</ItemGroup>
2323

‎FlinkDotNet/Flink.JobGateway/Flink.JobGateway.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<InvariantGlobalization>true</InvariantGlobalization>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.18" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
13-
<PackageReference Include="System.Text.Json" Version="8.0.6" />
14-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
11+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.7" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
13+
<PackageReference Include="System.Text.Json" Version="9.0.7" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
1515
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
1616
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
1717
</ItemGroup>

‎LocalTesting/LocalTesting.AppHost/LocalTesting.AppHost.csproj‎

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

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net8.0</TargetFramework>
7+
<TargetFramework>net9.0</TargetFramework>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
<NoWarn>$(NoWarn);IDE0005</NoWarn>
1111
<IsAspireHost>true</IsAspireHost>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.3.1" />
16-
<PackageReference Include="Aspire.Hosting.Kafka" Version="9.3.1" />
17-
<PackageReference Include="Aspire.Hosting.Redis" Version="9.3.1" />
18-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.1" />
15+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
16+
<PackageReference Include="Aspire.Hosting.Kafka" Version="9.1.0" />
17+
<PackageReference Include="Aspire.Hosting.Redis" Version="9.1.0" />
18+
<PackageReference Include="InfinityFlow.Aspire.Temporal" Version="0.6.2" />
19+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
1920
</ItemGroup>
2021

2122
<ItemGroup>

0 commit comments

Comments
 (0)