Skip to content

Commit e2d3810

Browse files
authored
Merge branch 'main' into bugfix/clear-queue-when-no-leadership
2 parents 47c6934 + 755bee2 commit e2d3810

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

examples/AspireAppHost/AspireAppHost.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
<UserSecretsId>kubeops-aspire-apphost</UserSecretsId>
1414
</PropertyGroup>
1515

16-
<ItemGroup>
17-
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.3.5" />
18-
<PackageReference Include="Aspire.Hosting.Kubernetes" Version="13.3.5-preview.1.26270.6" />
19-
</ItemGroup>
20-
2116
<ItemGroup>
2217
<ProjectReference Include="..\AspireOperator\AspireOperator.csproj" />
2318
<ProjectReference Include="..\..\src\KubeOps.Aspire.Hosting\KubeOps.Aspire.Hosting.csproj"

renovate.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@
6464
{
6565
"matchPackageNames": ["JsonPatch.Net"],
6666
"allowedVersions": "<=4.0.1"
67+
},
68+
{
69+
"description": ["Aspire.Hosting.Kubernetes only ships prerelease versions, so allow unstable updates for it."],
70+
"matchManagers": ["nuget"],
71+
"matchPackageNames": ["Aspire.Hosting.Kubernetes"],
72+
"ignoreUnstable": false,
73+
"respectLatest": false
6774
}
6875
]
69-
}
76+
}

src/KubeOps.Aspire.Hosting/KubeOps.Aspire.Hosting.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="Aspire.Hosting" Version="13.4.3" />
23-
<PackageReference Include="Aspire.Hosting.Kubernetes" Version="13.3.5-preview.1.26270.6" />
23+
<PackageReference Include="Aspire.Hosting.Kubernetes" Version="13.4.3-preview.1.26305.13" />
2424
<PackageReference Include="YamlDotNet" Version="18.0.0" />
25+
<!-- Pin transitive MessagePack (via Aspire.Hosting -> StreamJsonRpc) to a version
26+
without GHSA-hv8m-jj95-wg3x. Remove once Aspire ships a fixed StreamJsonRpc. -->
27+
<PackageReference Include="MessagePack" Version="3.1.7" />
2528
</ItemGroup>
2629

2730
</Project>

0 commit comments

Comments
 (0)