From c9960e86d21e0783f1d90a2b7008caa3a4d6063f Mon Sep 17 00:00:00 2001 From: Steven De Kock Date: Wed, 13 Jul 2011 23:05:22 +0200 Subject: [PATCH] Removing absolute paths. Adding debug and reference paths to project files. Everything should now work without having to change settings in VS. --- build.bat | 8 +++----- .../AgUnit.Runner.Resharper60.TaskRunner.csproj | 9 ++++++--- .../AgUnit.Runner.Resharper60.csproj | 7 +++++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build.bat b/build.bat index 867f611..a2d2aea 100644 --- a/build.bat +++ b/build.bat @@ -1,14 +1,12 @@ @echo off -if "%ProgramFiles(x86)%" == "" set ProgramFiles(x86)=%ProgramFiles% - -set ReSharperPath="%ProgramFiles(x86)%\JetBrains\ReSharper\v6.0\Bin" set Configuration=Debug -echo Building against ReSharper in %ReSharperPath% call "%vs100comntools%\vsvars32.bat" + pushd lib\sl\StatLight\ powershell -NoProfile -Command "& { Import-Module .\psake.psm1; Invoke-psake .\default.ps1 "build-all" -parameters @{"build_configuration"='%Configuration%';} }" popd -msbuild src\AgUnit.sln /p:Configuration=%Configuration%;ReferencePath=%ReSharperPath% /t:Rebuild + +msbuild src\AgUnit.sln /p:Configuration=%Configuration% /t:Rebuild pause \ No newline at end of file diff --git a/src/AgUnit.Runner.Resharper60.TaskRunner/AgUnit.Runner.Resharper60.TaskRunner.csproj b/src/AgUnit.Runner.Resharper60.TaskRunner/AgUnit.Runner.Resharper60.TaskRunner.csproj index 4f7cb4b..f628203 100644 --- a/src/AgUnit.Runner.Resharper60.TaskRunner/AgUnit.Runner.Resharper60.TaskRunner.csproj +++ b/src/AgUnit.Runner.Resharper60.TaskRunner/AgUnit.Runner.Resharper60.TaskRunner.csproj @@ -12,13 +12,17 @@ AgUnit.Runner.Resharper60.TaskRunner v4.0 512 - + + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\JetBrains\ReSharper\v6.0\vs10.0@InstallDir) + Program + $(DevEnvDir)devenv.exe + /ReSharper.Plugin AgUnit.Runner.Resharper60.dll /ReSharper.LogFile C:\resharper.log /ReSharper.LogLevel Verbose ..\src\DummyTests\VS2010\DummyTests.sln + ..\..\output\ true full false - ..\..\output\ DEBUG;TRACE prompt 4 @@ -26,7 +30,6 @@ pdbonly true - ..\..\output\ TRACE prompt 4 diff --git a/src/AgUnit.Runner.Resharper60/AgUnit.Runner.Resharper60.csproj b/src/AgUnit.Runner.Resharper60/AgUnit.Runner.Resharper60.csproj index 0354da0..aaa6805 100644 --- a/src/AgUnit.Runner.Resharper60/AgUnit.Runner.Resharper60.csproj +++ b/src/AgUnit.Runner.Resharper60/AgUnit.Runner.Resharper60.csproj @@ -13,12 +13,16 @@ v4.0 512 + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\JetBrains\ReSharper\v6.0\vs10.0@InstallDir) + Program + $(DevEnvDir)devenv.exe + /ReSharper.Plugin AgUnit.Runner.Resharper60.dll /ReSharper.LogFile C:\resharper.log /ReSharper.LogLevel Verbose ..\src\DummyTests\VS2010\DummyTests.sln + ..\..\output\ true full false - ..\..\output\ TRACE;DEBUG;RS51 prompt 4 @@ -26,7 +30,6 @@ pdbonly true - ..\..\output\ TRACE prompt 4