Skip to content

Commit 0843596

Browse files
philasmarphilasmar
committed
chore: update Aspire to 9.1.0
1 parent 8ce83ee commit 0843596

File tree

6 files changed

+74
-58
lines changed

6 files changed

+74
-58
lines changed

‎.autover/changes/bbc9baec-e63d-45c2-b62f-bd6a258533e1.json

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "Aspire.Hosting.AWS",
5+
"Type": "Patch",
6+
"ChangelogMessages": [
7+
"Update Aspire to 9.1.0 and switched to using LaunchProfileAnnotation instead of reflection"
8+
]
9+
}
10+
]
11+
}

‎Directory.Packages.props

+47-50
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,48 @@
1-
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
<AspireVersion>9.0.0</AspireVersion>
6-
</PropertyGroup>
7-
<ItemGroup>
8-
<PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
9-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
10-
<PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
11-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
12-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Dns" Version="$(AspireVersion)" />
13-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(AspireVersion)" />
14-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
15-
<!-- AWS SDK for .NET dependencies -->
16-
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.402.6" />
17-
<PackageVersion Include="AWSSDK.Core" Version="3.7.402.2" />
18-
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.405.23" />
19-
<PackageVersion Include="AWSSDK.Lambda" Version="3.7.411.39" />
20-
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.45" />
21-
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.96" />
22-
<PackageVersion Include="AWSSDK.SQS" Version="3.7.400.96" />
23-
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.96" />
24-
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.97" />
25-
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.400" />
26-
<PackageVersion Include="AWS.Messaging" Version="0.9.2" />
27-
28-
<PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.12.0" />
29-
<PackageVersion Include="Amazon.Lambda.Core" Version="2.5.0" />
30-
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
31-
<PackageVersion Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
32-
33-
34-
<!-- AWS CDK dependencies -->
35-
<PackageVersion Include="Amazon.CDK.Lib" Version="2.166.0" />
36-
<!-- Open Telemetry -->
37-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
38-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
39-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
40-
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.11.0" />
41-
<PackageVersion Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.11.0" />
42-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
43-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
44-
<!-- Test dependencies -->
45-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
46-
<PackageVersion Include="xunit" Version="2.9.2" />
47-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
48-
<PackageVersion Include="JsonSchema.Net" Version="7.2.3" />
49-
<PackageVersion Include="Moq" Version="4.20.72" />
50-
</ItemGroup>
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
<AspireVersion>9.1.0</AspireVersion>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
9+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
10+
<PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
11+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
12+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Dns" Version="$(AspireVersion)" />
13+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
15+
<!-- AWS SDK for .NET dependencies -->
16+
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.402.10" />
17+
<PackageVersion Include="AWSSDK.Core" Version="3.7.402.6" />
18+
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.405.27" />
19+
<PackageVersion Include="AWSSDK.Lambda" Version="3.7.411.43" />
20+
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.49" />
21+
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.100" />
22+
<PackageVersion Include="AWSSDK.SQS" Version="3.7.400.100" />
23+
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.100" />
24+
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.101" />
25+
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.400" />
26+
<PackageVersion Include="AWS.Messaging" Version="0.9.4" />
27+
<PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.12.3" />
28+
<PackageVersion Include="Amazon.Lambda.Core" Version="2.5.0" />
29+
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
30+
<PackageVersion Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
31+
<!-- AWS CDK dependencies -->
32+
<PackageVersion Include="Amazon.CDK.Lib" Version="2.180.0" />
33+
<!-- Open Telemetry -->
34+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
35+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
36+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0" />
37+
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.11.0" />
38+
<PackageVersion Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.11.0" />
39+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.0" />
40+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.0" />
41+
<!-- Test dependencies -->
42+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
43+
<PackageVersion Include="xunit" Version="2.9.3" />
44+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
45+
<PackageVersion Include="JsonSchema.Net" Version="7.3.3" />
46+
<PackageVersion Include="Moq" Version="4.20.72" />
47+
</ItemGroup>
5148
</Project>

‎src/Aspire.Hosting.AWS/Constants.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ internal static class Constants
4141
/// <summary>
4242
/// The version of RuntimeSupport used in the executable wrapper project
4343
/// </summary>
44-
internal const string RuntimeSupportPackageVersion = "1.12.2";
44+
internal const string RuntimeSupportPackageVersion = "1.12.3";
4545

4646
/// <summary>
4747
/// The default version of Amazon.Lambda.TestTool that will be automatically installed

‎src/Aspire.Hosting.AWS/Lambda/LambdaExtensions.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,9 @@ public static class LambdaExtensions
4242
{
4343
// If we are running Aspire through an IDE where a debugger is attached,
4444
// we want to configure the Aspire resource to use a Launch Setting Profile that will be able to run the class library Lambda function.
45-
46-
// TODO: Once 9.1 comes out LaunchProfileAnnotation will be public and we can remove the reflection and directly instantiate it.
47-
var launchProfileAnnotationsType = typeof(IDistributedApplicationBuilder).Assembly.GetTypes().FirstOrDefault(x => string.Equals(x.FullName, "Aspire.Hosting.ApplicationModel.LaunchProfileAnnotation"));
48-
var constructor = launchProfileAnnotationsType!.GetConstructors()[0];
49-
var instance = constructor.Invoke(new object[] { $"{Constants.LaunchSettingsNodePrefix}{name}" }) as IResourceAnnotation;
50-
5145
var project = new LambdaProjectResource(name);
5246
resource = builder.AddResource(project)
53-
.WithAnnotation(instance!)
47+
.WithAnnotation(new LaunchProfileAnnotation($"{Constants.LaunchSettingsNodePrefix}{name}"))
5448
.WithAnnotation(new TLambdaProject());
5549
}
5650
else

‎tests/Aspire.Hosting.AWS.Integ.Tests/Aspire.Hosting.AWS.Integ.Tests.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,11 @@
2222
<Using Include="Xunit" />
2323
</ItemGroup>
2424

25+
<ItemGroup>
26+
<PackageReference Update="xunit.runner.visualstudio">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29+
</PackageReference>
30+
</ItemGroup>
31+
2532
</Project>

‎tests/Aspire.Hosting.AWS.UnitTests/Aspire.Hosting.AWS.UnitTests.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,11 @@
1515
</Content>
1616
</ItemGroup>
1717

18+
<ItemGroup>
19+
<PackageReference Update="xunit.runner.visualstudio">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
23+
</ItemGroup>
24+
1825
</Project>

0 commit comments

Comments
 (0)