fixed build path com combine projects together

Author: tomFlidr

.npmignore

@@ -0,0 +1,55 @@
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+bin/Microsoft.NodejsTools.WebRole.dll
+typings/
+obj/
+dev-tools/bin/compiler/
+dev-tools/build-data.json
+dev-tools/bin/java-home.json
+node_modules/

assets.njsproj

@@ -31,50 +31,41 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
+    <Content Include=".npmignore" />
     <Content Include="dev-tools\bin\compiler-help.txt" />
-    <Content Include="dev-tools\build-data.json" />
     <Content Include="dev-tools\build.cmd" />
     <Content Include="dev-tools\build.sh" />
-    <Content Include="install.cmd" />
-    <Content Include="install.sh" />
+    <Content Include="dev-tools\run-tests-server.cmd" />
+    <Content Include="dev-tools\run-tests-server.sh" />
+    <Content Include="LICENCE.md" />
     <Content Include="package.json" />
     <Content Include="README.md" />
-    <Content Include="src\arrow-down.png" />
-    <Content Include="src\arrow-right.png" />
-    <Content Include="src\arrow-up.png" />
     <Content Include="src\bar-exception.css" />
     <Content Include="src\bar-window.css" />
     <Content Include="src\bar.css" />
-    <Content Include="src\close.png" />
     <Content Include="src\dumps.css" />
     <Content Include="src\exception.css" />
     <Content Include="src\logs.css" />
-    <Content Include="src\unbox.png" />
-    <Content Include="tests\dumps-min.php" />
-    <Content Include="tests\dumps.php" />
-    <Content Include="tests\logs-exception.php" />
-    <Content Include="tests\logs-info.php" />
-  </ItemGroup>
-  <ItemGroup>
-    <TypeScriptCompile Include="typings\globals\node\index.d.ts" />
-    <TypeScriptCompile Include="typings\index.d.ts" />
+    <Content Include="tests\dumps-min.html" />
+    <Content Include="tests\dumps.html" />
+    <Content Include="tests\logs-exception.html" />
+    <Content Include="tests\logs-info.html" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="dev-tools\" />
     <Folder Include="dev-tools\bin\" />
     <Folder Include="dev-tools\bin\compiler\" />
     <Folder Include="src\" />
     <Folder Include="tests\" />
-    <Folder Include="typings\" />
-    <Folder Include="typings\globals\" />
-    <Folder Include="typings\globals\node\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="dev-tools\bin\string.js" />
     <Compile Include="dev-tools\build.js" />
+    <Compile Include="dev-tools\run-tests-server.js" />
     <Compile Include="install.js" />
     <Compile Include="src\dumps.js" />
     <Compile Include="src\logs.js" />
+    <Compile Include="tests\index.js" />
   </ItemGroup>
   <!-- Do not delete the following Import Project.  While this appears to do nothing it is a marker for setting TypeScript properties before our import that depends on them. -->
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="False" />

dev-tools/build.js

@@ -8,7 +8,7 @@ var fs = require('fs'),
 
 // base MvcCoreForm javascript object name, it's filename and filed definitions directory
 var sourceDir = '../src/';
-var targetDir = '../../';
+var targetDir = '../../../';
 
 // for development:
 var minimalize = true;

package.json

@@ -32,4 +32,4 @@
     "download": "~5.0.0",
     "find-java-home": "~0.1.4"
   }
-}
+}