[msbuild] Don't import Microsoft.CSharp.targets if we're building using net5.
It's already imported.
This commit is contained in:
Родитель
cf1f8af55a
Коммит
6e48c5a83a
|
@ -31,7 +31,7 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.Mac.AppExtension.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
|
@ -28,7 +28,7 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
|
||||
<Import Project="Xamarin.Mac.Common.targets" />
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
|
|||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.ObjCBinding.CSharp.props"/>
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
|
|||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.TVOS.AppExtension.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
|
@ -34,7 +34,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.TVOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
|
@ -33,7 +33,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<!-- Enable nuget package conflict resolution -->
|
||||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.WatchOS.App.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
|
@ -37,7 +37,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<!-- Enable nuget package conflict resolution -->
|
||||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.WatchOS.AppExtension.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
|
@ -33,7 +33,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<!-- Enable nuget package conflict resolution -->
|
||||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.WatchOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
|
@ -50,7 +50,7 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
|
|||
<!-- Enable nuget package conflict resolution -->
|
||||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.iOS.AppExtension.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
|
@ -33,7 +33,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
|
|||
<!-- Enable nuget package conflict resolution -->
|
||||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.iOS.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
|
@ -27,7 +27,7 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
|
|||
|
||||
<Import Project="Xamarin.iOS.ObjCBinding.CSharp.props"/>
|
||||
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.iOS.ObjCBinding.Common.targets" />
|
||||
<Import Project="Xamarin.Shared.targets"/>
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
|
|||
<!-- Enable nuget package conflict resolution -->
|
||||
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
|
||||
<Import Project="Xamarin.iOS.WatchApp.Common.targets" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
|
||||
|
|
Загрузка…
Ссылка в новой задаче