Skip to content

Commit daf7006

Browse files
einarieinari
authored
Merge pull request #2071 from Cratis:fix/packages
Main
2 parents ae3dd5a + 1e2cb17 commit daf7006

File tree

6 files changed

+23
-31
lines changed

6 files changed

+23
-31
lines changed

‎Directory.Packages.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<!-- Cratis -->
2020
<PackageVersion Include="Cratis.Fundamentals" Version="7.0.0" />
2121
<PackageVersion Include="Cratis.Metrics.Roslyn" Version="7.0.0" />
22-
<PackageVersion Include="Cratis.Applications" Version="17.8.2" />
23-
<PackageVersion Include="Cratis.Applications.MongoDB" Version="17.8.2" />
24-
<PackageVersion Include="Cratis.Applications.Orleans" Version="17.8.2" />
25-
<PackageVersion Include="Cratis.Applications.Orleans.MongoDB" Version="17.8.2" />
26-
<PackageVersion Include="Cratis.Applications.ProxyGenerator.Build" Version="17.8.2" />
27-
<PackageVersion Include="Cratis.Applications.Swagger" Version="17.8.2" />
22+
<PackageVersion Include="Cratis.Applications" Version="17.9.0" />
23+
<PackageVersion Include="Cratis.Applications.MongoDB" Version="17.9.0" />
24+
<PackageVersion Include="Cratis.Applications.Orleans" Version="17.9.0" />
25+
<PackageVersion Include="Cratis.Applications.Orleans.MongoDB" Version="17.9.0" />
26+
<PackageVersion Include="Cratis.Applications.ProxyGenerator.Build" Version="17.9.0" />
27+
<PackageVersion Include="Cratis.Applications.Swagger" Version="17.9.0" />
2828
<!-- Orleans -->
2929
<PackageVersion Include="Microsoft.Orleans.Core.Abstractions" Version="9.2.1" />
3030
<PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="9.2.1" />
@@ -63,11 +63,11 @@
6363
<PackageVersion Include="Roslynator.Analyzers" Version="4.14.0" />
6464
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.221" />
6565
<!-- Not categorized -->
66-
<PackageVersion Include="BenchmarkDotNet" Version="0.15.3" />
66+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
6767
<PackageVersion Include="castle.core" Version="5.2.1" />
6868
<PackageVersion Include="docfx.console" Version="2.59.4" />
6969
<PackageVersion Include="humanizer" Version="2.14.1" />
70-
<PackageVersion Include="ILRepack.Lib.MSBuild.Task" Version="2.0.43">
70+
<PackageVersion Include="ILRepack.Lib.MSBuild.Task" Version="2.0.44">
7171
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7272
<PrivateAssets>all</PrivateAssets>
7373
</PackageVersion>
@@ -82,7 +82,7 @@
8282
<PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.2.2" />
8383
<PackageVersion Include="Grpc.Net.Client" Version="2.71.0" />
8484
<PackageVersion Include="mongodb.driver" Version="3.5.0" />
85-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.4" />
85+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.5" />
8686
<PackageVersion Include="Swashbuckle.AspNetCore.Filters" Version="9.0.0" />
8787
<PackageVersion Include="FluentValidation" Version="12.0.0" />
8888
<PackageVersion Include="handlebars.net" Version="2.1.6" />
@@ -93,7 +93,7 @@
9393
<PackageVersion Include="Cratis.Specifications.XUnit" Version="3.0.4" />
9494
<PackageVersion Include="Testcontainers" Version="4.7.0" />
9595
<PackageVersion Include="xunit" Version="2.9.3" />
96-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
96+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
9797
<PackageVersion Include="NSubstitute" Version="5.3.0" />
9898
<PackageVersion Include="Microsoft.NET.Test.SDK" Version="17.14.1" />
9999
</ItemGroup>

‎Integration/Api/Api.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<ItemGroup>
1616
<PackageReference Include="Cratis.Applications" />
1717
<PackageReference Include="Cratis.Applications.MongoDB" />
18-
<PackageReference Include="Cratis.Applications.Orleans" VersionOverride="17.8.1" />
19-
<PackageReference Include="Cratis.Applications.Orleans.MongoDB" VersionOverride="17.8.2" />
18+
<PackageReference Include="Cratis.Applications.Orleans" />
19+
<PackageReference Include="Cratis.Applications.Orleans.MongoDB" />
2020
<PackageReference Include="Cratis.Applications.ProxyGenerator.Build" />
2121
<PackageReference Include="Cratis.Applications.Swagger" />
2222
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />

‎Integration/Api/for_EventStoreQueries/when_getting_event_stores.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@ public class when_getting_event_stores(context context) : Given<context>(context
1212
{
1313
public class context(ChronicleOutOfProcessFixtureWithLocalImage fixture) : given.an_http_client(fixture)
1414
{
15-
public QueryResult<IEnumerable<string>> Result;
15+
public QueryResult Result;
16+
public IEnumerable<string> Data;
1617

1718
Task Establish() => Client.ExecuteCommand("/api/event-stores/add", new AddEventStore("testing"));
1819

1920
async Task Because()
2021
{
21-
Result = await Client.ExecuteQuery<IEnumerable<string>>("/api/event-stores");
22+
Result = await Client.ExecuteQuery("/api/event-stores");
23+
Data = Result.Data as IEnumerable<string>;
2224
}
2325
}
2426

2527
[Fact]
2628
void should_succeed_query() => Context.Result.IsSuccess.ShouldBeTrue();
2729

2830
[Fact]
29-
void should_return_two_event_stores_including_system() => Context.Result.Data.ShouldContainOnly(EventStoreName.System.Value, "testing");
31+
void should_return_two_event_stores_including_system() => Context.Data.ShouldContainOnly(EventStoreName.System.Value, "testing");
3032
}

‎Integration/DotNET.InProcess/DotNET.InProcess.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ItemGroup>
2222
<PackageReference Include="Cratis.Applications" />
2323
<PackageReference Include="Cratis.Applications.MongoDB" />
24-
<PackageReference Include="Cratis.Applications.Orleans" VersionOverride="17.8.1" />
24+
<PackageReference Include="Cratis.Applications.Orleans" />
2525
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
2626
<PackageReference Include="Microsoft.Orleans.TestingHost" />
2727
<PackageReference Include="Polly.Core" />

‎Source/Clients/DotNET.InProcess.Specs/DotNET.InProcess.Specs.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Cratis.Applications" />
11-
<PackageReference Include="Cratis.Applications.Orleans" VersionOverride="17.8.1" />
11+
<PackageReference Include="Cratis.Applications.Orleans" />
1212
<ProjectReference Include="../DotNET.InProcess/DotNET.InProcess.csproj" />
1313
<ProjectReference Include="../Connections/Connections.csproj" />
1414
<ProjectReference Include="../../Infrastructure/Infrastructure.csproj" />
1515
</ItemGroup>
16-
</Project>
16+
</Project>

‎Source/Clients/XUnit.Integration/HttpClientExtensions.cs‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,13 @@ public static async Task<HttpResponseMessage> Post<TPayload>(this HttpClient cli
7070
/// <param name="client">The http client.</param>
7171
/// <param name="requestUri">The request uri string.</param>
7272
/// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
73-
public static Task<QueryResult<object>?> ExecuteQuery(this HttpClient client, string requestUri)
74-
=> ExecuteQuery<object>(client, requestUri);
75-
76-
/// <summary>
77-
/// Executes a query.
78-
/// </summary>
79-
/// <typeparam name="TQueryResult">The type of the query result.</typeparam>
80-
/// <param name="client">The http client.</param>
81-
/// <param name="requestUri">The request uri string.</param>
82-
/// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
83-
public static async Task<QueryResult<TQueryResult>?> ExecuteQuery<TQueryResult>(this HttpClient client, string requestUri)
73+
public static async Task<QueryResult?> ExecuteQuery(this HttpClient client, string requestUri)
8474
{
8575
var response = await DoQuery(client, requestUri);
86-
QueryResult<TQueryResult>? queryResult = null;
76+
QueryResult? queryResult = null;
8777
try
8878
{
89-
queryResult = await response.Content.ReadFromJsonAsync<QueryResult<TQueryResult>>(options: Globals.JsonSerializerOptions);
79+
queryResult = await response.Content.ReadFromJsonAsync<QueryResult>(options: Globals.JsonSerializerOptions);
9080
}
9181
catch
9282
{

0 commit comments

Comments
 (0)