GNOME.org
 

[tasque/windows] [xbuild] Move proj import on proper location in proj files

commit 14f0f7d75e5190abc0da5fd9bc1ca11afe15fb05
Author: Antonius Riha <antoniusriha gmail com>
Date:   Sat Sep 22 15:45:12 2012 +0200

    [xbuild] Move proj import on proper location in proj files
    
    The proper location is after Property and Item definitions and
    before target definitions.

 build/build.csproj                                 |    2 +-
 data/data.mdproj                                   |    2 +-
 po/po.mdproj                                       |    2 +-
 src/Addins/Backends/Dummy/DummyBackend.csproj      |    2 +-
 src/Addins/Backends/Eds/EdsBackend.csproj          |    2 +-
 .../Backends/Hiveminder/HiveminderBackend.csproj   |    2 +-
 src/Addins/Backends/IceCore/IceCoreBackend.csproj  |    2 +-
 src/Addins/Backends/Rtm/RtmBackend.csproj          |    2 +-
 src/Addins/Backends/Sqlite/SqliteBackend.csproj    |    1 -
 src/Gtk.Tasque/Gtk.Tasque.csproj                   |    2 +-
 src/Libraries/RtmNet/RtmNet.csproj                 |    2 +-
 src/MonoMac.Tasque/MonoMac.Tasque.csproj           |    2 +-
 src/libtasque/libtasque.csproj                     |    2 +-
 src/tasque/tasque.csproj                           |    2 +-
 tests/tests.csproj                                 |    2 +-
 15 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/build/build.csproj b/build/build.csproj
index 9aada3a..bef2f27 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -25,7 +25,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
@@ -91,6 +90,7 @@
     <Folder Include="Addins\" />
     <Folder Include="Addins\Backends\" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="Bootstrap">
     <Error Condition=" '$(TopSrcDir)' == '' " Text="TopSrcDir cannot be empty." />
     <Error Condition=" '$(TopBuildDir)' == '' " Text="TopBuildDir cannot be empty." />
diff --git a/data/data.mdproj b/data/data.mdproj
index b5b802f..4e10023 100644
--- a/data/data.mdproj
+++ b/data/data.mdproj
@@ -19,7 +19,6 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MacOsx|AnyCPU' ">
   </PropertyGroup>
-  <Import Project="..\build\Tasque.targets" />
   <ItemGroup>
     <Icon Include="images\tasque-16.png">
       <Name>tasque.png</Name>
@@ -159,6 +158,7 @@
     <Folder Include="images\" />
     <Folder Include="sounds\" />
   </ItemGroup>
+  <Import Project="..\build\Tasque.targets" />
   <!-- CoreBuild (ignore) -->
   <Target Name="CoreBuild" />
   <!-- Install -->
diff --git a/po/po.mdproj b/po/po.mdproj
index 6dd89df..3c2d8be 100644
--- a/po/po.mdproj
+++ b/po/po.mdproj
@@ -61,7 +61,6 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Default' " />
   <!-- The above is only for the MD Gettext addin, which provides a convenient environment for translation -->
   <!-- Below are the xbuild instructions. New translations should be added to the GettextTranslation ItemGroup. -->
-  <Import Project="..\build\Tasque.targets" />
   <PropertyGroup>
     <RelPrefix Condition=" '$(RelPrefix)' == '' ">..\build\bin</RelPrefix>
     <TopSrcDir Condition=" '$(TopSrcDir)' == '' ">..</TopSrcDir>
@@ -110,6 +109,7 @@
     <DistFile Include="POTFILES.in" />
     <DistFile Include="po.mdproj" />
   </ItemGroup>
+  <Import Project="..\build\Tasque.targets" />
   <Target Name="Update">
     <Exec Command="$(IntlToolUpdate) --gettext-package tasque --pot" />
     <Exec Command="$(IntlToolUpdate) --gettext-package tasque --dist -o %(GettextCompile.FileName).new.po %(GettextCompile.FileName)" />
diff --git a/src/Addins/Backends/Dummy/DummyBackend.csproj b/src/Addins/Backends/Dummy/DummyBackend.csproj
index 1f68f23..a72ece5 100644
--- a/src/Addins/Backends/Dummy/DummyBackend.csproj
+++ b/src/Addins/Backends/Dummy/DummyBackend.csproj
@@ -31,7 +31,6 @@
     <Optimize>False</Optimize>
     <DefineConstants>DEBUG;TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
@@ -62,4 +61,5 @@
       <Name>libtasque</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
 </Project>
diff --git a/src/Addins/Backends/Eds/EdsBackend.csproj b/src/Addins/Backends/Eds/EdsBackend.csproj
index 4a5fbc8..64481f0 100644
--- a/src/Addins/Backends/Eds/EdsBackend.csproj
+++ b/src/Addins/Backends/Eds/EdsBackend.csproj
@@ -36,7 +36,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
@@ -50,4 +49,5 @@
     <TasqueCompile Include="EdsNote.cs" />
     <TasqueCompile Include="EdsTask.cs" />
   </ItemGroup>
+  <Import Project="..\..\..\..\build\Tasque.targets" />
 </Project>
diff --git a/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj b/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
index a3a498f..f99b6dd 100644
--- a/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
+++ b/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
@@ -42,7 +42,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
@@ -65,4 +64,5 @@
       <Name>libtasque</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
 </Project>
diff --git a/src/Addins/Backends/IceCore/IceCoreBackend.csproj b/src/Addins/Backends/IceCore/IceCoreBackend.csproj
index cdda501..5006d66 100644
--- a/src/Addins/Backends/IceCore/IceCoreBackend.csproj
+++ b/src/Addins/Backends/IceCore/IceCoreBackend.csproj
@@ -42,7 +42,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
@@ -56,4 +55,5 @@
     <TasqueCompile Include="IceNote.cs" />
     <TasqueCompile Include="IceTask.cs" />
   </ItemGroup>
+  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
 </Project>
diff --git a/src/Addins/Backends/Rtm/RtmBackend.csproj b/src/Addins/Backends/Rtm/RtmBackend.csproj
index 4e94852..f97048b 100644
--- a/src/Addins/Backends/Rtm/RtmBackend.csproj
+++ b/src/Addins/Backends/Rtm/RtmBackend.csproj
@@ -42,7 +42,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
@@ -84,4 +83,5 @@
   <ItemGroup>
     <Folder Include="Gtk\" />
   </ItemGroup>
+  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
 </Project>
diff --git a/src/Addins/Backends/Sqlite/SqliteBackend.csproj b/src/Addins/Backends/Sqlite/SqliteBackend.csproj
index 3c356d9..c9ef9ab 100644
--- a/src/Addins/Backends/Sqlite/SqliteBackend.csproj
+++ b/src/Addins/Backends/Sqlite/SqliteBackend.csproj
@@ -53,7 +53,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
diff --git a/src/Gtk.Tasque/Gtk.Tasque.csproj b/src/Gtk.Tasque/Gtk.Tasque.csproj
index 8d1222c..ff1b51a 100644
--- a/src/Gtk.Tasque/Gtk.Tasque.csproj
+++ b/src/Gtk.Tasque/Gtk.Tasque.csproj
@@ -46,7 +46,6 @@
     <DefineConstants>TRACE;WIN;$(GtkSharp12)</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
-  <Import Project="..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -116,4 +115,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <Import Project="..\..\build\Tasque.CSharp.targets" />
 </Project>
diff --git a/src/Libraries/RtmNet/RtmNet.csproj b/src/Libraries/RtmNet/RtmNet.csproj
index 0a83e3b..0d3db5e 100644
--- a/src/Libraries/RtmNet/RtmNet.csproj
+++ b/src/Libraries/RtmNet/RtmNet.csproj
@@ -29,7 +29,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
@@ -67,4 +66,5 @@
   <ItemGroup>
     <None Include="example_app.config" />
   </ItemGroup>
+  <Import Project="..\..\..\build\Tasque.CSharp.targets" />
 </Project>
diff --git a/src/MonoMac.Tasque/MonoMac.Tasque.csproj b/src/MonoMac.Tasque/MonoMac.Tasque.csproj
index b223256..ab4e88c 100644
--- a/src/MonoMac.Tasque/MonoMac.Tasque.csproj
+++ b/src/MonoMac.Tasque/MonoMac.Tasque.csproj
@@ -35,7 +35,6 @@
     <ConsolePause>False</ConsolePause>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
@@ -45,4 +44,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/libtasque/libtasque.csproj b/src/libtasque/libtasque.csproj
index 4beeef4..42bff3c 100644
--- a/src/libtasque/libtasque.csproj
+++ b/src/libtasque/libtasque.csproj
@@ -28,7 +28,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System" />
@@ -72,4 +71,5 @@
     <Folder Include="DateFormatters\" />
     <Folder Include="Properties\" />
   </ItemGroup>
+  <Import Project="..\..\build\Tasque.CSharp.targets" />
 </Project>
diff --git a/src/tasque/tasque.csproj b/src/tasque/tasque.csproj
index d0a6adb..3df9620 100644
--- a/src/tasque/tasque.csproj
+++ b/src/tasque/tasque.csproj
@@ -72,7 +72,6 @@
     <Optimize>True</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
@@ -100,6 +99,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <Import Project="..\..\build\Tasque.CSharp.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 baf03ef..bc6e15e 100644
--- a/tests/tests.csproj
+++ b/tests/tests.csproj
@@ -35,11 +35,11 @@
   <ItemGroup>
     <TasqueCompile Include="TaskParserFixture.cs" />
   </ItemGroup>
-  <Import Project="..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\src\libtasque\libtasque.csproj">
       <Project>{784C9AA8-2B28-400B-8CC4-DCDC48CA37F0}</Project>
       <Name>libtasque</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\build\Tasque.CSharp.targets" />
 </Project>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]