[mapguide-commits] r8768 - in trunk/Tools/Maestro: Maestro.AddIn.Rest MaestroAPITestRunner

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-10-01 05:47:36 -0700 (Thu, 01 Oct 2015)
New Revision: 8768

Modified:
   trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj
   trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
Log:
Project fixes:
 - Fix ICSharpCode.TextEditor dependency on Maestro.AddIn.Rest (it was a bin reference instead of a project-level one)
 - Fix postbuild of MaestroAPITestRunner so that it works on source directories containing spaces. We wrap the whole postbuild step in a pushd/popd pair so that the xcopy exclude flag can be a relative path.

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj	2015-09-25 12:45:42 UTC (rev 8767)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj	2015-10-01 12:47:36 UTC (rev 8768)
@@ -32,10 +32,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.TextEditor">
-      <HintPath>..\SDK\bin\ICSharpCode.TextEditor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\Maestro\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
@@ -166,6 +162,11 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Thirdparty\SharpDevelop\ICSharpCode.TextEditor\ICSharpCode.TextEditor.csproj">
+      <Project>{2d18be89-d210-49eb-a9dd-2246fbb3df6d}</Project>
+      <Name>ICSharpCode.TextEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Manifest.addin">

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj	2015-09-25 12:45:42 UTC (rev 8767)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj	2015-10-01 12:47:36 UTC (rev 8768)
@@ -164,6 +164,7 @@
   -->
   <PropertyGroup>
     <PostBuildEvent>echo Performing post-build for Test Runner in $(ConfigurationName)
+pushd "$(ProjectDir)"
 IF "$(ConfigurationName)" == "Release" (
 IF NOT EXIST "$(SolutionDir)..\SDK\Test" MKDIR "$(SolutionDir)..\SDK\Test"
 echo Copy binaries to SDK output dir
@@ -171,8 +172,8 @@
 XCOPY /S /Y /I "$(TargetDir)TestData\*.*" "$(SolutionDir)..\SDK\Test\TestData"
 echo XCOPY /S /Y /I "$(TargetDir)UserTestData\*.*" "$(SolutionDir)..\SDK\Test\UserTestData"
 XCOPY /S /Y /I "$(TargetDir)UserTestData\*.*" "$(SolutionDir)..\SDK\Test\UserTestData"
-echo XCOPY /Y /I "$(TargetDir)*.*" "$(SolutionDir)..\SDK\Test" /EXCLUDE:$(ProjectDir)sdk_excludes.txt
-XCOPY /Y /I "$(TargetDir)*.*" "$(SolutionDir)..\SDK\Test" /EXCLUDE:$(ProjectDir)sdk_excludes.txt
+echo XCOPY /Y /I "$(TargetDir)*.*" "$(SolutionDir)..\SDK\Test" /EXCLUDE:sdk_excludes.txt
+XCOPY /Y /I "$(TargetDir)*.*" "$(SolutionDir)..\SDK\Test" /EXCLUDE:sdk_excludes.txt
 echo Copy SDK test configuration
 echo COPY /Y "$(ProjectDir)TestMaestroAPI.LocalNative.xml" "$(SolutionDir)..\SDK\Test\TestMaestroAPI.xml"
 COPY /Y "$(ProjectDir)TestMaestroAPI.LocalNative.xml" "$(SolutionDir)..\SDK\Test\TestMaestroAPI.xml"
@@ -185,7 +186,8 @@
 echo Copy CS-Map Dictionaries
 IF NOT EXIST "$(OutDir)Dictionaries" XCOPY /S /Y /I "$(SolutionDir)..\Maestro.AddIn.Local\Dictionaries\*.*" "$(ProjectDir)$(OutDir)Dictionaries"
 xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.3.0.0.8701\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.3.0.0.8701\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.3.0.0.8701\mg-desktop\*.*" "$(TargetDir)"
+popd</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">