Skip to content

Commit

Permalink
Applied latest Messaging and Hot Restart changes from main (#15177)
Browse files Browse the repository at this point in the history
These changes are needed to for 17.3 Preview 2 and net6

Co-authored-by: Emanuel Fernandez Dell'Oca <ema@xamarin.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
Co-authored-by: Alex Soto <alex@alexsoto.me>
  • Loading branch information
4 people authored Jun 3, 2022
1 parent 321a1fa commit c5eafcf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions msbuild/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MessagingVersion>1.6.3</MessagingVersion>
<HotRestartVersion>1.0.90</HotRestartVersion>
<MessagingVersion>1.6.24</MessagingVersion>
<HotRestartVersion>1.0.93</HotRestartVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<!-- AfterConnect belongs to Xamarin.Messaging.Build.targets -->
<Target Name="AfterConnect" Condition="'$(IsRemoteBuild)' == 'true'" DependsOnTargets="_VerifyXcodeVersion" />

<Target Name="_VerifyXcodeVersion" Condition="'$(IsRemoteBuild)' == 'true'">
<Target Name="_VerifyXcodeVersion" Condition="'$(IsRemoteBuild)' == 'true' And '$(IsMacEnabled)' == 'true'">
<VerifyXcodeVersion SessionId="$(BuildSessionId)" />
</Target>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
AppIdentifier="$(_AppIdentifier)"
BundleIdentifier="$(_BundleIdentifier)"
Entitlements="$(_HotRestartEntitlementsFile)"
CompiledEntitlements="$(DeviceSpecificIntermediateOutputPath)Entitlements.xcent"
CompiledEntitlements="$(HotRestartAppBundlePath)\Entitlements.plist"
IsAppExtension="$(IsAppExtension)"
ProvisioningProfile="$(_ProvisioningProfileId)"
SdkIsSimulator="False"
Expand Down

3 comments on commit c5eafcf

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Please sign in to comment.