Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for .NET 9 #6947

Merged
merged 29 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
50cef0d
Add 9.0.x to CI
cquirosj Jan 3, 2025
3f7dcc1
Update global.json to 9.0.100
cquirosj Jan 3, 2025
dcb85b1
Update integrity tests
cquirosj Jan 3, 2025
390cc58
Update net8.0-windows to net9.0-windows
cquirosj Jan 3, 2025
7a15956
Update single framework projects from 8 to 9
cquirosj Jan 3, 2025
198c0d7
Add net9.0 to TargetFrameworks
cquirosj Jan 3, 2025
ea152a8
update Microsoft.Azure.Functions.Worker.Sdk to veriosn 2.0.0
soujay Jan 4, 2025
142835a
Microsoft.Azure.Functions.Worker.Sdk to version 2.0.0
soujay Jan 4, 2025
8231eb9
update "Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0"
soujay Jan 4, 2025
5e40221
Address vulnerability
soujay Jan 4, 2025
8a96bb0
Address vulnerability
soujay Jan 4, 2025
17c2c52
update Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0"
soujay Jan 4, 2025
07d80e2
update "Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0"
soujay Jan 4, 2025
92540a3
update Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0"
soujay Jan 4, 2025
5b7aaa6
address vulnerability
soujay Jan 4, 2025
09fbbe5
address vulnerability
soujay Jan 4, 2025
a383717
use X509CertificateLoader to load the certificate
soujay Jan 4, 2025
eea6221
update Microsoft.Azure.Functions.Worker.Extensions.Kafka" Version="4.…
soujay Jan 4, 2025
0d3d177
add dotnet workload restore
soujay Jan 6, 2025
c7a00da
Try to just install the aspire workload once.
hazel-bohon Jan 6, 2025
c8e8bcf
Fix .NET Aspire workload install in PR validation.
hazel-bohon Jan 6, 2025
5a664b5
update integrity test mapping for net 9 to c#13
soujay Jan 9, 2025
efabb49
Update lang ver to 13
cquirosj Jan 10, 2025
eefdeea
Revert "address vulnerability"
soujay Jan 10, 2025
841f452
Revert "Address vulnerability"
soujay Jan 10, 2025
5b3dc7b
Revert "Address vulnerability"
soujay Jan 10, 2025
ac49895
remove .net6 from traget frameworks
soujay Jan 29, 2025
c618ab6
fix the target framework tag
soujay Jan 29, 2025
4b02d23
remove unnecessary semicolon
soujay Jan 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .github/workflows/build-samples-and-snippets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ jobs:
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: 8.0.x
dotnet-version: |
9.0.x
8.0.x
- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2
- name: Restore NuGet Cache
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/validate-pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ jobs:
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: 8.0.x
dotnet-version: |
9.0.x
8.0.x
# Caching is done to limit data transfer on each PR, not to optimize CI speed
- name: Check docstool version for cache
run: |
Expand All @@ -40,7 +42,9 @@ jobs:
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: 8.0.x
dotnet-version: |
9.0.x
8.0.x
- name: Run integrity tests
run: dotnet test tests/IntegrityTests/IntegrityTests.csproj --configuration Release --logger "GitHubActions;report-warnings=false"
build-projects:
Expand All @@ -52,7 +56,9 @@ jobs:
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: 8.0.x
dotnet-version: |
9.0.x
8.0.x
- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2
- name: Build affected samples & snippets
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/verify-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ jobs:
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: 8.0.x
dotnet-version: |
9.0.x
8.0.x
# Caching is done to limit data transfer on each PR, not to optimize CI speed
- name: Check docstool version for cache
run: |
Expand Down Expand Up @@ -61,7 +63,9 @@ jobs:
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: 8.0.x
dotnet-version: |
9.0.x
8.0.x
- name: Run integrity tests
run: dotnet test tests/IntegrityTests/IntegrityTests.csproj --configuration Release --logger "GitHubActions;report-warnings=false"
- name: Notify Slack on failure
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ When multi-targeting samples for NServiceBus 8 and earlier, The recommended set
For NServiceBus 9, samples can't currently be multi-targeted, so they should be singled targeted:

```xml
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
```

Some things to keep in mind:
Expand Down
2 changes: 1 addition & 1 deletion Snippets/ABSDataBus/ABSDataBus_6/ABSDataBus_6.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.*" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/ASBS/ASBS_4/ASBS_4.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.12.0" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/ASP/ASTP_6/ASTP_6.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Persistence.AzureTable" Version="6.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/ASQ/ASQN_13/ASQN_13.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Transport.AzureStorageQueues" Version="13.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Bridge/Bridge_3.1/Bridge_3.1.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.MessagingBridge" Version="3.1.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Bridge/Bridge_3/Bridge_3.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.MessagingBridge" Version="3.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Bridge/Bridge_4/Bridge_4.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.MessagingBridge" Version="4.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Callbacks/Callbacks_5/Callbacks_5.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Callbacks" Version="5.*" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Callbacks.Testing" Version="5.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Core/Core_9.1/Core_9.1.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Core9</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Snippets/Core/Core_9/Core_9.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Core9</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Snippets/CosmosDB/CosmosDB_3/CosmosDB_3.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Persistence.CosmosDB" Version="3.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/CustomChecks/CustomChecks_5/CustomChecks_5.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.CustomChecks" Version="5.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/DataBus/Core_9/Core_9.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Core9</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Snippets/DataBus/DataBus_1/ClaimCheck_1.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>ClaimCheck_1</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Snippets/DynamoDB/DynamoDB_1/DynamoDB_1.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Snippets/DynamoDB/DynamoDB_2/DynamoDB_2.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Extensions.Logging" Version="3.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/FileShareDataBus/Core_9/Core_9.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus" Version="9.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/FileShareDataBus/DataBus_1/DataBus_1.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.ClaimCheck" Version="1.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Gateway/Gateway_5/Gateway_5.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Gateway" Version="5.*" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Gateway.RavenDB" Version="4.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/GatewaySql/GatewaySql_3/GatewaySql_3.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Gateway.Sql" Version="3.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Heartbeats/Heartbeats_5/Heartbeats_5.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Heartbeat" Version="5.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/LearningPersistence/Core_9/Core_9.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus" Version="9.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/LearningTransport/Core_9/Core_9.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus" Version="9.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Metrics/Metrics_5/Metrics_5.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Metrics" Version="5.*" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="5.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/NHibernate/NHibernate_10/NHibernate_10.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.NHibernate" Version="10.*" />
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Newtonsoft/Newtonsoft_4/Newtonsoft_4.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>NonDurablePersistence_2</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/PerfCounters/PerfCounters_6/PerfCounters_6.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Metrics.PerformanceCounters" Version="6.*" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.ServicePlatform.Connector" Version="3.*" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Particular.PlatformSample" Version="3.*" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus.Encryption.MessageProperty" Version="5.*" />
Expand Down
Loading
Loading