Skip to content

Commit ed54aeb

Browse files
Downgrade to .NET 8 for the release (#800)
* SLNX support requires ships with msbuild 17.10 which should be in 9.0.200 or higher * Version should be 6 and increment patch * Switch target framework back to NET8 * Stable versions * Switch back to previous CSharp syntax style * Properly fix obsolete --------- Co-authored-by: Daniel Marbach <[email protected]>
1 parent 72d1e47 commit ed54aeb

File tree

17 files changed

+51
-44
lines changed

17 files changed

+51
-44
lines changed

global.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.0",
4-
"allowPrerelease": true,
3+
"version": "9.0.200",
54
"rollForward": "latestFeature"
65
}
76
}

src/Custom.Build.props

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

33
<PropertyGroup>
4-
<MinVerMinimumMajorMinor>7.0</MinVerMinimumMajorMinor>
5-
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
6-
<LangVersion>preview</LangVersion>
4+
<MinVerMinimumMajorMinor>6.0</MinVerMinimumMajorMinor>
5+
<MinVerAutoIncrement>patch</MinVerAutoIncrement>
76
</PropertyGroup>
87

98
</Project>

src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
14-
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.4" GeneratePathProperty="true" />
14+
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.2.7" GeneratePathProperty="true" />
1515
<PackageReference Include="NUnit" Version="4.4.0" />
1616
<PackageReference Include="NUnit.Analyzers" Version="4.10.0" />
1717
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />

src/NServiceBus.Storage.MongoDB.AcceptanceTests/When_custom_provider_registered.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,24 @@ public Task Handle(StartSaga1 message, IMessageHandlerContext context)
5555

5656
public class CustomProvider(Context testContext) : IMongoClientProvider
5757
{
58-
[field: AllowNull, MaybeNull]
5958
public IMongoClient Client
6059
{
6160
get
6261
{
63-
if (field is not null)
62+
if (client is not null)
6463
{
65-
return field;
64+
return client;
6665
}
6766

6867
var containerConnectionString = Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");
6968

70-
field = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
69+
client = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
7170
testContext.ProviderWasCalled = true;
72-
return field;
71+
return client;
7372
}
7473
}
74+
75+
IMongoClient? client;
7576
}
7677

7778
public class JustASagaData : ContainSagaData

src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
14-
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.4" GeneratePathProperty="true" />
14+
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.2.7" GeneratePathProperty="true" />
1515
<PackageReference Include="NUnit" Version="4.4.0" />
1616
<PackageReference Include="NUnit.Analyzers" Version="4.10.0" />
1717
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />

src/NServiceBus.Storage.MongoDB.PersistenceTests/NServiceBus.Storage.MongoDB.PersistenceTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
14-
<PackageReference Include="NServiceBus.PersistenceTests.Sources" Version="10.0.0-alpha.4" />
14+
<PackageReference Include="NServiceBus.PersistenceTests.Sources" Version="9.2.7" />
1515
<PackageReference Include="NUnit" Version="4.4.0" />
1616
<PackageReference Include="NUnit.Analyzers" Version="4.10.0" />
1717
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />

src/NServiceBus.Storage.MongoDB.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace NServiceBus
2424
public static void DisableInstaller(this NServiceBus.PersistenceExtensions<NServiceBus.MongoPersistence> persistenceExtensions) { }
2525
public static NServiceBus.PersistenceExtensions<NServiceBus.MongoPersistence> MongoClient(this NServiceBus.PersistenceExtensions<NServiceBus.MongoPersistence> persistenceExtensions, MongoDB.Driver.IMongoClient mongoClient) { }
2626
[System.Obsolete("Use \'MongoOutboxSettingsExtensions.TimeToKeepOutboxDeduplicationData\' instead. Wi" +
27-
"ll be removed in version 8.0.0.", true)]
27+
"ll be treated as an error from version 7.0.0. Will be removed in version 8.0.0.", false)]
2828
public static NServiceBus.PersistenceExtensions<NServiceBus.MongoPersistence> TimeToKeepOutboxDeduplicationData(this NServiceBus.PersistenceExtensions<NServiceBus.MongoPersistence> persistenceExtensions, System.TimeSpan timeToKeepOutboxDeduplicationData) { }
2929
public static NServiceBus.PersistenceExtensions<NServiceBus.MongoPersistence> UseTransactions(this NServiceBus.PersistenceExtensions<NServiceBus.MongoPersistence> persistenceExtensions, bool useTransactions) { }
3030
}
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace NServiceBus.Storage.MongoDB.Tests;
1+
#nullable enable
2+
3+
namespace NServiceBus.Storage.MongoDB.Tests;
24

35
using System;
46
using global::MongoDB.Driver;
@@ -9,9 +11,9 @@ public static IMongoClient Client
911
{
1012
get
1113
{
12-
if (field != null)
14+
if (client != null)
1315
{
14-
return field;
16+
return client;
1517
}
1618

1719
MongoPersistence.SafeRegisterDefaultGuidSerializer();
@@ -20,11 +22,13 @@ public static IMongoClient Client
2022
var containerConnectionString =
2123
Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");
2224

23-
field = string.IsNullOrWhiteSpace(containerConnectionString)
25+
client = string.IsNullOrWhiteSpace(containerConnectionString)
2426
? new MongoClient()
2527
: new MongoClient(containerConnectionString);
2628

27-
return field;
29+
return client;
2830
}
2931
}
32+
33+
static IMongoClient? client;
3034
}

src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

src/NServiceBus.Storage.MongoDB.Tests/Sagas/SagaTestsConfiguration.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,24 @@ public SagaMetadataCollection SagaMetadataCollection
2020
{
2121
get
2222
{
23-
if (field != null)
23+
if (sagaMetadataCollection != null)
2424
{
25-
return field;
25+
return sagaMetadataCollection;
2626
}
2727

2828
var sagaTypes = Assembly.GetExecutingAssembly().GetTypes().Where(t =>
2929
typeof(Saga).IsAssignableFrom(t) || typeof(IFinder).IsAssignableFrom(t)).ToArray();
30-
field = new SagaMetadataCollection();
31-
field.Initialize(sagaTypes);
30+
sagaMetadataCollection = new SagaMetadataCollection();
31+
sagaMetadataCollection.Initialize(sagaTypes);
3232

33-
return field;
33+
return sagaMetadataCollection;
3434
}
3535

36-
set;
36+
set => sagaMetadataCollection = value;
3737
}
3838

39+
SagaMetadataCollection sagaMetadataCollection;
40+
3941
readonly MemberMapCache memberMapCache;
4042

4143
public SagaTestsConfiguration(string versionElementName, Func<Type, string> collectionNamingConvention,

0 commit comments

Comments
 (0)