Skip to content

Commit ac2f7e9

Browse files
authored
⬆️ #142 Upgraded to latest SDK and packages (#150)
> 1. What triggered this change? (PBI link, Email Subject, conversation + reason, etc) #142 > 2. What was changed? Upgraded to SDK 9.0.5 and latest package versions. > 3. Did you do pair or mob programming? \- <!-- E.g. I worked with @GordonBeeming and @sethdailyssw --> <!-- Check out the relevant rules - https://www.ssw.com.au/rules/rules-to-better-pull-requests - https://www.ssw.com.au/rules/write-a-good-pull-request - https://www.ssw.com.au/rules/over-the-shoulder-prs - https://www.ssw.com.au/rules/do-you-use-co-creation-patterns -->
1 parent f25a62a commit ac2f7e9

File tree

10 files changed

+34
-29
lines changed

10 files changed

+34
-29
lines changed

Directory.Packages.props

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,40 @@
1313
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
1414
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
1515
<PackageVersion Include="EntityFrameworkCore.Exceptions.SqlServer" Version="8.1.3" />
16-
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.1.0" />
17-
<PackageVersion Include="Scalar.AspNetCore" Version="2.1.6" />
18-
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
16+
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.3.0" />
17+
<PackageVersion Include="Scalar.AspNetCore" Version="2.4.7" />
18+
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
1919
<PackageVersion Include="ErrorOr" Version="2.0.1" />
2020
<PackageVersion Include="Vogen" Version="7.0.3" />
2121
<PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="9.1.0" />
22-
<PackageVersion Include="Bogus" Version="35.6.2" />
22+
<PackageVersion Include="Bogus" Version="35.6.3" />
2323
</ItemGroup>
2424
<ItemGroup Condition="$(IsAspireSharedProject) == 'true'">
2525
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
26-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.2.1" />
26+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.0" />
2727
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
2828
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
2929
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
3030
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
3131
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
3232
</ItemGroup>
3333
<ItemGroup Condition="$(IsAspireHost) == 'true'">
34-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.1.0" />
35-
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.1.0" />
34+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.3.0" />
35+
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.3.0" />
3636
</ItemGroup>
3737
<ItemGroup Condition="$(IsTestProject) == 'true'">
38-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
39-
<PackageVersion Include="xunit.v3" Version="2.0.1" />
40-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
38+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
39+
<PackageVersion Include="xunit.v3" Version="2.0.2" />
40+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0">
41+
<PrivateAssets>all</PrivateAssets>
42+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
43+
</PackageVersion>
4144
<PackageVersion Include="NSubstitute" Version="5.3.0" />
4245
<PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
43-
<PackageVersion Include="AwesomeAssertions" Version="8.1.0" />
44-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.3" />
46+
<PackageVersion Include="AwesomeAssertions" Version="9.0.0" />
47+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.5" />
4548
<PackageVersion Include="Respawn" Version="6.2.1" />
46-
<PackageVersion Include="Testcontainers.MsSql" Version="4.3.0" />
49+
<PackageVersion Include="Testcontainers.MsSql" Version="4.4.0" />
4750
<PackageVersion Include="Polly" Version="8.5.2" />
4851
</ItemGroup>
4952
</Project>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.200",
3+
"version": "9.0.300",
44
"rollForward": "latestMinor",
55
"allowPrerelease": false
66
}

src/ServiceDefaults/ServiceDefaults.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<ItemGroup>
88
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
9-
109
<PackageReference Include="Microsoft.Extensions.Http.Resilience" />
1110
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
1211
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />

tests/WebApi.ArchitectureTests/Common/TestResultAssertions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using FluentAssertions.Execution;
2-
using FluentAssertions.Primitives;
1+
using AwesomeAssertions.Execution;
2+
using AwesomeAssertions.Primitives;
33
using System.Text;
44
using TestResult = NetArchTest.Rules.TestResult;
55

tests/WebApi.ArchitectureTests/Common/TestResultExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using FluentAssertions.Execution;
1+
using AwesomeAssertions.Execution;
22
using TestResult = NetArchTest.Rules.TestResult;
33

44
namespace SSW.VerticalSliceArchitecture.ArchitectureTests.Common;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
global using FluentAssertions;
1+
global using AwesomeAssertions;
22
global using NetArchTest.Rules;
33
global using Xunit;

tests/WebApi.ArchitectureTests/WebApi.ArchitectureTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="AwesomeAssertions" />
10+
<PackageReference Include="AwesomeAssertions" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1212
<PackageReference Include="NetArchTest.Rules" />
13-
<PackageReference Include="xunit.v3"/>
13+
<PackageReference Include="xunit.v3" />
1414
<PackageReference Include="xunit.runner.visualstudio">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
global using Xunit;
2-
global using FluentAssertions;
2+
global using AwesomeAssertions;
33
global using Bogus;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
global using Xunit;
2-
global using FluentAssertions;
2+
global using AwesomeAssertions;

tools/AppHost/Extensions/SqlServerCommandExt.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,18 @@ public static IResourceBuilder<SqlServerDatabaseResource> WithDropDatabaseComman
2323

2424
return CommandResults.Success();
2525
},
26-
context =>
27-
{
28-
if (context.ResourceSnapshot.HealthStatus is HealthStatus.Healthy)
26+
new CommandOptions {
27+
UpdateState = context =>
2928
{
30-
return ResourceCommandState.Enabled;
31-
}
29+
if (context.ResourceSnapshot.HealthStatus is HealthStatus.Healthy)
30+
{
31+
return ResourceCommandState.Enabled;
32+
}
3233

33-
return ResourceCommandState.Disabled;
34+
return ResourceCommandState.Disabled;
35+
}
3436
});
37+
3538
return builder;
3639
}
3740
}

0 commit comments

Comments
 (0)