Skip to content

Upgrade shared libraries to NET 7 #183

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.

Sign up for GitHub

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

Merged
StuartFerguson merged 5 commits into from
Nov 16, 2022
Merged

Upgrade shared libraries to NET 7 #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1fe94b8
Upgrade shared libraries to NET 7
StuartFerguson Nov 16, 2022
ad6625f
:|
StuartFerguson Nov 16, 2022
1d13ea1
Fix logging unit test
StuartFerguson Nov 16, 2022
bb8fceb
More fixes
StuartFerguson Nov 16, 2022
2d9adc1
:|
StuartFerguson Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/createrelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ jobs:
steps:
- uses: actions/checkout@v1

- name: Install NET 7
uses: actions/setup-dotnet@v2
with:
dotnet-version: '7.0.x'

- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v1

- name: Install NET 7
uses: actions/setup-dotnet@v2
with:
dotnet-version: '7.0.x'

- name: Restore Nuget Packages
run: dotnet restore Shared.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json

Expand Down Expand Up @@ -44,10 +49,10 @@ jobs:
steps:
- uses: actions/checkout@v1

- name: Install NET 6
- name: Install NET 7
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
dotnet-version: '7.0.x'

- name: Restore Nuget Packages
run: dotnet restore Shared.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
Expand Down
2 changes: 1 addition & 1 deletion ClientProxyBase/ClientProxyBase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net7.0;netstandard2.0</TargetFrameworks>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion Driver/Driver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Shared.DomainDrivenDesign/Shared.DomainDrivenDesign.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
72 changes: 30 additions & 42 deletions Shared.EventStore.Tests/EventStoreContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,7 @@ public async Task EventStoreContext_InsertEvents_EventsAreWritten(Boolean secure

await Task.Delay(TimeSpan.FromSeconds(30));

EventStoreClientSettings settings = new EventStoreClientSettings();
settings.ConnectivitySettings = EventStoreClientConnectivitySettings.Default;

if (secureEventStore) {
settings.ConnectivitySettings.Address = new Uri($"esdb://admin:changeit@127.0.0.1:{this.EventStoreHttpPort}?tls=true&tlsVerifyCert=false");
}
else {
settings.CreateHttpMessageHandler = () => new SocketsHttpHandler {
SslOptions = {
RemoteCertificateValidationCallback = (sender,
certificate,
chain,
errors) => true,
}
};

settings.ConnectivitySettings.Insecure = true;
settings.ConnectivitySettings.Address = new Uri($"esdb://admin:changeit@127.0.0.1:{this.EventStoreHttpPort}?tls=false");
settings.DefaultCredentials = new UserCredentials("admin", "changeit");
}
EventStoreClientSettings settings = this.CreateEventStoreClientSettings(secureEventStore);

EventStoreClient client = new(settings);
EventStoreProjectionManagementClient projectionManagementClient = new(settings);
Expand All @@ -89,27 +70,8 @@ public async Task EventStoreContext_ReadEvents_EventsAreRead(Boolean secureEvent

await Task.Delay(TimeSpan.FromSeconds(30));

EventStoreClientSettings settings = new EventStoreClientSettings();
settings.ConnectivitySettings = EventStoreClientConnectivitySettings.Default;

if (secureEventStore) {
settings.ConnectivitySettings.Address = new Uri($"esdb://admin:changeit@127.0.0.1:{this.EventStoreHttpPort}?tls=true&tlsVerifyCert=false");
}
else {
settings.CreateHttpMessageHandler = () => new SocketsHttpHandler {
SslOptions = {
RemoteCertificateValidationCallback = (sender,
certificate,
chain,
errors) => true,
}
};

settings.ConnectivitySettings.Insecure = true;
settings.ConnectivitySettings.Address = new Uri($"esdb://admin:changeit@127.0.0.1:{this.EventStoreHttpPort}?tls=false");
settings.DefaultCredentials = new UserCredentials("admin", "changeit");
}

EventStoreClientSettings settings = this.CreateEventStoreClientSettings(secureEventStore);

EventStoreClient client = new(settings);
EventStoreProjectionManagementClient projectionManagementClient = new(settings);
IEventStoreContext context = new EventStoreContext(client, projectionManagementClient);
Expand All @@ -134,6 +96,32 @@ public async Task EventStoreContext_ReadEvents_EventsAreRead(Boolean secureEvent
});
}

private EventStoreClientSettings CreateEventStoreClientSettings(Boolean secureEventStore) {
String connectionString = secureEventStore switch {
true => $"esdb://admin:changeit@127.0.0.1:{this.EventStoreHttpPort}?tls=true&tlsVerifyCert=false",
_ => $"esdb://admin:changeit@127.0.0.1:{this.EventStoreHttpPort}?tls=false"
};

EventStoreClientSettings settings = EventStoreClientSettings.Create(connectionString);
settings.ConnectivitySettings.Insecure = secureEventStore switch {
true => false,
_ => true
};

if (secureEventStore == false) {
settings.CreateHttpMessageHandler = () => new SocketsHttpHandler {
SslOptions = {
RemoteCertificateValidationCallback = (sender,
certificate,
chain,
errors) => true,
}
};
}

return settings;
}

private INetworkService SetupTestNetwork(String networkName = null,
Boolean reuseIfExists = false) {
networkName = String.IsNullOrEmpty(networkName) ? $"testnetwork{Guid.NewGuid()}" : networkName;
Expand All @@ -152,7 +140,7 @@ private void StartContainers(Boolean isSecureEventStore) {
INetworkService networkService = this.SetupTestNetwork($"testNetwork-{Guid.NewGuid():N}", true);
this.TestNetworks.Add(networkService);

IContainerService containerService = this.StartEventStoreContainer("eventstore/eventstore:21.10.5-bionic",
IContainerService containerService = this.StartEventStoreContainer("eventstore/eventstore:22.6.0-bionic",
$"eventStore-{Guid.NewGuid():N}",
isSecureEventStore,
networkService);
Expand Down
14 changes: 7 additions & 7 deletions Shared.EventStore.Tests/Shared.EventStore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<DebugType>Full</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.48" />
<PackageReference Include="Moq" Version="4.18.1" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.57" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="3.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
12 changes: 6 additions & 6 deletions Shared.EventStore/Shared.EventStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="22.0.0" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="22.0.0" />
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.5" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion Shared.EventStore/SubscriptionWorker/EventStorePersistentSubscriptionsClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public EventStorePersistentSubscriptionsClient(global::EventStore.Client.EventSt
UserCredentials? userCredentials,
Int32 bufferSize,
CancellationToken cancellationToken) {
return this.SubscriptionsClient.SubscribeAsync(stream, group, eventAppeared, subscriptionDropped, userCredentials, bufferSize, false, cancellationToken);
//return this.SubscriptionsClient.SubscribeAsync(stream, group, eventAppeared, subscriptionDropped, userCredentials, bufferSize, false, cancellationToken);
return this.SubscriptionsClient.SubscribeToStreamAsync(stream, group, eventAppeared, subscriptionDropped, userCredentials, bufferSize, cancellationToken);
}

#endregion
Expand Down
10 changes: 5 additions & 5 deletions Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -13,16 +13,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="SpecFlow" Version="3.9.74" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="3.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
21 changes: 5 additions & 16 deletions Shared.IntegrationTesting/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
public class DockerHelper : BaseDockerHelper
{
public DockerHelper() :base(){

}

protected virtual void SetHostTraceFolder(String scenarioName) {
Expand Down Expand Up @@ -101,17 +100,7 @@ await this.SetupEstateManagementContainer(new List<INetworkService> {
testNetwork,
this.SqlServerNetwork
});

//await this.SetupEstateReportingContainer(new List<INetworkService> {
// testNetwork,
// this.SqlServerNetwork
// });

//await this.SetupVoucherManagementContainer(new List<INetworkService> {
// testNetwork,
// this.SqlServerNetwork
// });


await this.SetupTransactionProcessorContainer(new List<INetworkService> {
testNetwork,
this.SqlServerNetwork
Expand All @@ -122,9 +111,9 @@ await this.SetupFileProcessorContainer(new List<INetworkService> {
this.SqlServerNetwork
});

//await this.SetupVoucherManagementAclContainer(new List<INetworkService> {
// testNetwork,
// });
await this.SetupVoucherManagementAclContainer(new List<INetworkService> {
testNetwork,
});

await this.SetupTransactionProcessorAclContainer(testNetwork);

Expand Down Expand Up @@ -171,7 +160,7 @@ public virtual async Task CreateGenericSubscriptions() {
public virtual async Task CreateEstateSubscriptions(String estateName) {
List<(String streamName, String groupName, Int32 maxRetries)> subscriptions = new List<(String streamName, String groupName, Int32 maxRetries)>
{
(estateName.Replace(" ", ""), "Reporting", 2),
(estateName.Replace(" ", ""), "Estate Management", 2),
($"EstateManagementSubscriptionStream_{estateName.Replace(" ", "")}", "Estate Management", 0),
($"TransactionProcessorSubscriptionStream_{estateName.Replace(" ", "")}", "Transaction Processor", 0),
($"FileProcessorSubscriptionStream_{estateName.Replace(" ", "")}", "File Processor", 0)
Expand Down
8 changes: 4 additions & 4 deletions Shared.IntegrationTesting/Shared.IntegrationTesting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ductus.FluentDocker" Version="2.10.57" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="SpecFlow" Version="3.9.74" />
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="22.0.0" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="22.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 9 additions & 4 deletions Shared.Tests/ConfigurationRootExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class ConfigurationRootExtensionsTests
[Fact]
public void ConfigurationRootExtensions_LogConfiguration_ConfigurationIsLogged()
{
IConfigurationBuilder builder = new ConfigurationBuilder().AddInMemoryCollection(ConfigurationRootExtensionsTests.DefaultAppSettings).AddEnvironmentVariables();
IConfigurationBuilder builder = new ConfigurationBuilder().AddInMemoryCollection(ConfigurationRootExtensionsTests.DefaultAppSettings).AddEnvironmentVariables();

IConfigurationRoot configuration = builder.Build();

Expand All @@ -59,12 +59,17 @@ public void ConfigurationRootExtensions_LogConfiguration_ConfigurationIsLogged()

configuration.LogConfiguration(loggerAction);

String[] loggedEntries = testLogger.GetLogEntries();
Int32 expectedCount = ConfigurationRootExtensionsTests.DefaultAppSettings.Count + 7; // 3 blank lines & 4 headers
String[] loggedEntries = this.FilterLogEntries(testLogger);
Int32 expectedCount = ConfigurationRootExtensionsTests.DefaultAppSettings.Count; // 5 headers
loggedEntries.Length.ShouldBe(expectedCount);
loggedEntries.Where(l => l.Contains("No Value")).Count().ShouldBe(1);
}

private string[] FilterLogEntries(TestLogger testLogger) {
return testLogger.GetLogEntries().Where(l => l.Contains("PSLockDownPolicy") == false && String.IsNullOrEmpty(l) == false)
.Where(l => l.Contains("Configuration Section") == false).ToArray();
}

/// <summary>
/// Configurations the root extensions log configuration no configuration no configuration is logged.
/// </summary>
Expand All @@ -80,7 +85,7 @@ public void ConfigurationRootExtensions_LogConfiguration_NoConfiguration_NoConfi

configuration.LogConfiguration(loggerAction);

String[] loggedEntries = testLogger.GetLogEntries();
String[] loggedEntries = this.FilterLogEntries(testLogger);
loggedEntries.Length.ShouldBe(0);
}

Expand Down
Loading