Skip to content

Commit fba2355

Browse files
OpenTransitLabOpenTransitLab
authored
Merge branch 'MassTransit:develop' into develop
2 parents 1412baf + d964e8f commit fba2355

3 files changed

Lines changed: 32 additions & 16 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: MassTransit
22
env:
3-
MASSTRANSIT_VERSION: 8.5.6
3+
MASSTRANSIT_VERSION: 8.5.7
44
on:
55
push:
66
paths:

‎Directory.Packages.props‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.1.1" />
7-
<PackageVersion Include="Apache.NMS.AMQP" Version="2.2.0" />
6+
<PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.2.0" />
7+
<PackageVersion Include="Apache.NMS.AMQP" Version="2.4.0" />
88
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="4.0.6.3" />
99
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="4.0.1.3" />
1010
<PackageVersion Include="AWSSDK.S3" Version="4.0.7.4" />
@@ -58,48 +58,48 @@
5858
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))"/>
5959
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
6060
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"
61-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
61+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
6262
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0"
6363
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
6464
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
6565
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"
66-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
66+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
6767
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0"
6868
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
6969
<PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
7070
<PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="9.0.0"
71-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
71+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
7272
<PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="10.0.0"
7373
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
7474
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
7575
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0"
76-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
76+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
7777
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.0"
7878
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
7979
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0" />
8080
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
8181
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0"
82-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
82+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
8383
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0"
8484
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
8585
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
8686
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0"
87-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
87+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
8888
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0"
8989
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
9090
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
9191
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0"
92-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
92+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
9393
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0"
9494
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
9595
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
9696
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0"
97-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
97+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
9898
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0"
9999
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
100100
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
101101
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0"
102-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
102+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
103103
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0"
104104
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
105105
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
@@ -130,19 +130,20 @@
130130
<PackageVersion Include="System.Data.SQLite" Version="1.0.119" />
131131
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
132132
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0"
133-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
133+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
134134
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.0"
135135
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
136136
<PackageVersion Include="System.Memory" Version="4.6.3" />
137137
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
138138
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
139139
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
140140
<PackageVersion Include="System.Text.Json" Version="8.0.6" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
141-
<PackageVersion Include="System.Text.Json" Version="9.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
141+
<PackageVersion Include="System.Text.Json" Version="9.0.0"
142+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
142143
<PackageVersion Include="System.Text.Json" Version="10.0.0" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
143144
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
144145
<PackageVersion Include="System.Threading.Channels" Version="9.0.0"
145-
Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
146+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
146147
<PackageVersion Include="System.Threading.Channels" Version="10.0.0"
147148
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" />
148149
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
@@ -152,4 +153,4 @@
152153
<GlobalPackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
153154
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
154155
</ItemGroup>
155-
</Project>
156+
</Project>

‎doc/app.vue‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<template>
2+
<div>
3+
<div class="bg-blue-600 text-white py-2 px-4 text-center">
4+
<p class="font-medium">
5+
Massient, Inc. is now behind MassTransit! Preview the new documentation at
6+
<a href="https://masstransit.massient.com/" class="font-bold underline">
7+
https://masstransit.massient.com/
8+
</a>
9+
</p>
10+
</div>
11+
<AppLayout>
12+
<NuxtPage />
13+
</AppLayout>
14+
</div>
15+
</template>

0 commit comments

Comments
 (0)