Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

Update the build tooling #153

Merged
merged 3 commits into from
Oct 1, 2019
Merged

Update the build tooling #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c750472
Update the build tooling
mattleibow Oct 1, 2019
8327058
Update azure-pipelines.yml
mattleibow Oct 1, 2019
41143e6
Update the version of MSBuild.Sdk.Extras
mattleibow Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Facebook.Android/source/account-kit-sdk/account-kit-sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -64,9 +64,4 @@
<PackageReference Include="Xamarin.Google.LibPhoneNumber" Version="8.9.13" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/audience-network-sdk/audience-network-sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -64,9 +64,4 @@
<PackageReference Include="Xam.Plugins.Android.ExoPlayer.Dash" Version="2.7.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
8 changes: 2 additions & 6 deletions Facebook.Android/source/facebook-android-sdk/facebook-android-sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -53,10 +53,6 @@
<LibraryProjectZip Include="..\..\externals\facebook-android-sdk.aar" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\facebook-core\facebook-core.csproj" />
<ProjectReference Include="..\facebook-common\facebook-common.csproj" />
Expand All @@ -66,5 +62,5 @@
<ProjectReference Include="..\facebook-applinks\facebook-applinks.csproj" />
<ProjectReference Include="..\facebook-messenger\facebook-messenger.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-applinks/facebook-applinks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -62,9 +62,4 @@
<PackageReference Include="Bolts" Version="1.4.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-common/facebook-common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -65,9 +65,4 @@
<PackageReference Include="Xamarin.Google.ZXing.Core" Version="3.3.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-core/facebook-core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -59,9 +59,4 @@
<PackageReference Include="Bolts" Version="1.4.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-livestreaming/facebook-livestreaming.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -61,9 +61,4 @@
<PackageReference Include="Xamarin.Android.Support.Annotations" Version="27.0.2" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-login/facebook-login.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -62,9 +62,4 @@
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-loginkit/facebook-loginkit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -63,9 +63,4 @@
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-marketing/facebook-marketing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -61,9 +61,4 @@
<PackageReference Include="Xamarin.Android.Support.Annotations" Version="27.0.2" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-messenger/facebook-messenger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -61,9 +61,4 @@
<PackageReference Include="Bolts" Version="1.4.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-places/facebook-places.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -57,9 +57,4 @@
<ProjectReference Include="..\facebook-core\facebook-core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/facebook-share/facebook-share.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -58,9 +58,4 @@
<ProjectReference Include="..\facebook-common\facebook-common.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
7 changes: 1 addition & 6 deletions Facebook.Android/source/notifications/notifications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">

<PropertyGroup>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
Expand Down Expand Up @@ -57,9 +57,4 @@
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
15 changes: 1 addition & 14 deletions Facebook.iOS/source/AccountKit/AccountKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<PropertyGroup>
<TargetFrameworks>Xamarin.iOS10</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
Expand Down Expand Up @@ -67,23 +67,10 @@
<ObjcBindingApiDefinition Include="ApiDefinition.cs" Condition=" '$(EnableDefaultCompileItems)' == 'true'" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<BundleResource Include="..\..\externals\AccountKit.framework\AccountKitStrings.bundle\**\*">
<Link>Resources\AccountKitStrings.bundle\%(RecursiveDir)\%(Filename)%(Extension)</Link>
</BundleResource>
</ItemGroup>

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

<!-- A workaround for https://github.com/microsoft/msbuild/issues/4584 and resolves https://github.com/onovotny/MSBuildSdkExtras/issues/176 -->
<Target Name="_RemoveNativeReferencesManifest" AfterTargets="BuiltProjectOutputGroup">
<ItemGroup>
<_BuiltProjectOutputGroupOutputIntermediate Remove="$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
<BuiltProjectOutputGroupOutput Remove="$(ProjectDir)$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
</ItemGroup>
</Target>
</Project>
14 changes: 1 addition & 13 deletions Facebook.iOS/source/AudienceNetwork/AudienceNetwork.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<PropertyGroup>
<TargetFrameworks>Xamarin.iOS10</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
Expand Down Expand Up @@ -66,20 +66,8 @@
<ObjcBindingApiDefinition Include="Enums.cs" Condition=" '$(EnableDefaultCompileItems)' == 'true'" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<ObjcBindingCoreSource Include="Structs.cs" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

<!-- A workaround for https://github.com/microsoft/msbuild/issues/4584 and resolves https://github.com/onovotny/MSBuildSdkExtras/issues/176 -->
<Target Name="_RemoveNativeReferencesManifest" AfterTargets="BuiltProjectOutputGroup">
<ItemGroup>
<_BuiltProjectOutputGroupOutputIntermediate Remove="$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
<BuiltProjectOutputGroupOutput Remove="$(ProjectDir)$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
</ItemGroup>
</Target>
</Project>
15 changes: 1 addition & 14 deletions Facebook.iOS/source/CoreKit/CoreKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<PropertyGroup>
<TargetFrameworks>Xamarin.iOS10</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
Expand Down Expand Up @@ -64,17 +64,4 @@
<ObjcBindingApiDefinition Include="Enums.cs" Condition=" '$(EnableDefaultCompileItems)' == 'true'" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

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

<!-- A workaround for https://github.com/microsoft/msbuild/issues/4584 and resolves https://github.com/onovotny/MSBuildSdkExtras/issues/176 -->
<Target Name="_RemoveNativeReferencesManifest" AfterTargets="BuiltProjectOutputGroup">
<ItemGroup>
<_BuiltProjectOutputGroupOutputIntermediate Remove="$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
<BuiltProjectOutputGroupOutput Remove="$(ProjectDir)$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
</ItemGroup>
</Target>
</Project>
15 changes: 1 addition & 14 deletions Facebook.iOS/source/FacebookSdks/FacebookSdks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<PropertyGroup>
<TargetFrameworks>Xamarin.iOS10</TargetFrameworks>
<RootNamespace>Facebook</RootNamespace>
Expand Down Expand Up @@ -40,25 +40,12 @@
<None Include="..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CoreKit\CoreKit.csproj" />
<ProjectReference Include="..\LoginKit\LoginKit.csproj" />
<ProjectReference Include="..\MarketingKit\MarketingKit.csproj" />
<ProjectReference Include="..\PlacesKit\PlacesKit.csproj" />
<ProjectReference Include="..\ShareKit\ShareKit.csproj" />
</ItemGroup>

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

<!-- A workaround for https://github.com/microsoft/msbuild/issues/4584 and resolves https://github.com/onovotny/MSBuildSdkExtras/issues/176 -->
<Target Name="_RemoveNativeReferencesManifest" AfterTargets="BuiltProjectOutputGroup">
<ItemGroup>
<_BuiltProjectOutputGroupOutputIntermediate Remove="$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
<BuiltProjectOutputGroupOutput Remove="$(ProjectDir)$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
</ItemGroup>
</Target>
</Project>
15 changes: 1 addition & 14 deletions Facebook.iOS/source/LoginKit/LoginKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<PropertyGroup>
<TargetFrameworks>Xamarin.iOS10</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
Expand Down Expand Up @@ -61,21 +61,8 @@
<ObjcBindingApiDefinition Include="Enums.cs" Condition=" '$(EnableDefaultCompileItems)' == 'true'" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CoreKit\CoreKit.csproj" />
</ItemGroup>

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

<!-- A workaround for https://github.com/microsoft/msbuild/issues/4584 and resolves https://github.com/onovotny/MSBuildSdkExtras/issues/176 -->
<Target Name="_RemoveNativeReferencesManifest" AfterTargets="BuiltProjectOutputGroup">
<ItemGroup>
<_BuiltProjectOutputGroupOutputIntermediate Remove="$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
<BuiltProjectOutputGroupOutput Remove="$(ProjectDir)$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
</ItemGroup>
</Target>
</Project>
Loading