Move build extensions into nuget package

CommunityToolkit · May 31, 2024 · 27b7422 · 27b7422
1 parent b6bdb35
commit 27b7422
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 31 deletions.
diff --git a/eng/Common.android.targets b/eng/Common.android.targets
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)Common.targets" Condition=" '$(CommonTargetsImported)' != 'true' " />
 
   <UsingTask TaskName="Gradle" AssemblyFile="$(BindingExtBuildTasksAssembly)"/>
 
   <PropertyGroup>
+    <CommonAndroidTargetsImported>true</CommonAndroidTargetsImported>
     <GradleProjectConfiguration Condition=" '$(GradleProjectConfiguration)' == '' ">Release</GradleProjectConfiguration>
   </PropertyGroup>
 
@@ -29,7 +29,7 @@
   <!-- TODO: Improve BeforeTargets to instead use tbd *DependsOn extension point-->
   <Target Name="_BuildGradleProjects"
       Condition=" '@(GradleProjectReference->Count())' != '0' and $(TargetFramework.Contains('android')) "
-      DependsOnTargets="_ResolveMonoAndroidSdks;_EnsureBuildTasksAssembly;_GetBuildGradleProjectsInputs"
+      DependsOnTargets="_ResolveMonoAndroidSdks;_GetBuildGradleProjectsInputs"
       BeforeTargets="$(CompileDependsOn)"
       Inputs="@(_GradleInputs)"
       Outputs="@(GradleProjectReference->'%(FullPath)/%(ModuleName)/build/outputs/aar/%(ModuleName)-$(GradleProjectConfiguration).aar')" >

diff --git a/eng/Common.macios.targets b/eng/Common.macios.targets
@@ -1,11 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
 
-  <Import Project="$(MSBuildThisFileDirectory)Common.targets" Condition=" '$(CommonTargetsImported)' != 'true' " />
-
   <UsingTask TaskName="Sharpie" AssemblyFile="$(BindingExtBuildTasksAssembly)"/>
   <UsingTask TaskName="XcodeBuild" AssemblyFile="$(BindingExtBuildTasksAssembly)"/>
 
   <PropertyGroup>
+    <CommonMaciosTargetsImported>true</CommonMaciosTargetsImported>
     <XcodeProjectConfiguration Condition=" '$(XcodeProjectConfiguration)' == '' ">Release</XcodeProjectConfiguration>
     <XcodeBuildiOS Condition=" '$(XcodeBuildiOS)' == '' ">true</XcodeBuildiOS>
     <XcodeBuildiOSSimulator Condition=" '$(XcodeBuildiOSSimulator)' == '' ">true</XcodeBuildiOSSimulator>
@@ -44,7 +44,7 @@
 
   <Target Name="_BuildXcodeProjects"
       Condition=" '@(XcodeProjectReference->Count())' != '0' "
-      DependsOnTargets="_EnsureBuildTasksAssembly;_GetBuildXcodeProjectsInputs;$(BuildXcodeProjectsDependsOnTargets)"
+      DependsOnTargets="_GetBuildXcodeProjectsInputs;$(BuildXcodeProjectsDependsOnTargets)"
       Inputs="@(_XcbInputs)"
       Outputs="@(XcodeProjectReference->'%(RootDir)%(Directory)build/%(SchemeName).xcframework/Info.plist')" >
 

diff --git a/eng/Common.targets b/eng/Common.targets
diff --git a/eng/Microsoft.Maui.BindingExtensions.targets b/eng/Microsoft.Maui.BindingExtensions.targets
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <PropertyGroup>
+    <BindingExtBuildTasksAssembly Condition= " !Exists('$(BindingExtBuildTasksAssembly)') ">Microsoft.Maui.BindingExtensions.Build.Tasks.dll</BindingExtBuildTasksAssembly>
+    <HOME Condition=" '$(HOME)' == '' ">$(USERPROFILE)</HOME>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)Common.android.targets" Condition=" '$(CommonAndroidTargetsImported)' != 'true' and $(TargetFramework.Contains('android')) " />
+  <Import Project="$(MSBuildThisFileDirectory)Common.macios.targets" Condition=" '$(CommonMaciosTargetsImported)' != 'true' and ($(TargetFramework.Contains('ios')) or $(TargetFramework.Contains('maccatalyst')))" />
+
+</Project>
diff --git a/eng/src/Microsoft.Maui.BindingExtensions.Build.Tasks/nuget.proj b/eng/src/Microsoft.Maui.BindingExtensions.Build.Tasks/nuget.proj
@@ -0,0 +1,44 @@
+<!--
+***********************************************************************************************
+This project file is used to create the Microsoft.Maui.BindingExtensions NuGet.
+***********************************************************************************************
+-->
+<Project Sdk="Microsoft.Build.NoTargets/3.7.56">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageId> Microsoft.Maui.BindingExtensions</PackageId>
+    <Description>Build tasks and extensions for .NET MAUI, .NET for Android, and .NET for iOS binding projects</Description>
+    <PackageVersion>0.0.1</PackageVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <BeforePack>
+      _GetPackItems;
+      $(BeforePack);
+    </BeforePack>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference
+        Include="$(MSBuildThisFileDirectory)Microsoft.Maui.BindingExtensions.Build.Tasks.csproj"
+        ReferenceOutputAssembly="false"
+        Private="true" />
+  </ItemGroup>
+
+  <Target Name="_GetPackItems" >
+    <ItemGroup>
+      <_PackageFiles Include="$(MSBuildThisFileDirectory)../../Microsoft.Maui.BindingExtensions.targets" PackagePath="build" />
+      <_PackageFiles Include="$(MSBuildThisFileDirectory)../../Common.android.targets" PackagePath="build" />
+      <_PackageFiles Include="$(MSBuildThisFileDirectory)../../Common.macios.targets" PackagePath="build" />
+      <_PackageFiles Include="$(MSBuildThisFileDirectory)/bin/$(Configuration)/netstandard2.0/Microsoft.Maui.BindingExtensions.Build.Tasks.dll" PackagePath="build" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/facebook/android/Facebook.Android.Binding/Facebook.Android.Binding.csproj b/facebook/android/Facebook.Android.Binding/Facebook.Android.Binding.csproj
@@ -8,6 +8,10 @@
     <AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.BindingExtensions" Version="0.0.1" />
+  </ItemGroup>
+
   <!-- Metadata applicable to @(AndroidLibrary) will be used if set -->
   <ItemGroup>
     <GradleProjectReference Include="../native" >
@@ -17,5 +21,4 @@
     </GradleProjectReference>
   </ItemGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\eng\Common.android.targets" />
 </Project>
diff --git a/facebook/macios/Facebook.MaciOS.Binding/Facebook.MaciOS.Binding.csproj b/facebook/macios/Facebook.MaciOS.Binding/Facebook.MaciOS.Binding.csproj
@@ -7,10 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ObjcBindingApiDefinition Include="ApiDefinitions.cs"/>
+    <PackageReference Include="Microsoft.Maui.BindingExtensions" Version="0.0.1" />
   </ItemGroup>
 
   <ItemGroup>
+    <ObjcBindingApiDefinition Include="ApiDefinitions.cs"/>
     <XcodeProjectReference Include="../native/MauiFacebook.xcodeproj">
       <SchemeName>MauiFacebook</SchemeName>
       <SharpieNamespace>Facebook</SharpieNamespace>
@@ -21,5 +22,4 @@
     </XcodeProjectReference>
   </ItemGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\eng\Common.macios.targets" />
 </Project>
diff --git a/firebase/macios/Firebase.MaciOS.Binding/Firebase.MaciOS.Binding.csproj b/firebase/macios/Firebase.MaciOS.Binding/Firebase.MaciOS.Binding.csproj
@@ -8,10 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ObjcBindingApiDefinition Include="ApiDefinitions.cs" />
+    <PackageReference Include="Microsoft.Maui.BindingExtensions" Version="0.0.1" />
   </ItemGroup>
 
   <ItemGroup>
+    <ObjcBindingApiDefinition Include="ApiDefinitions.cs" />
     <XcodeProjectReference Include="../native/MauiFirebase.xcodeproj">
       <SchemeName>MauiFirebase</SchemeName>
       <SharpieNamespace>Firebase</SharpieNamespace>
@@ -22,5 +23,4 @@
     </XcodeProjectReference>
   </ItemGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\eng\Common.macios.targets" />
 </Project>
diff --git a/googlecast/macios/GoogleCast.Binding/GoogleCast.Binding.csproj b/googlecast/macios/GoogleCast.Binding/GoogleCast.Binding.csproj
@@ -10,10 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ObjcBindingApiDefinition Include="ApiDefinitions.cs" />
+    <PackageReference Include="Microsoft.Maui.BindingExtensions" Version="0.0.1" />
   </ItemGroup>
 
   <ItemGroup>
+    <ObjcBindingApiDefinition Include="ApiDefinitions.cs" />
     <XcodeProjectReference Include="../native/MauiGoogleCast.xcodeproj">
       <SchemeName>MauiGoogleCast</SchemeName>
       <SharpieNamespace>GoogleCast</SharpieNamespace>
@@ -37,5 +38,4 @@
     <Exec Command="unzip -q -o -d $([System.IO.Path]::GetFullPath($(MSBuildProjectDirectory)/../native/build/deps)) @(GoogleCastiOSSdkArchives)" />
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\eng\Common.macios.targets" />
 </Project>
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="local" value="eng/src/Microsoft.Maui.BindingExtensions.Build.Tasks/bin/Release" />
+  </packageSources>
+</configuration>