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.

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

Cosmos SDK v3.46.0 #52

Merged
merged 8 commits into from
Dec 5, 2024
Merged

Cosmos SDK v3.46.0 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2834dc
chore(deps): upgrade packages to resolve security vulnerability warnings
christianhelle Nov 19, 2024
4397cce
chore: target .net 9.0 in test projects
christianhelle Nov 19, 2024
9749f61
chore: switch to default code analysis mode
christianhelle Nov 19, 2024
aca86d2
chore: resolve xunit warning regarding bypassing parallelization limits
christianhelle Nov 19, 2024
d01ca2c
chore(deps): upgrade Microsoft.Azure.Cosmo to v3.46.0
christianhelle Nov 20, 2024
b1958ff
chore: disable newtonsoft.json check
christianhelle Nov 20, 2024
65d62b3
chore: use .net 9.0 in builb agents
christianhelle Nov 20, 2024
53abb86
fix: failing tests due to serialization indentation options
christianhelle Nov 20, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/release-preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
- name: ⚙️ Setup GIT versioning
uses: dotnet/[email protected]

- name: ⚙️ Setup dotnet 7.0.x
- name: ⚙️ Setup dotnet 9.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '9.0.x'

- name: 🛠️ Building library in release mode
run: dotnet pack -c Release -o ${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ jobs:
with:
setAllVars: true

- name: ⚙️ Setup dotnet 7.0.x
- name: ⚙️ Setup dotnet 9.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '9.0.x'

- name: 🛠️ Update changelog
uses: thomaseizinger/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
with:
setAllVars: true

- name: ⚙️ Setup dotnet 7.0.x
- name: ⚙️ Setup dotnet 9.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '9.0.x'

- name: 🛠️ Building libraries in release mode
run: dotnet build -c release -p:ContinuousIntegrationBuild=true
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</PropertyGroup>

<PropertyGroup Label="Analyzer settings">
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
<AnalysisMode>Default</AnalysisMode>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
18 changes: 10 additions & 8 deletions src/Atc.Cosmos.EventStore/Atc.Cosmos.EventStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,23 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<DebugType>Portable</DebugType>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<DisableNewtonsoftJsonCheck>true</DisableNewtonsoftJsonCheck>
<AzureCosmosDisableNewtonsoftJsonCheck>true</AzureCosmosDisableNewtonsoftJsonCheck>
</PropertyGroup>

<ItemGroup>
<Using Remove="System.IO" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.34.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="System.Text.Json" Version="7.0.2" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.46.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions test/Atc.Cosmos.EventStore.Cqrs.Tests/Atc.Cosmos.EventStore.Cqrs.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc.Test" Version="1.0.75" />
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Atc.Test" Version="1.1.4" />
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
14 changes: 7 additions & 7 deletions test/Atc.Cosmos.EventStore.IntegrationTests/Atc.Cosmos.EventStore.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc.Test" Version="1.0.70" />
<PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Atc.Test" Version="1.1.4" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
14 changes: 7 additions & 7 deletions test/Atc.Cosmos.EventStore.Tests/Atc.Cosmos.EventStore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc.Test" Version="1.0.75" />
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Atc.Test" Version="1.1.4" />
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
3 changes: 1 addition & 2 deletions test/Atc.Cosmos.EventStore.Tests/Converters/EventDataConverterPipelineBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ public class EventDataConverterPipelineBuilderTests
[Theory, AutoNSubstituteData]
internal void Should_Call_All_Converters_InReverseOrder(
IEventMetadata metadata,
JsonSerializerOptions options,
FakeEventDataConverter[] converters,
FakeEventDataConverter converter,
EventDataConverterPipelineBuilder sut)
=> sut
.AddConverter(converter)
.AddConverters(converters)
.Build()
.Convert(metadata, doc.RootElement, options)
.Convert(metadata, doc.RootElement, new JsonSerializerOptions())
.Should()
.Be(string.Join(string.Empty, new[] { converter }.Concat(converters).Select(c => c.Val)));
}
6 changes: 2 additions & 4 deletions test/Atc.Cosmos.EventStore.Tests/Converters/FaultedEventDataConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,27 @@ public class FaultedEventDataConverterTests
[Theory, AutoNSubstituteData]
internal void Should_Return_Converted_Value(
IEventMetadata metadata,
JsonSerializerOptions options,
string expected,
FaultedEventDataConverter sut)
=> sut
.Convert(
metadata,
doc.RootElement,
options,
new JsonSerializerOptions(),
() => expected)
.Should()
.Be(expected);

[Theory, AutoNSubstituteData]
internal void Should_Return_FaultedEvent_When_Exception_IsThrown(
IEventMetadata metadata,
JsonSerializerOptions options,
KeyNotFoundException exception,
FaultedEventDataConverter sut)
=> sut
.Convert(
metadata,
doc.RootElement,
options,
new JsonSerializerOptions(),
() => throw exception)
.Should()
.BeEquivalentTo(
Expand Down
3 changes: 1 addition & 2 deletions test/Atc.Cosmos.EventStore.Tests/Converters/NamedEventConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public class NamedEventConverterTests
internal void Should_Return_Value_FromNext_When_TypeName_IsNotFound(
[Frozen] IEventTypeProvider typeProvider,
IEventMetadata metadata,
JsonSerializerOptions options,
string expected,
NamedEventConverter sut)
{
Expand All @@ -30,7 +29,7 @@ internal void Should_Return_Value_FromNext_When_TypeName_IsNotFound(
.Convert(
metadata,
doc.RootElement,
options,
new JsonSerializerOptions(),
() => expected)
.Should()
.Be(expected);
Expand Down
6 changes: 2 additions & 4 deletions test/Atc.Cosmos.EventStore.Tests/Converters/UnknownEventDataConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,26 @@ public class UnknownEventDataConverterTests
[Theory, AutoNSubstituteData]
internal void Should_Return_Converted_Value_Id_NotNull(
IEventMetadata metadata,
JsonSerializerOptions options,
string expected,
UnknownEventDataConverter sut)
=> sut
.Convert(
metadata,
doc.RootElement,
options,
new JsonSerializerOptions(),
() => expected)
.Should()
.Be(expected);

[Theory, AutoNSubstituteData]
internal void Should_Return_UnknownEvent_When_Value_IsNot_Converted(
IEventMetadata metadata,
JsonSerializerOptions options,
UnknownEventDataConverter sut)
=> sut
.Convert(
metadata,
doc.RootElement,
options,
new JsonSerializerOptions(),
() => null)
.Should()
.BeEquivalentTo(
Expand Down
6 changes: 2 additions & 4 deletions test/Atc.Cosmos.EventStore.Tests/Streams/StreamInfoReaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ internal async Task Should_Convert_Into_StreamResponse(
.ReturnsForAnyArgs(expectedMetadata);

var info = await sut
.ReadAsync(streamId, cancellationToken)
.ConfigureAwait(false);
.ReadAsync(streamId, cancellationToken);

info
.State
Expand Down Expand Up @@ -57,8 +56,7 @@ internal async Task Should_Read_Metadata_From_Stream(
.ReturnsForAnyArgs(expectedMetadata);

await sut
.ReadAsync(streamId, cancellationToken)
.ConfigureAwait(false);
.ReadAsync(streamId, cancellationToken);

_ = metadataReader
.Received(1)
Expand Down
Loading