Fix tests.

Nitra/Nitra.Quote/Nitra.Quote.nproj

@@ -23,15 +23,15 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\Stage1</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\Stage1</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

Tests/sub-env.cmd

@@ -3,8 +3,8 @@ set NGen="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
 if not defined Configuration set Configuration=Debug
 if not defined NemerleBinPathRoot set NemerleBinPathRoot=%ProgramFiles%\Nemerle
 if not defined Nemerle set Nemerle=%NemerleBinPathRoot%\Net-4.0
-set RuntimeDllPath=%~dp0\..\Nitra\Nitra.Runtime\bin\%Configuration%
-set CoreDllPath=%~dp0\..\Nitra\Nitra.Core\bin\%Configuration%
-set CompilerDllPath=%~dp0\..\Nitra\Nitra.Compiler\bin\%Configuration%\Stage1
-set QuoteDllPath=%~dp0\..\Nitra\Nitra.Quote\bin\%Configuration%
+set RuntimeDllPath=%~dp0\..\bin\%Configuration%\Stage1
+set CoreDllPath=%~dp0\..\bin\%Configuration%\Stage1
+set CompilerDllPath=%~dp0\..\bin\%Configuration%\Stage1
+set QuoteDllPath=%~dp0\..\bin\%Configuration%\Stage1
 rem for %%d in (%CompilerDllPath%\*.dll) DO %NGen% install %%d

VisualStudioExtensions/Nitra.VisualStudio/Nitra.VisualStudio.nproj

@@ -448,6 +448,11 @@
   <PropertyGroup>
     <CopyVsixManifestFileDependsOn>$(CopyVsixManifestFileDependsOn);SetVsixManifestExtensionVersion</CopyVsixManifestFileDependsOn>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <StartProgram>G:\VS\VS2013\Common7\IDE\devenv.exe</StartProgram>
+    <WorkingDirectory />
+    <CmdArgs>/rootsuffix Exp</CmdArgs>
+  </PropertyGroup>
   <Target Name="SetVsixManifestExtensionVersion" DependsOnTargets="DetokenizeVsixManifestFile;GetNitraBuildVersion">
     <XmlPoke XmlInputPath="$(IntermediateVsixManifest)" Query="//*[local-name()='Identifier']/*[local-name()='Version']" Value="$(NitraBuildVersion)" />
   </Target>
@@ -473,8 +478,7 @@
     <Task>
       <Using Namespace="System" />
       <Using Namespace="Microsoft.Win32" />
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
+      <Code Type="Fragment" Language="cs"><![CDATA[
     var keyName   = "Software\\Microsoft\\VisualStudio\\" + VisualStudioVersion + VisualStudioSuffix + "\\ExtensionManager\\EnabledExtensions";
     var valueName = ExtensionId + "," + ExtensionVersion;
     var newValue  = ExtensionPath.ToUpperInvariant();
@@ -520,8 +524,7 @@
     {
       Log.LogError("Failed to open registry key 'HKCU\\{0}'", keyName);
     }
-        ]]>
-      </Code>
+        ]]></Code>
     </Task>
   </UsingTask>
   <Target Name="DeployExtension">

VisualStudioExtensions/Nitra.VisualStudio/Parsing/ParseAgent.n

@@ -75,6 +75,7 @@ namespace Nitra.VisualStudio.Parsing
       def source = SourceSnapshot(text, 0, fileName);
       try
       {
+        NitraPackage.Instance.SetStatusBarText("Parsing...");
         timer.Restart();
         def result = Language.Parse(source, token);
         timer.Stop();

packages/repositories.config

@@ -3,4 +3,5 @@
   <repository path="..\N2.Visualizer\packages.config" />
   <repository path="..\N2VsExtentions\N2.VisualStudio\packages.config" />
   <repository path="..\Nitra.Visualizer\packages.config" />
+  <repository path="..\VisualStudioExtensions\Nitra.VisualStudio\packages.config" />
 </repositories>