addin-project.xml must be at root, and we must have a separate xbuild…

… file to build the XS addin it seems
mcneel · Nov 27, 2014 · 59fab32 · 59fab32
1 parent 221dbd5
commit 59fab32
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 38 deletions.
diff --git a/Resources/BuildXSAddin.targets b/Resources/BuildXSAddin.targets
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+        <BuildVersion>2.0.5</BuildVersion>
+	</PropertyGroup>
+	<Import Project="Publish.targets" />
+
+    <Target Name="Build" DependsOnTargets="UpdateAssemblyInfo">
+    	<!-- this builds the Xamarin Studio addin specifically for addins.monodevelop.com -->
+
+		<PropertyGroup>
+    		<AllPackagesConfig>$(MSBuildThisFileDirectory)\packages.config</AllPackagesConfig>
+    		<NugetOutputDir>$(BaseDir)\BuildOutput\Nuget\$(Configuration)</NugetOutputDir>
+		</PropertyGroup>
+
+    	<Exec Command="xbuild /t:'RestorePackages' /p:'PackagesDir=$(MSBuildThisFileDirectory);PackagesConfig=$(AllPackagesConfig)' '$(MSBuildProjectFile)'" Condition="$(Platform) != 'Windows'"/>
+
+    	<ItemGroup>
+    		<SourceNupkg Include="$(MSBuildThisFileDirectory)\packages\Eto.*\*.nupkg" />
+    	</ItemGroup>
+
+    	<MakeDir Directories="$(NugetOutputDir)" />
+		<Copy SourceFiles="%(SourceNupkg.Identity)" DestinationFiles="$(NugetOutputDir)\%(Filename)%(Extension)" />
+
+    	<Exec Command="xbuild /t:'RestorePackages' /p:'Configuration=$(Configuration)' '$(XamarinStudioAddinProject)'" Condition="$(Platform) != 'Windows'"/>
+    	<Exec Command="xbuild /t:'Build' /p:'Configuration=$(Configuration)' '$(XamarinStudioAddinProject)'" Condition="$(Platform) != 'Windows'"/>
+    	<MSBuild Projects="$(XamarinStudioAddinProject)" Targets="RestorePackages" Properties="Configuration=$(Configuration)" Condition="$(Platform) == 'Windows'" />
+    	<MSBuild Projects="$(XamarinStudioAddinProject)" Targets="Build" Properties="Configuration=$(Configuration)" Condition="$(Platform) == 'Windows'" />
+    </Target>
+	<Target Name="Clean">
+		<!-- placeholder -->
+	</Target>
+</Project>
diff --git a/Resources/Publish.targets b/Resources/Publish.targets
@@ -12,7 +12,6 @@
         <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
         <Platform Condition="$(Platform) == '' and '$(OS)' == 'Unix'">Mac</Platform>
         <Platform Condition="$(Platform) == '' and '$(OS)' != 'Unix'">Windows</Platform>
-        <XSAddinNugetVersion>2.0.5</XSAddinNugetVersion>
         <MSBuildCommunityVersion>1.4.0.78</MSBuildCommunityVersion>
 		<MSBuildCommunityTasksPath>$(MSBuildThisFileDirectory)\packages\MSBuildTasks.$(MSBuildCommunityVersion)\tools</MSBuildCommunityTasksPath>
 	    <MSBuildCommunityTasksLib>$([MSBUILD]::Unescape($(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll))</MSBuildCommunityTasksLib>
@@ -157,36 +156,6 @@
 		<!-- Visual Studio Addin -->
     	<MSBuild Projects="$(VisualStudioAddinProject)" Targets="Build" Properties="Configuration=$(Configuration)" Condition="$(Platform) == 'Windows'" />
     </Target>
-
-    <Target Name="_BuildXSAddinProperties">
-    	<PropertyGroup>
-	   		<!-- Version of packages to load from nuget -->
-    		<BuildVersion>$(XSAddinNugetVersion)</BuildVersion>
-    	</PropertyGroup>
-    	<Message Text="$(BuildVersion)"/>
-    </Target>
-    <Target Name="BuildXSAddin" DependsOnTargets="_BuildXSAddinProperties;UpdateAssemblyInfo">
-    	<!-- this builds the Xamarin Studio addin specifically for addins.monodevelop.com -->
-
-		<PropertyGroup>
-    		<AllPackagesConfig>$(MSBuildThisFileDirectory)\packages.config</AllPackagesConfig>
-    		<NugetOutputDir>$(BaseDir)\BuildOutput\Nuget\$(Configuration)</NugetOutputDir>
-		</PropertyGroup>
-
-    	<Exec Command="xbuild /t:'RestorePackages' /p:'PackagesDir=$(MSBuildThisFileDirectory);PackagesConfig=$(AllPackagesConfig)' '$(MSBuildProjectFile)'" Condition="$(Platform) != 'Windows'"/>
-
-    	<ItemGroup>
-    		<SourceNupkg Include="$(MSBuildThisFileDirectory)\packages\Eto.*\*.nupkg" />
-    	</ItemGroup>
-
-    	<MakeDir Directories="$(NugetOutputDir)" />
-		<Copy SourceFiles="%(SourceNupkg.Identity)" DestinationFiles="$(NugetOutputDir)\%(Filename)%(Extension)" />
-
-    	<Exec Command="xbuild /t:'RestorePackages' /p:'Configuration=$(Configuration)' '$(XamarinStudioAddinProject)'" Condition="$(Platform) != 'Windows'"/>
-    	<Exec Command="xbuild /t:'Build' /p:'Configuration=$(Configuration)' '$(XamarinStudioAddinProject)'" Condition="$(Platform) != 'Windows'"/>
-    	<MSBuild Projects="$(XamarinStudioAddinProject)" Targets="RestorePackages" Properties="Configuration=$(Configuration)" Condition="$(Platform) == 'Windows'" />
-    	<MSBuild Projects="$(XamarinStudioAddinProject)" Targets="Build" Properties="Configuration=$(Configuration)" Condition="$(Platform) == 'Windows'" />
-    </Target>
     <Target Name="Publish">
 		<GetAssemblyInfo AssemblyFileName="$(BuildOutputDir)\Eto.dll">
 			<Output TaskParameter="AssemblyInformationalVersion" PropertyName="AssemblyVersion" />

diff --git a/Resources/addin-project.xml b/Resources/addin-project.xml
diff --git a/addin-project.xml b/addin-project.xml
@@ -0,0 +1,6 @@
+<AddinProject appVersion="5.0">
+	<Project platforms="Mac Linux Win32">
+		<AddinFile>BuildOutput/Addins/Release/XamarinStudio/Eto.Addin.XamarinStudio.dll</AddinFile>
+		<BuildFile>Resources/BuildXSAddin.targets</BuildFile>
+	</Project>
+</AddinProject>