Skip to content

Commit 178e83d

Browse files
[release/6.0.4xx-xcode14.2] Updated Xamarin.Messaging to 1.9.94 (#17935)
Should fix an issue in remote builds where if the connection gets disconnected unexpectedly, the build might end up failing because the main session id is changed and also the reconnection fails. More details: xamarin/Xamarin.Messaging#587 Backport of #17925 --------- Co-authored-by: Mauro Agnoletti <maagno@microsoft.com>
1 parent 462f5f1 commit 178e83d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

msbuild/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<MessagingVersion>1.9.59</MessagingVersion>
3+
<MessagingVersion>1.9.94</MessagingVersion>
44
<HotRestartVersion>1.0.93</HotRestartVersion>
55
</PropertyGroup>
66
</Project>

msbuild/ILMerge.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<PropertyGroup>
7373
<AbsoluteAssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' != ''">$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','$(AssemblyOriginatorKeyFile)'))))</AbsoluteAssemblyOriginatorKeyFile>
7474
<ILRepackArgs Condition="'$(AbsoluteAssemblyOriginatorKeyFile)' != ''">/keyfile:"$(AbsoluteAssemblyOriginatorKeyFile)" /delaysign</ILRepackArgs>
75+
<ILRepackArgs>$(ILRepackArgs) /union</ILRepackArgs> <!-- This is needed to merge types with identical names into one, wich happens with IFluentInterface in Merq and Merq.Core (Xamarin.Messaging dependencies) -->
7576
<ILRepackArgs>$(ILRepackArgs) @(LibDir -&gt; '/lib:"%(Identity)."', ' ')</ILRepackArgs>
7677
<ILRepackArgs>$(ILRepackArgs) /out:"@(IntermediateAssembly -&gt; '%(FullPath)')"</ILRepackArgs>
7778
<ILRepackArgs>$(ILRepackArgs) "@(IntermediateAssembly -&gt; '%(FullPath)')"</ILRepackArgs>

0 commit comments

Comments
 (0)