Skip to content

Commit

Permalink
[release/6.0.1xx-rc.1] Import .NET 6 property page targets path in iO…
Browse files Browse the repository at this point in the history 
…S sdk targets (#12565)

* Import .NET 6 property page targets path in iOS sdk targets

* Fixes MSBuildExtensionsPath casing on Microsoft.iOS.Windows.Sdk.targets

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>

Co-authored-by: James Parsons <japarson@microsoft.com>
Co-authored-by: Emanuel Fernandez Dell'Oca <ema@xamarin.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Co-authored-by: Alex Soto <alex@alexsoto.me>
  • Loading branch information
@vs-mobiletools-engineering-service2 @japarson
@emaf @rolfbjarne @dalexsoto
5 people committed Aug 29, 2021
1 parent 802c412 commit f026eee
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,10 @@
-->

<PropertyGroup Condition="'$(XamarinIOSDesignTimeTargetsPath)' == ''">
<XamarinIOSDesignTimeTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Xamarin\iOS\Xamarin.iOS.DesignTime.targets</XamarinIOSDesignTimeTargetsPath>
</PropertyGroup>

<Import Project="$(XamarinIOSDesignTimeTargetsPath)" Condition="Exists('$(XamarinIOSDesignTimeTargetsPath)')" />

</Project>

1 comment on commit f026eee

@vs-mobiletools-engineering-service2
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ [CI Build] Tests passed on Build. ✅

Tests passed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

✅ API Diff (from PR only) (no change)
✅ Generator Diff (only version changes)

Packages generated

View packages

🎉 All 250 tests passed 🎉

Pipeline on Agent XAMBOT-1038.BigSur'
[release/6.0.1xx-rc.1] Import .NET 6 property page targets path in iOS sdk targets (#12565)

Please sign in to comment.