Fix Msbuild, fix project/item templates, improve intellisense.

README.md

@@ -47,11 +47,16 @@ the time to spend coding.
 
 ### Code
 
-1. Fork the main repository
-2. Work on a feature in your own private branch
-3. Once you are finished with you work or want someone to you, open a pull
-   request
-4. Someone will review your code and merge it. Some fixes might be required on
+1. Fork the main repository on github.
+2. Check out the source code:
+   * Make sure [git lfs](https://git-lfs.github.com/) is installed **before**
+     cloning the repository or you'll need to delete and re-checkout some files.
+   * `git clone ...` your fork.
+   * `git submodule update --init` to grab MICore and MIDebugEngine.
+3. Work on a feature in your own private branch.
+4. Once you are finished with you work or want someone to you, open a pull
+   request.
+5. Someone will review your code and merge it. Some fixes might be required on
    your side.
 
 ## Prerequisites

appveyor.yml

@@ -5,7 +5,10 @@ branches:
 skip_tags: true
 image: Visual Studio 2017
 configuration:
+- Debug
 - Release
+platform:
+- All VS
 install:
 - ps: >-
     Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-msvc.exe"

src/VisualRust.Build/CargoBuild.cs

@@ -78,7 +78,7 @@ protected override bool ExecuteCargo(Cargo cargo)
                     {
                         var reader = new JsonTextReader(new StringReader(e.Data));
                         var message = Cargo.JsonSerializer.Deserialize<CargoMessage>(reader);
-                        Rustc.LogRustcMessage(message.message, Manifest.Directory.FullName, Log);
+                        if (message != null) Rustc.LogRustcMessage(message.message, Manifest.Directory.FullName, Log);
                     }
                 };
 

src/VisualRust.Build/Rustc.cs

@@ -369,6 +369,7 @@ private void LogRustcMessage(RustcMessageHuman msg)
 
         public static void LogRustcMessage(RustcMessageJson msg, string rootPath, TaskLoggingHelper log)
         {
+            if (msg == null) return;
             // todo multi span
             // todo all other fields
             // todo mb help key word is code.explanation
@@ -381,19 +382,35 @@ public static void LogRustcMessage(RustcMessageJson msg, string rootPath, TaskLo
             if (String.IsNullOrEmpty(code) && primarySpan == null && msg.message.Contains("aborting due to"))
                 return;
 
+            // primarySpan.file_name might not be legal (e.g. "file_name":"<println macros>" is common)
+            string logFile = null;
+            var logSpan = primarySpan;
+            while (logSpan != null)
+            {
+                try
+                {
+                    logFile = Path.Combine(rootPath, logSpan.file_name); // maybe checking for ".rs" extension is saner than trying this and seeing if it throws?
+                    break;
+                }
+                catch (ArgumentException) // "Illegal characters in path."
+                {
+                    logSpan = logSpan.expansion?.span; // see if expanding helps us find a real file
+                }
+            }
+
             if (type == RustcMessageType.Error)
             {
-                if (primarySpan == null)
+                if (logSpan == null)
                     log.LogError(msg.message);
                 else
-                    log.LogError(null, code, null, Path.Combine(rootPath, primarySpan.file_name), primarySpan.line_start, primarySpan.column_start, primarySpan.line_end, primarySpan.column_end, msg.message);
+                    log.LogError(null, code, null, logFile, logSpan.line_start, logSpan.column_start, logSpan.line_end, logSpan.column_end, msg.message);
             }
             else
             {
-                if (primarySpan == null)
+                if (logSpan == null)
                     log.LogWarning(msg.message);
                 else
-                    log.LogWarning(null, code, null, Path.Combine(rootPath, primarySpan.file_name), primarySpan.line_start, primarySpan.column_start, primarySpan.line_end, primarySpan.column_end, msg.message);
+                    log.LogWarning(null, code, null, logFile, logSpan.line_start, logSpan.column_start, logSpan.line_end, logSpan.column_end, msg.message);
             }
 
         }

src/VisualRust.Templates/VisualRust.Templates.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" />
+  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
@@ -102,10 +102,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/VisualRust.Templates/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net45" developmentDependency="true" />
+  <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net45" developmentDependency="true" />
 </packages>