GNOME.org
 

[tasque/xbuild] [xbuild] Return to MD friendly Compile targets; turn off AutoInstall

commit 79a517a65eb4d939fbfcf372bf7e54911784542f
Author: Antonius Riha <antoniusriha gmail com>
Date:   Mon Nov 19 00:04:34 2012 +0100

    [xbuild] Return to MD friendly Compile targets; turn off AutoInstall
    
    * Installing automatically interferes with MD, which likes to know where
    the output files are. Therefore
    * Compile targets hae been used instead of TasqueCompile targets,
    which integrate better in MD.
    * X.CSharp.targets has been dropped, because it is now superfluous
    * Some parts of Makefile.am had to be reorganized

 Makefile.am                                        |   31 +++++++---
 build/X.CSharp.targets                             |   21 -------
 build/X.Common.targets                             |   46 +++++----------
 build/build.csproj                                 |    1 -
 src/Addins/Backends/Dummy/DummyBackend.csproj      |   16 +++---
 src/Addins/Backends/Eds/EdsBackend.csproj          |   14 ++--
 .../Backends/Hiveminder/HiveminderBackend.csproj   |   18 +++---
 src/Addins/Backends/IceCore/IceCoreBackend.csproj  |   16 +++---
 src/Addins/Backends/Rtm/RtmBackend.csproj          |   18 +++---
 src/Addins/Backends/Sqlite/SqliteBackend.csproj    |   18 +++---
 src/Gtk.Tasque/Gtk.Tasque.csproj                   |   60 ++++++++++----------
 src/Libraries/RtmNet/RtmNet.csproj                 |   56 +++++++++---------
 src/libtasque/libtasque.csproj                     |   56 +++++++++---------
 src/tasque/tasque.csproj                           |   10 ++--
 tests/tests.csproj                                 |    4 +-
 15 files changed, 180 insertions(+), 205 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 350d4da..2007880 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,14 +79,14 @@ pkgdata_DATA =  $(DLL_REFERENCES)
 
 DLL_REFERENCES =   
 
-EXTRA_DIST = \
-	$(DLL_REFERENCES) \
+CONFIG_CLEAN_FILES =
+
+_DISTFILES = \
 	MAINTAINERS \
 	AUTHORS \
 	TRANSLATORS \
 	COPYING \
 	LICENSE_EPL \
-	tasque.sln \
 	build/build.csproj \
 	build/Properties/AssemblyInfo.cs \
 	build/CommonAssemblyInfo.cs \
@@ -94,11 +94,13 @@ EXTRA_DIST = \
 	build/GetRelPath.cs \
 	build/GetAbsPath.cs \
 	build/GetAbsSrcDir.cs \
-	build/NormalizePath.cs \
+	build/NormalizePath.cs
+
+_BUILDFILES = \
+	tasque.sln \
 	build/X.Common.targets \
 	build/X.Substitute.targets \
 	build/X.Translate.targets \
-	build/X.CSharp.targets \
 	src/Libraries/RtmNet/RtmNet.csproj \
 	src/libtasque/libtasque.csproj \
 	src/Gtk.Tasque/Gtk.Tasque.csproj \
@@ -113,8 +115,12 @@ EXTRA_DIST = \
 	tests/tests.csproj \
 	po/po.mdproj
 
+EXTRA_DIST = \
+		$(DLL_REFERENCES) \
+		$(_DISTFILES) \
+		$(_BUILDFILES)
+
 DISTCLEANFILES = \
-        $(EXTRA_DIST) \
         po/.intltool-merge-cache \
         po/POTFILES
 
@@ -138,12 +144,19 @@ uninstall:
 dist-hook: change-log
 	$(XBUILD) $(PROPERTIES) /property:alttarget=dist tasque.sln
 
+distclean-local:
+	$(XBUILD) $(PROPERTIES) /property:alttarget=distclean tasque.sln
+	rm -rf $(_BUILDFILES)
+	rm -rf $(_DISTFILES)
+	rm -f build/build.dll build/build.dll.mdb
+	rm -rf build/obj
+
 distcheck-hook:
 	$(XBUILD) $(PROPERTIES) /property:alttarget=distcheck tasque.sln
 
-clean-generic: clean
-	rm -f build/build.dll build/build.dll.mdb
-	rm -rf build/obj
+clean-local:
+	rm -f $(shell find -name *.dll)
+	rm -f $(shell find -name *.mdb)
 
 change-log:
 	@if test -d "$(srcdir)/.git"; \
diff --git a/build/X.Common.targets b/build/X.Common.targets
index 1db3311..9c458ca 100644
--- a/build/X.Common.targets
+++ b/build/X.Common.targets
@@ -157,11 +157,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <BuildingSolutionFile>True</BuildingSolutionFile>
     <BuildEnabled Condition=" '$(BuildEnabled)' == '' ">true</BuildEnabled>
-    <AutoInstall Condition=" '$(AutoInstall)' == '' ">true</AutoInstall>
-    <!-- if AltTarget is set, disable AutoInstall -->
-    <AutoInstall Condition=" '$(AltTarget)' != '' ">false</AutoInstall>
     
     <!-- Package name defaults to solution name -->
     <PackageName Condition=" '$(PackageName)' == '' " >$(SolutionName)</PackageName>
@@ -224,8 +220,12 @@
     <BuildDependsOn></BuildDependsOn>
   </PropertyGroup>
   
+  <Target Name="BeforeBuild" DependsOnTargets="$(TasqueBuildDependsOn)" />
+  <Target Name="BeforeTasqueBuild" />
+  
   <PropertyGroup>
     <TasqueBuildDependsOn>
+      CopyToBuildDir;
       Substitute;
       GettextCompile;
       Translate;
@@ -234,32 +234,13 @@
     <TasqueBuildDependsOn Condition=" '$(AltTarget)' != '' ">$(AltTarget)</TasqueBuildDependsOn>
   </PropertyGroup>
   
-  <Target Name="BeforeBuild" DependsOnTargets="$(TasqueBuildDependsOn)" />
-  <Target Name="BeforeTasqueBuild" />
-  
-  <PropertyGroup>
-    <AfterBuildDependsOn>
-      Install;
-      AfterTasqueBuild;
-    </AfterBuildDependsOn>
-    <AfterBuildDependsOn Condition=" !'$(AutoInstall)' ">AfterTasqueBuild</AfterBuildDependsOn>
-  </PropertyGroup>
-  
-  <Target Name="AfterBuild"  DependsOnTargets="$(AfterBuildDependsOn)" />
-  <Target Name="AfterTasqueBuild" />
+  <!-- Copy all items to build dir (bootstrap target) -->
+  <Target Name="CopyToBuildDir" Condition=" '$(BuildDir)' != '$(SrcDir)' AND '@(Compile)' != '' ">
+    <Copy SourceFiles="$(SrcDir)\%(Compile.RelativeDir)%(FileName)%(Extension)"
+          DestinationFiles="$(BuildDir)\%(Compile.RelativeDir)%(FileName)%(Extension)" SkipUnchangedFiles="true" />
+  </Target>
   
   <!-- Clean -->
-  <PropertyGroup>
-    <BeforeCleanDependsOn>
-      BeforeTasqueClean;
-      Uninstall;
-    </BeforeCleanDependsOn>
-    <BeforeCleanDependsOn Condition=" !'$(AutoInstall)' ">BeforeTasqueClean</BeforeCleanDependsOn>
-  </PropertyGroup>
-  
-  <Target Name="BeforeClean" DependsOnTargets="$(BeforeCleanDependsOn)" />
-  <Target Name="BeforeTasqueClean" />
-  
   <Target Name="AfterClean">
     <CreateItem Condition=" '@(Translate)' != '' " Include="%(Translate.RelativeDir)%(Translate.FileName)">
       <Output TaskParameter="Include" ItemName="TasqueCleanFile" />
@@ -335,10 +316,13 @@
   <Target Name="BeforeDistClean" />
   <Target Name="AfterDistClean" />
   <Target Name="CoreDistClean" DependsOnTargets="Clean;_CheckAbsDistDir">
-    <Delete Files="$(AbsDistDir)\%(DistCleanFile.RelativeDir)%(FileName)%(Extension)" />
+    <CreateItem Include="@(Compile)">
+      <Output TaskParameter="Include" ItemName="DistCleanFile" />
+    </CreateItem>
+    <Delete Files="@(DistCleanFile)" />
   </Target>
   
-  <!-- Private -->  
+  <!-- Private -->
   <Target Name="_CheckAbsDistDir">
     <Message Text="AbsDistDir=$(AbsDistDir)" />
     <Error Condition=" '$(AbsDistDir)' == '' " Text="Property AbsDistDir not set. Target Dist requires AbsDistDir to be set." />
@@ -393,7 +377,7 @@
   </Target>
   
   <Target Name="_SetupDistFile">
-    <CreateItem Include="@(TasqueCompile);@(Icon);@(PkgIcon);@(PkgSound);@(GettextCompile);@(Translate);@(Substitute)">
+    <CreateItem Include="@(Compile);@(Icon);@(PkgIcon);@(PkgSound);@(GettextCompile);@(Translate);@(Substitute)">
       <Output TaskParameter="Include" ItemName="DistFile" />
     </CreateItem>
   </Target>
diff --git a/build/build.csproj b/build/build.csproj
index f64fc48..32d590a 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -82,7 +82,6 @@
     <Proj Include="..\tasque.sln">
       <Link>tasque.sln</Link>
     </Proj>
-    <Proj Include="X.CSharp.targets" />
     <Proj Include="X.Common.targets" />
     <Proj Include="X.Substitute.targets" />
     <Proj Include="X.Translate.targets" />
diff --git a/src/Addins/Backends/Dummy/DummyBackend.csproj b/src/Addins/Backends/Dummy/DummyBackend.csproj
index c1e765b..e478b1c 100644
--- a/src/Addins/Backends/Dummy/DummyBackend.csproj
+++ b/src/Addins/Backends/Dummy/DummyBackend.csproj
@@ -44,14 +44,14 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="DummyTask.cs" />
-    <TasqueCompile Include="DummyNote.cs" />
-    <TasqueCompile Include="DummyCategory.cs" />
-    <TasqueCompile Include="DummyBackend.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="DummyTask.cs" />
+    <Compile Include="DummyNote.cs" />
+    <Compile Include="DummyCategory.cs" />
+    <Compile Include="DummyBackend.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Gtk.Tasque\Gtk.Tasque.csproj">
@@ -66,5 +66,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\..\..\build\X.Common.targets" />
 </Project>
diff --git a/src/Addins/Backends/Eds/EdsBackend.csproj b/src/Addins/Backends/Eds/EdsBackend.csproj
index 33b2782..8b5d0a8 100644
--- a/src/Addins/Backends/Eds/EdsBackend.csproj
+++ b/src/Addins/Backends/Eds/EdsBackend.csproj
@@ -47,14 +47,14 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="EdsBackends.cs" />
-    <TasqueCompile Include="EdsCategory.cs" />
-    <TasqueCompile Include="EdsNote.cs" />
-    <TasqueCompile Include="EdsTask.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="EdsBackends.cs" />
+    <Compile Include="EdsCategory.cs" />
+    <Compile Include="EdsNote.cs" />
+    <Compile Include="EdsTask.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj b/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
index f7f7350..717ccb3 100644
--- a/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
+++ b/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
@@ -51,15 +51,15 @@
     <Reference Include="Mono.Posix" />
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="HmBackend.cs" />
-    <TasqueCompile Include="HmCategory.cs" />
-    <TasqueCompile Include="HmNote.cs" />
-    <TasqueCompile Include="HmPreferencesWidget.cs" />
-    <TasqueCompile Include="HmTask.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="HmBackend.cs" />
+    <Compile Include="HmCategory.cs" />
+    <Compile Include="HmNote.cs" />
+    <Compile Include="HmPreferencesWidget.cs" />
+    <Compile Include="HmTask.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\libtasque\libtasque.csproj">
@@ -70,5 +70,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\..\..\build\X.Common.targets" />
 </Project>
diff --git a/src/Addins/Backends/IceCore/IceCoreBackend.csproj b/src/Addins/Backends/IceCore/IceCoreBackend.csproj
index a1325d9..c1c8b69 100644
--- a/src/Addins/Backends/IceCore/IceCoreBackend.csproj
+++ b/src/Addins/Backends/IceCore/IceCoreBackend.csproj
@@ -49,17 +49,17 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="IceBackend.cs" />
-    <TasqueCompile Include="IceCategory.cs" />
-    <TasqueCompile Include="IceNote.cs" />
-    <TasqueCompile Include="IceTask.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="IceBackend.cs" />
+    <Compile Include="IceCategory.cs" />
+    <Compile Include="IceNote.cs" />
+    <Compile Include="IceTask.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\..\..\build\X.Common.targets" />
 </Project>
diff --git a/src/Addins/Backends/Rtm/RtmBackend.csproj b/src/Addins/Backends/Rtm/RtmBackend.csproj
index dd80344..e50ac4d 100644
--- a/src/Addins/Backends/Rtm/RtmBackend.csproj
+++ b/src/Addins/Backends/Rtm/RtmBackend.csproj
@@ -72,19 +72,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="RtmTask.cs" />
-    <TasqueCompile Include="RtmNote.cs" />
-    <TasqueCompile Include="RtmCategory.cs" />
-    <TasqueCompile Include="RtmBackend.cs" />
-    <TasqueCompile Include="Gtk\RtmPreferencesWidget.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="RtmTask.cs" />
+    <Compile Include="RtmNote.cs" />
+    <Compile Include="RtmCategory.cs" />
+    <Compile Include="RtmBackend.cs" />
+    <Compile Include="Gtk\RtmPreferencesWidget.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Gtk\" />
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\..\..\build\X.Common.targets" />
 </Project>
diff --git a/src/Addins/Backends/Sqlite/SqliteBackend.csproj b/src/Addins/Backends/Sqlite/SqliteBackend.csproj
index 07159ed..66a1ca0 100644
--- a/src/Addins/Backends/Sqlite/SqliteBackend.csproj
+++ b/src/Addins/Backends/Sqlite/SqliteBackend.csproj
@@ -80,20 +80,20 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="SqliteTask.cs" />
-    <TasqueCompile Include="SqliteNote.cs" />
-    <TasqueCompile Include="SqliteCategory.cs" />
-    <TasqueCompile Include="SqliteBackend.cs" />
-    <TasqueCompile Include="Database.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="SqliteTask.cs" />
+    <Compile Include="SqliteNote.cs" />
+    <Compile Include="SqliteCategory.cs" />
+    <Compile Include="SqliteBackend.cs" />
+    <Compile Include="Database.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\..\..\build\X.Common.targets" />
   <Target Name="BeforeInstall" Condition=" '$(Configuration)' == 'GtkWinDebug' Or '$(Configuration)' == 'GtkWinRelease' ">
     <CreateItem Include="..\..\..\..\winbin\sqlite3.dll"
         AdditionalMetadata="InstallPath=$(PkgLibDir);InstallFileName=sqlite3.dll">
diff --git a/src/Gtk.Tasque/Gtk.Tasque.csproj b/src/Gtk.Tasque/Gtk.Tasque.csproj
index 59e464e..d4092e2 100644
--- a/src/Gtk.Tasque/Gtk.Tasque.csproj
+++ b/src/Gtk.Tasque/Gtk.Tasque.csproj
@@ -78,39 +78,39 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Defines.cs" />
-    <TasqueCompile Include="GtkTray.cs" />
-    <TasqueCompile Include="StatusIconTray.cs" />
-    <TasqueCompile Condition=" '$(AppIndicator)' != '' " Include="AppIndicatorTray.cs" />
-    <TasqueCompile Include="AbstractTask.cs" />
-    <TasqueCompile Include="AllCategory.cs" />
-    <TasqueCompile Include="Application.cs" />
-    <TasqueCompile Include="CellRendererDate.cs" />
-    <TasqueCompile Include="CompletedTaskGroup.cs" />
-    <TasqueCompile Include="CompletedTaskGroupModel.cs" />
-    <TasqueCompile Include="DateButton.cs" />
-    <TasqueCompile Include="GnomeApplication.cs" />
-    <TasqueCompile Include="GtkApplication.cs" />
-    <TasqueCompile Include="Logger.cs" />
-    <TasqueCompile Include="NoteDialog.cs" />
-    <TasqueCompile Include="NoteWidget.cs" />
+    <Compile Include="GtkTray.cs" />
+    <Compile Include="StatusIconTray.cs" />
+    <Compile Condition=" '$(AppIndicator)' != '' " Include="AppIndicatorTray.cs" />
+    <Compile Include="AbstractTask.cs" />
+    <Compile Include="AllCategory.cs" />
+    <Compile Include="Application.cs" />
+    <Compile Include="CellRendererDate.cs" />
+    <Compile Include="CompletedTaskGroup.cs" />
+    <Compile Include="CompletedTaskGroupModel.cs" />
+    <Compile Include="DateButton.cs" />
+    <Compile Include="GnomeApplication.cs" />
+    <Compile Include="GtkApplication.cs" />
+    <Compile Include="Logger.cs" />
+    <Compile Include="NoteDialog.cs" />
+    <Compile Include="NoteWidget.cs" />
     <None Include="OSXApplication.cs" />
-    <TasqueCompile Include="Preferences.cs" />
-    <TasqueCompile Include="PreferencesDialog.cs" />
-    <TasqueCompile Include="TaskCalendar.cs" />
-    <TasqueCompile Include="TaskGroup.cs" />
-    <TasqueCompile Include="TaskGroupModel.cs" />
-    <TasqueCompile Include="TaskGroupModelFactory.cs" />
-    <TasqueCompile Include="TaskTreeView.cs" />
-    <TasqueCompile Include="TaskWindow.cs" />
-    <TasqueCompile Include="Utilities.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="Preferences.cs" />
+    <Compile Include="PreferencesDialog.cs" />
+    <Compile Include="TaskCalendar.cs" />
+    <Compile Include="TaskGroup.cs" />
+    <Compile Include="TaskGroupModel.cs" />
+    <Compile Include="TaskGroupModelFactory.cs" />
+    <Compile Include="TaskTreeView.cs" />
+    <Compile Include="TaskWindow.cs" />
+    <Compile Include="Utilities.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' == 'LinuxDebug' Or '$(Configuration)' == 'LinuxRelease' ">
-    <TasqueCompile Include="RemoteControl.cs" />
-    <TasqueCompile Include="RemoteControlProxy.cs" />
+    <Compile Include="RemoteControl.cs" />
+    <Compile Include="RemoteControlProxy.cs" />
   </ItemGroup>
   <ItemGroup>
     <Substitute Include="Defines.cs.in" />
@@ -118,7 +118,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\build\X.Common.targets" />
   <Target Name="BeforeSubstitute">
     <CreateItem Include="@license@|$(SrcDir)\..\..\COPYING|path">
       <Output TaskParameter="Include" ItemName="Substitution" />
diff --git a/src/Libraries/RtmNet/RtmNet.csproj b/src/Libraries/RtmNet/RtmNet.csproj
index d78e270..4fae49c 100644
--- a/src/Libraries/RtmNet/RtmNet.csproj
+++ b/src/Libraries/RtmNet/RtmNet.csproj
@@ -33,34 +33,34 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="ApiKeyRequiredException.cs" />
-    <TasqueCompile Include="Auth.cs" />
-    <TasqueCompile Include="AuthenticationRequiredException.cs" />
-    <TasqueCompile Include="Categories.cs" />
-    <TasqueCompile Include="Contacts.cs" />
-    <TasqueCompile Include="DateGranularity.cs" />
-    <TasqueCompile Include="Enums.cs" />
-    <TasqueCompile Include="Groups.cs" />
-    <TasqueCompile Include="GroupSearchResults.cs" />
-    <TasqueCompile Include="HttpUtility.cs" />
-    <TasqueCompile Include="List.cs" />
-    <TasqueCompile Include="Methods.cs" />
-    <TasqueCompile Include="Note.cs" />
-    <TasqueCompile Include="Response.cs" />
-    <TasqueCompile Include="ResponseXmlException.cs" />
-    <TasqueCompile Include="Rtm.cs" />
-    <TasqueCompile Include="RtmApiException.cs" />
-    <TasqueCompile Include="RtmException.cs" />
-    <TasqueCompile Include="RtmWebException.cs" />
-    <TasqueCompile Include="SignatureRequiredException.cs" />
-    <TasqueCompile Include="Tags.cs" />
-    <TasqueCompile Include="Task.cs" />
-    <TasqueCompile Include="User.cs" />
-    <TasqueCompile Include="Utils.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="ApiKeyRequiredException.cs" />
+    <Compile Include="Auth.cs" />
+    <Compile Include="AuthenticationRequiredException.cs" />
+    <Compile Include="Categories.cs" />
+    <Compile Include="Contacts.cs" />
+    <Compile Include="DateGranularity.cs" />
+    <Compile Include="Enums.cs" />
+    <Compile Include="Groups.cs" />
+    <Compile Include="GroupSearchResults.cs" />
+    <Compile Include="HttpUtility.cs" />
+    <Compile Include="List.cs" />
+    <Compile Include="Methods.cs" />
+    <Compile Include="Note.cs" />
+    <Compile Include="Response.cs" />
+    <Compile Include="ResponseXmlException.cs" />
+    <Compile Include="Rtm.cs" />
+    <Compile Include="RtmApiException.cs" />
+    <Compile Include="RtmException.cs" />
+    <Compile Include="RtmWebException.cs" />
+    <Compile Include="SignatureRequiredException.cs" />
+    <Compile Include="Tags.cs" />
+    <Compile Include="Task.cs" />
+    <Compile Include="User.cs" />
+    <Compile Include="Utils.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <DistFile Include="License.txt" />
@@ -71,5 +71,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\..\build\X.Common.targets" />
 </Project>
diff --git a/src/libtasque/libtasque.csproj b/src/libtasque/libtasque.csproj
index 9ae47cb..f648697 100644
--- a/src/libtasque/libtasque.csproj
+++ b/src/libtasque/libtasque.csproj
@@ -40,38 +40,38 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="IBackend.cs" />
-    <TasqueCompile Include="ICategory.cs" />
-    <TasqueCompile Include="INote.cs" />
-    <TasqueCompile Include="ITask.cs" />
-    <TasqueCompile Include="TaskPriority.cs" />
-    <TasqueCompile Include="TaskState.cs" />
-    <TasqueCompile Include="TaskParser.cs" />
-    <TasqueCompile Include="DateFormatterFactory.cs" />
-    <TasqueCompile Include="DateFormatters\IDateFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\WeekdayFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\OrdinalFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\WeekFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\StringInsensitiveComparer.cs" />
-    <TasqueCompile Include="DateFormatters\QuantityFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\YearFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\DateFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\MonthFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\TodayTomorrowFormatter.cs" />
-    <TasqueCompile Include="RegularExpressionFormatter.cs" />
-    <TasqueCompile Include="TranslatableToken.cs" />
-    <TasqueCompile Include="Extensions.cs" />
-    <TasqueCompile Include="DateFormatters\DayFormatter.cs" />
-    <TasqueCompile Include="DateFormatters\DateSeparatedFormatter.cs" />
-    <TasqueCompile Include="INativeApplication.cs" />
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="IBackend.cs" />
+    <Compile Include="ICategory.cs" />
+    <Compile Include="INote.cs" />
+    <Compile Include="ITask.cs" />
+    <Compile Include="TaskPriority.cs" />
+    <Compile Include="TaskState.cs" />
+    <Compile Include="TaskParser.cs" />
+    <Compile Include="DateFormatterFactory.cs" />
+    <Compile Include="DateFormatters\IDateFormatter.cs" />
+    <Compile Include="DateFormatters\WeekdayFormatter.cs" />
+    <Compile Include="DateFormatters\OrdinalFormatter.cs" />
+    <Compile Include="DateFormatters\WeekFormatter.cs" />
+    <Compile Include="DateFormatters\StringInsensitiveComparer.cs" />
+    <Compile Include="DateFormatters\QuantityFormatter.cs" />
+    <Compile Include="DateFormatters\YearFormatter.cs" />
+    <Compile Include="DateFormatters\DateFormatter.cs" />
+    <Compile Include="DateFormatters\MonthFormatter.cs" />
+    <Compile Include="DateFormatters\TodayTomorrowFormatter.cs" />
+    <Compile Include="RegularExpressionFormatter.cs" />
+    <Compile Include="TranslatableToken.cs" />
+    <Compile Include="Extensions.cs" />
+    <Compile Include="DateFormatters\DayFormatter.cs" />
+    <Compile Include="DateFormatters\DateSeparatedFormatter.cs" />
+    <Compile Include="INativeApplication.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="DateFormatters\" />
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\build\X.Common.targets" />
 </Project>
diff --git a/src/tasque/tasque.csproj b/src/tasque/tasque.csproj
index 5201505..e7524fa 100644
--- a/src/tasque/tasque.csproj
+++ b/src/tasque/tasque.csproj
@@ -85,11 +85,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
-    <TasqueCompile Include="Program.cs" />
-    <TasqueCompile Include="..\..\build\CommonAssemblyInfo.cs">
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="..\..\build\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </TasqueCompile>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <DistFile Include="Tasque.exe.config" />
@@ -102,7 +102,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\build\X.CSharp.targets" />
+  <Import Project="..\..\build\X.Common.targets" />
   <Target Name="AfterSubstitute" Condition=" '$(Configuration)' == 'GtkLinuxDebug' Or '$(Configuration)' == 'GtkLinuxRelease' ">
     <Exec Command="chmod +x tasque" />
   </Target>
diff --git a/tests/tests.csproj b/tests/tests.csproj
index d8cf4ef..c6dd7d9 100644
--- a/tests/tests.csproj
+++ b/tests/tests.csproj
@@ -32,7 +32,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <TasqueCompile Include="TaskParserFixture.cs" />
+    <Compile Include="TaskParserFixture.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\libtasque\libtasque.csproj">
@@ -40,5 +40,5 @@
       <Name>libtasque</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="..\build\X.CSharp.targets" />
+  <Import Project="..\build\X.Common.targets" />
 </Project>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]