Skip to content

Commit 9eca547

Browse files
committed
Fix Xamarin build.
1 parent 102ddcd commit 9eca547

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/MsgPack/MsgPack.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
<DefineConstants>$(DefineConstants);__ANDROID__</DefineConstants>
7373
<TargetFrameworkRootPath Condition="'$(VsInstallRoot)' != ''">$(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\</TargetFrameworkRootPath>
7474
<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
75+
<!-- Workaround for VS 15.3 -->
76+
<NuGetTargetMoniker>MonoAndroid,Version=1.0</NuGetTargetMoniker>
7577
</PropertyGroup>
7678
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.iOS10'">
7779
<DefineConstants>$(DefineConstants);__IOS__</DefineConstants>
@@ -597,7 +599,10 @@
597599
<!-- For VS, use $(MSBuildExtensionsPath) -->
598600
<VSMSBuildExtensionsPath>$(MSBuildExtensionsPath)</VSMSBuildExtensionsPath>
599601
</PropertyGroup>
602+
<PropertyGroup Condition="'$(XamarinMSBuildExtensionsPath)' == ''">
603+
<XamarinMSBuildExtensionsPath>$(VSMSBuildExtensionsPath)</XamarinMSBuildExtensionsPath>
604+
</PropertyGroup>
600605
<Import Project="$(VSMSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" Condition="'$(TargetFramework)' == 'uap10.0'" />
601-
<Import Project="$(VSMSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" Condition="'$(TargetFramework)' == 'MonoAndroid10'" />
602-
<Import Project="$(VSMSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" Condition="'$(TargetFramework)' == 'Xamarin.iOS10'" />
606+
<Import Project="$(XamarinMSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" Condition="'$(TargetFramework)' == 'MonoAndroid10'" />
607+
<Import Project="$(XamarinMSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" Condition="'$(TargetFramework)' == 'Xamarin.iOS10'" />
603608
</Project>

0 commit comments

Comments
 (0)