Skip to content

Commit 841c90e

Browse files
particularbotinternalautomation[bot]soujay
authored
Update for .NET 9 - release-9.2 (#7236)
* Updates for .NET 9 Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: Jayanthi <[email protected]>
1 parent 3adcd33 commit 841c90e

File tree

18 files changed

+42
-41
lines changed

18 files changed

+42
-41
lines changed

‎.github/workflows/ci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,20 @@ jobs:
2525
fail-fast: false
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v4.1.7
28+
uses: actions/checkout@v4.2.2
2929
with:
3030
fetch-depth: 0
3131
- name: Setup .NET SDK
32-
uses: actions/setup-dotnet@v4.0.1
32+
uses: actions/setup-dotnet@v4.1.0
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: |
35+
9.0.x
36+
8.0.x
3537
- name: Build
3638
run: dotnet build src --configuration Release
3739
- name: Upload packages
3840
if: matrix.name == 'Windows'
39-
uses: actions/upload-artifact@v4.3.5
41+
uses: actions/upload-artifact@v4.4.3
4042
with:
4143
name: NuGet packages
4244
path: nugets/

‎.github/workflows/release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
runs-on: ubuntu-22.04
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4.1.7
18+
uses: actions/checkout@v4.2.2
1919
with:
2020
fetch-depth: 0
2121
- name: Setup .NET SDK
22-
uses: actions/setup-dotnet@v4.0.1
22+
uses: actions/setup-dotnet@v4.1.0
2323
with:
24-
dotnet-version: 8.0.x
24+
dotnet-version: 9.0.x
2525
- name: Build
2626
run: dotnet build src --configuration Release
2727
- name: Sign NuGet packages
@@ -32,7 +32,7 @@ jobs:
3232
client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
3333
certificate-name: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }}
3434
- name: Publish artifacts
35-
uses: actions/upload-artifact@v4.3.5
35+
uses: actions/upload-artifact@v4.4.3
3636
with:
3737
name: nugets
3838
path: nugets/*

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.400",
3+
"version": "9.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

‎src/NServiceBus.AcceptanceTests/Core/OpenTelemetry/Traces/When_processing_incoming_message.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class Context : ScenarioContext
5555
public string IncomingMessageId { get; set; }
5656
public string IncomingMessageConversationId { get; set; }
5757
public bool IncomingMessageReceived { get; set; }
58-
public IReadOnlyDictionary<string, string> ReceivedHeaders { get; set; }
58+
public Dictionary<string, string> ReceivedHeaders { get; set; }
5959
public string IncomingNativeMessageId { get; set; }
6060
}
6161

‎src/NServiceBus.AcceptanceTests/Core/OpenTelemetry/Traces/When_sending_messages.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
using System.Collections.Generic;
44
using System.Collections.Immutable;
5-
using System.Collections.ObjectModel;
65
using System.Diagnostics;
76
using System.Linq;
87
using System.Threading.Tasks;
@@ -117,7 +116,7 @@ class Context : ScenarioContext
117116
public bool OutgoingMessageReceived { get; set; }
118117
public string SentMessageId { get; set; }
119118
public string MessageConversationId { get; set; }
120-
public IReadOnlyDictionary<string, string> SentMessageHeaders { get; set; }
119+
public Dictionary<string, string> SentMessageHeaders { get; set; }
121120
}
122121

123122

@@ -136,7 +135,7 @@ public Task Handle(OutgoingMessage message, IMessageHandlerContext context)
136135
testContext.SentMessageId = context.MessageId;
137136
testContext.MessageConversationId = context.MessageHeaders[Headers.ConversationId];
138137
testContext.OutgoingMessageReceived = true;
139-
testContext.SentMessageHeaders = new ReadOnlyDictionary<string, string>((IDictionary<string, string>)context.MessageHeaders);
138+
testContext.SentMessageHeaders = new Dictionary<string, string>((IDictionary<string, string>)context.MessageHeaders);
140139
return Task.CompletedTask;
141140
}
142141
}

‎src/NServiceBus.AcceptanceTests/MessageId/When_message_has_empty_id_header.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Context : ScenarioContext
4040
{
4141
public bool MessageReceived { get; set; }
4242
public string MessageId { get; set; }
43-
public IReadOnlyDictionary<string, string> Headers { get; set; }
43+
public Dictionary<string, string> Headers { get; set; }
4444
}
4545

4646
class Endpoint : EndpointConfigurationBuilder

‎src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj

+3-3
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+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -11,8 +11,8 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" PrivateAssets="All" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.3.0" PrivateAssets="All" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" PrivateAssets="All" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0" PrivateAssets="All" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="All" />
1717
<PackageReference Include="Particular.Approvals" Version="2.0.0" PrivateAssets="All" />
1818
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />

‎src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj

+3-3
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+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -12,9 +12,9 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1616
<PackageReference Include="NUnit" Version="4.2.2" />
17-
<PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
17+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0" />
1818
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1919
</ItemGroup>
2020

‎src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj

+3-3
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+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -15,9 +15,9 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1919
<PackageReference Include="NUnit" Version="4.2.2" />
20-
<PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
20+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0" />
2121
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2222
</ItemGroup>
2323

‎src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj

+3-3
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+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -13,10 +13,10 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1717
<PackageReference Include="NuDoq" Version="2.0.1" NoWarn="NU1701" />
1818
<PackageReference Include="NUnit" Version="4.2.2" />
19-
<PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
19+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0" />
2020
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2121
<PackageReference Include="Particular.Approvals" Version="2.0.0" />
2222
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />

‎src/NServiceBus.Core.Tests/Pipeline/Incoming/InvokeHandlerTerminatorTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void Should_throw_friendly_exception_if_handler_returns_null()
112112
Assert.That(async () => await terminator.Invoke(behaviorContext, _ => Task.CompletedTask), Throws.Exception.With.Message.EqualTo("Return a Task or mark the method as async."));
113113
}
114114

115-
static ActiveSagaInstance AssociateSagaWithMessage(FakeSaga saga, IInvokeHandlerContext behaviorContext)
115+
static ActiveSagaInstance AssociateSagaWithMessage(FakeSaga saga, TestableInvokeHandlerContext behaviorContext)
116116
{
117117
var sagaInstance = new ActiveSagaInstance(saga, SagaMetadata.Create(typeof(FakeSaga), [], new Conventions()), () => DateTime.UtcNow);
118118
behaviorContext.Extensions.Set(sagaInstance);

‎src/NServiceBus.Core.Tests/Serializers/XML/SerializerTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public void Should_handle_concrete_message_with_interface_property()
156156
[Test]
157157
public void Should_handle_interface_message_with_interface_property()
158158
{
159-
IMessageWithInterfaceProperty message = new InterfaceMessageWithInterfacePropertyImplementation
159+
var message = new InterfaceMessageWithInterfacePropertyImplementation
160160
{
161161
InterfaceProperty = new InterfacePropertyImplementation
162162
{

‎src/NServiceBus.Core/Serialization/SerializationFeature.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ static IMessageSerializer CreateMessageSerializer(Tuple<SerializationDefinition,
9595
return serializer;
9696
}
9797

98-
static void LogFoundMessages(IReadOnlyCollection<MessageMetadata> messageDefinitions)
98+
static void LogFoundMessages(MessageMetadata[] messageDefinitions)
9999
{
100100
if (!Logger.IsInfoEnabled)
101101
{
102102
return;
103103
}
104-
Logger.DebugFormat("Number of messages found: {0}", messageDefinitions.Count);
104+
Logger.DebugFormat("Number of messages found: {0}", messageDefinitions.Length);
105105
if (!Logger.IsDebugEnabled)
106106
{
107107
return;

‎src/NServiceBus.Core/Serializers/XML/XmlDeserialization.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ static string GetNameAfterColon(string name)
653653
string defaultNamespace;
654654
readonly IMessageMapper mapper;
655655
readonly List<Type> messageBaseTypes = [];
656-
readonly IDictionary<string, string> prefixesToNamespaces = new Dictionary<string, string>();
656+
readonly Dictionary<string, string> prefixesToNamespaces = [];
657657
readonly bool sanitizeInput;
658658
readonly bool skipWrappingRawXml;
659659

‎src/NServiceBus.Core/Serializers/XML/XmlSerialization.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ static bool IsIndexedProperty(PropertyInfo propertyInfo)
279279
return propertyInfo?.GetIndexParameters().Length > 0;
280280
}
281281

282-
static void WriteElementNamespaces(XElement elem, IReadOnlyList<string> baseTypes)
282+
static void WriteElementNamespaces(XElement elem, List<string> baseTypes)
283283
{
284284
elem.Add(new XAttribute(XNamespace.Xmlns + "xsi", xsiNamespace),
285285
new XAttribute(XNamespace.Xmlns + "xsd", xsdNamespace));

‎src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj

+3-3
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+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -11,8 +11,8 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1717
<PackageReference Include="Particular.Approvals" Version="2.0.0" />
1818
</ItemGroup>

‎src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj

+3-3
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+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -12,9 +12,9 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" PrivateAssets="All" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" PrivateAssets="All" />
1616
<PackageReference Include="NUnit" Version="4.2.2" />
17-
<PackageReference Include="NUnit.Analyzers" Version="4.3.0" PrivateAssets="All" />
17+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0" PrivateAssets="All" />
1818
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="All" />
1919
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />
2020
</ItemGroup>

‎src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj

+3-3
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+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -10,9 +10,9 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" PrivateAssets="All" />
1414
<PackageReference Include="NUnit" Version="4.2.2" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.3.0" PrivateAssets="All" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0" PrivateAssets="All" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="All" />
1717
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />
1818
</ItemGroup>

0 commit comments

Comments
 (0)