Fix incremental build, fix installer build

.gitattributes

@@ -58,3 +58,5 @@
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
 lib/*.7z filter=lfs diff=lfs merge=lfs -text
+build/*.exe filter=lfs diff=lfs merge=lfs -text
+build/**/*.dll filter=lfs diff=lfs merge=lfs -text

build/Common.props

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath>$(MSBuildThisFileDirectory)..\bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+</Project>

build/StrongNamer.0.0.5/README.txt

@@ -0,0 +1,2 @@
+Temporarily vendored version to work around broken incremental builds:
+https://github.com/dsplaisted/strongnamer/issues/3

build/StrongNamer.0.0.5/StrongNamer.targets

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="StrongNamer.AddStrongName" AssemblyFile="$(MSBuildThisFileDirectory)StrongNamer.dll" />
+  <Target Name="_FilterStrongNamerReferences"
+          BeforeTargets="StrongNamerTarget">
+    <ItemGroup>
+      <_StrongNamerReferences Include="@(ReferencePath)" Condition="'%(ReferencePath.SignAssembly)' == 'True'" />
+      <_StrongNamerOutputPaths Include="@(_StrongNamerReferences->'$(IntermediateOutputPath)SignedAssemblies\%(Filename)%(Extension)')"/>
+      <ReferencePath Remove="@(_StrongNamerReferences)" />
+      <ReferencePath Include="@(_StrongNamerOutputPaths)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="StrongNamerTarget"
+          Inputs="@(_StrongNamerReferences)"
+          Outputs="@(_StrongNamerOutputPaths)"
+          AfterTargets="AfterResolveReferences"
+          Condition="'$(DisableStrongNamer)' != 'true'">
+
+    <StrongNamer.AddStrongName
+          Assemblies="@(_StrongNamerReferences)"
+          SignedAssemblyFolder="$(IntermediateOutputPath)SignedAssemblies"
+          KeyFile="$(MSBuildThisFileDirectory)SharedKey.snk">
+    </StrongNamer.AddStrongName>
+  </Target>
+
+  <PropertyGroup>
+    <ResolveReferencesDependsOn>$(ResolveReferencesDependsOn);StrongNamerTarget</ResolveReferencesDependsOn>
+  </PropertyGroup>
+
+</Project>

build/mingw.msbuild

@@ -2,8 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\lib\mingw.msbuild"/>
   <PropertyGroup>
-    <_MinGW32Archive>..\lib\i686-7.1.0-release-posix-dwarf-rt_v5-rev0.7z</_MinGW32Archive>
-    <_MinGW64Archive>..\lib\x86_64-7.1.0-release-posix-seh-rt_v5-rev0.7z</_MinGW64Archive>
+    <_MinGW32Archive>$(MSBuildThisFileDirectory)\..\lib\i686-7.1.0-release-posix-dwarf-rt_v5-rev0.7z</_MinGW32Archive>
+    <_MinGW64Archive>$(MSBuildThisFileDirectory)\..\lib\x86_64-7.1.0-release-posix-seh-rt_v5-rev0.7z</_MinGW64Archive>
   </PropertyGroup>
   <Target Name="ExtractMinGW"
           Inputs="$(_MinGW32Archive);$(_MinGW64Archive)"
@@ -18,10 +18,10 @@
     <CreateProperty Value="$([System.IO.Path]::GetTempFileName())">  
       <Output TaskParameter="Value" PropertyName="_TempFile64" />  
     </CreateProperty>
-    <WriteLinesToFile File="$(_TempFile32)" Lines="@(MinGW32Content->Metadata('RelativePath'));mingw32\opt\lib\python2.7\*"/>
-    <Exec Command="..\tools\7za.exe x -y -ir@$(_TempFile32) $(_MinGW32Archive)" WorkingDirectory="..\lib\"/>
-    <WriteLinesToFile File="$(_TempFile64)" Lines="@(MinGW64Content->Metadata('RelativePath'));mingw64\opt\lib\python2.7\*"/>
-    <Exec Command="..\tools\7za.exe x -y -ir@$(_TempFile64) $(_MinGW64Archive)" WorkingDirectory="..\lib\"/>
+    <WriteLinesToFile File="$(_TempFile32)" Lines="@(MinGW32Content->Metadata('TargetPath'));mingw32\opt\lib\python2.7\*"/>
+    <Exec Command="$(MSBuildThisFileDirectory)\7za.exe x -y -ir@$(_TempFile32) $(_MinGW32Archive)" WorkingDirectory="$(MSBuildThisFileDirectory)\..\lib\"/>
+    <WriteLinesToFile File="$(_TempFile64)" Lines="@(MinGW64Content->Metadata('TargetPath'));mingw64\opt\lib\python2.7\*"/>
+    <Exec Command="$(MSBuildThisFileDirectory)\7za.exe x -y -ir@$(_TempFile64) $(_MinGW64Archive)" WorkingDirectory="$(MSBuildThisFileDirectory)\..\lib\"/>
     <Delete Files="$(_TempFile32);$(_TempFile64)"/>
     <!--
         If it's the first build, neither @(MinGW32Content) nor @(MinGW64Content)
@@ -30,7 +30,7 @@
         We use CreateItem instead of ItemGroup, because ItemGroup evaluates
         even if the target was skipped.
     -->
-    <CreateItem Include="..\lib\mingw32\**\*;..\lib\mingw64\**\*" >
+    <CreateItem Include="$(MSBuildThisFileDirectory)\..\lib\mingw32\**\*;$(MSBuildThisFileDirectory)\..\lib\mingw64\**\*" >
       <Output TaskParameter="Include" ItemName="_MinGWTouch"/>  
     </CreateItem>
     <Touch Files="@(_MinGWTouch)" ForceTouch="true"/>

installer/VisualRust.Setup.MSBuild/VisualRust.Setup.MSBuild.2015.wixproj

@@ -19,7 +19,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\VisualRust.Build\VisualRust.Build.csproj">
+    <ProjectReference Include="..\..\src\VisualRust.Build\VisualRust.Build.csproj">
       <Name>VisualRust.Build</Name>
       <Project>{9cf556ab-76fe-4c3d-ad0a-b64b3b9989b4}</Project>
       <Private>True</Private>

installer/VisualRust.Setup.MSBuild/VisualRust.Setup.MSBuild.2017.wixproj

@@ -19,7 +19,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\VisualRust.Build\VisualRust.Build.csproj">
+    <ProjectReference Include="..\..\src\VisualRust.Build\VisualRust.Build.csproj">
       <Name>VisualRust.Build</Name>
       <Project>{9cf556ab-76fe-4c3d-ad0a-b64b3b9989b4}</Project>
       <Private>True</Private>

installer/VisualRust.Setup/VisualRust.Setup.2015.wixproj

@@ -32,7 +32,7 @@
     <Content Include="Product.wxi" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\VisualRust\VisualRust.2015.csproj">
+    <ProjectReference Include="..\..\src\VisualRust\VisualRust.2015.csproj">
       <Name>VisualRust.2015</Name>
       <Project>{8b7b30f7-17c1-4ce8-baf4-88b086af7b25}</Project>
       <Private>True</Private>

installer/VisualRust.Setup/VisualRust.Setup.2017.wixproj

@@ -35,7 +35,7 @@
     <Compile Include="Product.2017.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\VisualRust\VisualRust.2017.csproj">
+    <ProjectReference Include="..\..\src\VisualRust\VisualRust.2017.csproj">
       <Name>VisualRust.2017</Name>
       <Project>{ce4062fe-d6d2-43fa-ad8c-709f103f4722}</Project>
       <Private>True</Private>

lib/mingw.msbuild

@@ -7,9 +7,9 @@
     <MinGW32Content Include="$(MSBuildThisFileDirectory)mingw32\opt\bin\libpython2.7.dll"/>
     <MinGW32Content Include="$(MSBuildThisFileDirectory)mingw32\opt\bin\libwinpthread-1.dll"/>
     <MinGW32Content Include="$(MSBuildThisFileDirectory)mingw32\opt\lib\python2.7\**"
-                 Exclude="$(MSBuildThisFileDirectory)mingw32\opt\lib\python2.7\**\*.pyc;$(MSBuildThisFileDirectory)mingw32\opt\lib\python2.7\**\*.pyo"/>
+                    Exclude="$(MSBuildThisFileDirectory)mingw32\opt\lib\python2.7\**\*.pyc;$(MSBuildThisFileDirectory)mingw32\opt\lib\python2.7\**\*.pyo"/>
     <MinGW32Content Include="@(MinGW32Content)">
-      <RelativePath>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory), %(Identity)))</RelativePath>
+      <TargetPath>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory), %(Identity)))</TargetPath>
     </MinGW32Content>
   </ItemGroup>
   <ItemGroup>
@@ -19,13 +19,17 @@
     <MinGW64Content Include="$(MSBuildThisFileDirectory)mingw64\opt\bin\libpython2.7.dll"/>
     <MinGW64Content Include="$(MSBuildThisFileDirectory)mingw64\opt\bin\libwinpthread-1.dll"/>
     <MinGW64Content Include="$(MSBuildThisFileDirectory)mingw64\opt\lib\python2.7\**"
-                 Exclude="$(MSBuildThisFileDirectory)mingw64\opt\lib\python2.7\**\*.pyc;$(MSBuildThisFileDirectory)mingw64\opt\lib\python2.7\**\*.pyo"/>
+                    Exclude="$(MSBuildThisFileDirectory)mingw64\opt\lib\python2.7\**\*.pyc;$(MSBuildThisFileDirectory)mingw64\opt\lib\python2.7\**\*.pyo"/>
     <MinGW64Content Include="@(MinGW64Content)">
-      <RelativePath>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory), %(Identity)))</RelativePath>
+      <TargetPath>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory), %(Identity)))</TargetPath>
     </MinGW64Content>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="@(MinGW32Content)"><IncludeInVSIX>true</IncludeInVSIX></Content>
-    <Content Include="@(MinGW64Content)"><IncludeInVSIX>true</IncludeInVSIX></Content>
+    <Content Include="@(MinGW32Content)">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="@(MinGW64Content)">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
   </ItemGroup>
 </Project>

src/RustLexer/RustLexer.csproj

@@ -12,22 +12,18 @@
     <AssemblyName>RustLexer</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -59,6 +55,7 @@
     <None Include="xidcontinue.g4" />
     <None Include="xidstart.g4" />
   </ItemGroup>
+  <Import Project="..\..\build\Common.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

src/VisualRust.Build/VisualRust.Build.csproj

@@ -16,15 +16,13 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -71,6 +69,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <Import Project="..\..\build\Common.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.

src/VisualRust.Cargo/VisualRust.Cargo.csproj

@@ -19,15 +19,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
@@ -74,6 +72,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <Import Project="..\..\build\Common.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <VistTomlDir>$(MSBuildProjectDirectory)\..\vist_toml</VistTomlDir>

src/VisualRust.Core/VisualRust.Core.csproj

@@ -12,38 +12,31 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\VisualRust\Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\VisualRust\Key.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
+      <SignAssembly>True</SignAssembly>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -64,14 +57,9 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <Import Project="..\..\build\Common.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\StrongNamer.0.0.3\build\StrongNamer.targets" Condition="Exists('..\..\packages\StrongNamer.0.0.3\build\StrongNamer.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <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\StrongNamer.0.0.3\build\StrongNamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StrongNamer.0.0.3\build\StrongNamer.targets'))" />
-  </Target>
+  <Import Project="..\..\build\StrongNamer.0.0.5\StrongNamer.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.Core/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="StrongNamer" version="0.0.3" targetFramework="net46" />
   <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net46" />
 </packages>