Merge pull request #284 from vosen/reorganize

Reorganize project structure

.gitattributes

@@ -2,7 +2,6 @@
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
 * text=auto
-
 ###############################################################################
 # Set default behavior for command prompt diff.
 #
@@ -11,7 +10,6 @@
 # Note: This is only used by command line
 ###############################################################################
 #*.cs     diff=csharp
-
 ###############################################################################
 # Set the merge driver for project and solution files
 #
@@ -34,7 +32,6 @@
 #*.modelproj merge=binary
 #*.sqlproj   merge=binary
 #*.wwaproj   merge=binary
-
 ###############################################################################
 # behavior for image files
 #
@@ -43,7 +40,6 @@
 #*.jpg   binary
 #*.png   binary
 #*.gif   binary
-
 ###############################################################################
 # diff behavior for common document formats
 # 
@@ -61,3 +57,6 @@
 #*.PDF   diff=astextplain
 #*.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

.gitignore

@@ -12,7 +12,6 @@
 [Dd]ebug/
 [Rr]elease/
 x64/
-build/
 [Bb]in/
 [Oo]bj/
 
@@ -163,4 +162,6 @@ $RECYCLE.BIN/
 # =========================
 
 # Skip automatically downloaded files
-VisualRust/gdb/*/*
+VisualRust/gdb/*/*
+lib/mingw32/*
+lib/mingw64/*

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "MIEngine"]
-	path = MIEngine
+	path = src/MIEngine
 	url = https://github.com/PistonDevelopers/MIEngine.git
 	branch = master

appveyor.yml

@@ -27,4 +27,5 @@ build:
   parallel: true
   verbosity: normal
 artifacts:
-- path: installer\VisualRust.Setup\bin\Release\*.exe
+- path: bin\VisualRust.Setup.2015\Release\*.exe
+- path: bin\VisualRust.Setup.2017\Release\*.exe

build/Common.props

@@ -0,0 +1,9 @@
+<?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>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <NuGetPackageImportStamp/>
+  </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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\lib\mingw.msbuild"/>
+  <PropertyGroup>
+    <_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)"
+          Outputs="@(MinGW32Content);@(MinGW64Content)">
+    <!--
+       We want this to be evaluated for every execution of this target, but
+       skip in case if ther target was skipped, hence no PropertyGroup.
+    -->
+    <CreateProperty Value="$([System.IO.Path]::GetTempFileName())">  
+      <Output TaskParameter="Value" PropertyName="_TempFile32" />  
+    </CreateProperty>
+    <CreateProperty Value="$([System.IO.Path]::GetTempFileName())">  
+      <Output TaskParameter="Value" PropertyName="_TempFile64" />  
+    </CreateProperty>
+    <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)
+        expanded wildcards for files in mingw32\opt\lib\python2.7\* and
+        mingw64\opt\lib\python2.7\*.
+        We use CreateItem instead of ItemGroup, because ItemGroup evaluates
+        even if the target was skipped.
+    -->
+    <CreateItem Include="$(MSBuildThisFileDirectory)\..\lib\mingw32\**\*;$(MSBuildThisFileDirectory)\..\lib\mingw64\**\*" >
+      <Output TaskParameter="Include" ItemName="_MinGWTouch"/>  
+    </CreateItem>
+    <Touch Files="@(_MinGWTouch)" ForceTouch="true"/>
+  </Target>
+</Project>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props')" />
+  <Import Project="..\..\packages\WiX.3.11.0\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.0\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,8 +9,6 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>VisualRust.Setup.FileAssociation.2015</OutputName>
     <OutputType>Package</OutputType>
-    <BaseIntermediateOutputPath>obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath>bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug</DefineConstants>
@@ -24,6 +22,7 @@
     <Content Include="packages.config" />
     <Content Include="Product.wxi" />
   </ItemGroup>
+  <Import Project="..\..\build\Common.props" />
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
@@ -33,7 +32,7 @@
     <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\WiX.3.11.0.1528-rc2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props'))" />
+    <Error Condition="!Exists('..\..\packages\WiX.3.11.0\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.0\build\wix.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props')" />
+  <Import Project="..\..\packages\WiX.3.11.0\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.0\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,8 +9,6 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>VisualRust.Setup.FileAssociation.2017</OutputName>
     <OutputType>Package</OutputType>
-    <BaseIntermediateOutputPath>obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath>bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug</DefineConstants>
@@ -24,6 +22,7 @@
     <Content Include="packages.config" />
     <Content Include="Product.wxi" />
   </ItemGroup>
+  <Import Project="..\..\build\Common.props" />
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
@@ -33,7 +32,7 @@
     <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\WiX.3.11.0.1528-rc2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props'))" />
+    <Error Condition="!Exists('..\..\packages\WiX.3.11.0\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.0\build\wix.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

installer/VisualRust.Setup.FileAssociation/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WiX" version="3.11.0.1528-rc2" />
+  <package id="WiX" version="3.11.0" />
 </packages>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props')" />
+  <Import Project="..\..\packages\WiX.3.11.0\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.0\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,8 +9,6 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>VisualRust.Setup.MSBuild.2015</OutputName>
     <OutputType>Package</OutputType>
-    <BaseIntermediateOutputPath>obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <OutputPath>bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
     <Name>VisualRust.Setup.MSBuild.2015</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -19,7 +17,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>
@@ -36,6 +34,7 @@
     <Compile Include="msbuild.wxs" />
     <Compile Include="Product.2015.wxs" />
   </ItemGroup>
+  <Import Project="..\..\build\Common.props" />
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
@@ -45,7 +44,7 @@
     <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\WiX.3.11.0.1528-rc2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.0.1528-rc2\build\wix.props'))" />
+    <Error Condition="!Exists('..\..\packages\WiX.3.11.0\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.0\build\wix.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.