[dotnet] Merge Xamarin.Shared.Sdk.props into Xamarin.Shared.Sdk.targets.
This commit is contained in:
Родитель
1be152e35b
Коммит
e43688a60b
|
@ -21,7 +21,6 @@ $(1)_NUGET_TARGETS = \
|
|||
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).TargetFrameworkInference.targets \
|
||||
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.DefaultItems.props \
|
||||
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.DefaultItems.targets \
|
||||
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.props \
|
||||
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.TargetFrameworkInference.targets \
|
||||
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.targets \
|
||||
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.Versions.props \
|
||||
|
|
|
@ -3,6 +3,4 @@
|
|||
<PropertyGroup>
|
||||
<_PlatformName>iOS</_PlatformName>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Xamarin.Shared.Sdk.props" />
|
||||
</Project>
|
||||
|
|
|
@ -3,6 +3,4 @@
|
|||
<PropertyGroup>
|
||||
<_PlatformName>macOS</_PlatformName>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Xamarin.Shared.Sdk.props" />
|
||||
</Project>
|
||||
|
|
|
@ -3,6 +3,4 @@
|
|||
<PropertyGroup>
|
||||
<_PlatformName>tvOS</_PlatformName>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Xamarin.Shared.Sdk.props" />
|
||||
</Project>
|
||||
|
|
|
@ -3,6 +3,4 @@
|
|||
<PropertyGroup>
|
||||
<_PlatformName>watchOS</_PlatformName>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Xamarin.Shared.Sdk.props" />
|
||||
</Project>
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="Xamarin.Shared.Sdk.Versions.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- Set to true when using the Microsoft.<platform>.Sdk NuGet. This is used by pre-existing/shared targets to tweak behavior depending on build system -->
|
||||
<_UsingXamarinSdk>true</_UsingXamarinSdk>
|
||||
<!-- This is the location of the Microsoft.<platform>.Sdk NuGet (/usr/local/share/dotnet/sdk/<version>/Sdks/Microsoft.[iOS/tvOS/watchOS/macOS].Sdk) -->
|
||||
<_XamarinSdkRootDirectory>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', '..'))\</_XamarinSdkRootDirectory>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Default item includes (globs and implicit references) -->
|
||||
<Import Project="Microsoft.$(_PlatformName).Sdk.DefaultItems.props" />
|
||||
|
||||
<!-- This contains the OS versions we support for target platform -->
|
||||
<Import Project="Microsoft.$(_PlatformName).Sdk.SupportedTargetPlatforms.props" />
|
||||
</Project>
|
|
@ -2,10 +2,24 @@
|
|||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- Set to true when using the Microsoft.<platform>.Sdk NuGet. This is used by pre-existing/shared targets to tweak behavior depending on build system -->
|
||||
<_UsingXamarinSdk>true</_UsingXamarinSdk>
|
||||
<!-- This is the location of the Microsoft.<platform>.Sdk NuGet (/usr/local/share/dotnet/sdk/<version>/Sdks/Microsoft.[iOS/tvOS/watchOS/macOS].Sdk) -->
|
||||
<_XamarinSdkRootDirectory>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', '..'))\</_XamarinSdkRootDirectory>
|
||||
|
||||
<_XamarinTaskAssembly Condition="'$(_PlatformName)' != 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\iOS\Xamarin.iOS.Tasks.dll</_XamarinTaskAssembly>
|
||||
<_XamarinTaskAssembly Condition="'$(_PlatformName)' == 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\macOS\Xamarin.Mac.Tasks.dll</_XamarinTaskAssembly>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Version information -->
|
||||
<Import Project="Xamarin.Shared.Sdk.Versions.props" />
|
||||
|
||||
<!-- Default item includes (globs and implicit references) -->
|
||||
<Import Project="Microsoft.$(_PlatformName).Sdk.DefaultItems.props" />
|
||||
|
||||
<!-- This contains the OS versions we support for target platform -->
|
||||
<Import Project="Microsoft.$(_PlatformName).Sdk.SupportedTargetPlatforms.props" />
|
||||
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CompileNativeCode" AssemblyFile="$(_XamarinTaskAssembly)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.LinkNativeCode" AssemblyFile="$(_XamarinTaskAssembly)" />
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче