From 67fd8265894bd6707a10517133001b143f747693 Mon Sep 17 00:00:00 2001
From: Jeremy Kuhne <jeremy.kuhne@microsoft.com>
Date: Thu, 30 Apr 2015 15:56:28 -0700
Subject: [PATCH] Workarounds for building with Roslyn/MSBuild on Unix.

Allows a successful compile with xplat MSBuild branch and Roslyn on Mono.

Adds the Roslyn package and UseRoslyn property to use Roslyn.
Disable PDB generation (NYI), skip packaging, disables ECMA delay signing.
Also temporarily disables two test projects.
Fixes casing for a few source file includes.
Add issue links and a check for missing Roslyn targets when attempting to build on Roslyn.
---
 dir.props                                     | 62 ++++++++++++++++++-
 dir.targets                                   |  5 +-
 override.targets                              |  1 +
 roslyn.xplat.targets                          | 14 +++++
 src/.nuget/packages.config                    |  1 +
 .../src/System.IO.Compression.csproj          |  4 +-
 .../src/System.Private.Uri.CoreCLR.csproj     |  2 +-
 ...tem.Runtime.InteropServices.CoreCLR.csproj | 18 +++---
 src/dirs.proj                                 | 10 +--
 9 files changed, 96 insertions(+), 21 deletions(-)
 create mode 100644 roslyn.xplat.targets

diff --git a/dir.props b/dir.props
index ff034cd758..0e38f5dd5c 100644
--- a/dir.props
+++ b/dir.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="CheckRoslyn" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Condition="Exists('..\dir.props')" Project="..\dir.props" />
 
   <!--
@@ -15,6 +15,8 @@
     <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-11624</DnxVersion>
     <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName>
     <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName>
+    <RoslynVersion>1.0.0-rc2-20150421-01</RoslynVersion>
+    <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName>
   </PropertyGroup>
 
   <!-- Common repo directories -->
@@ -27,7 +29,7 @@
     <ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir>
     <TestWorkingDir Condition="'$(TestWorkingDir)'==''">$(BinDir)tests/</TestWorkingDir>
     <PackagesOutDir Condition="'$(PackagesOutDir)'==''">$(BinDir)packages/</PackagesOutDir>
-    
+
     <!-- Input Directories -->
     <PackagesDir Condition="'$(PackagesDir)'==''">$(ProjectDir)packages/</PackagesDir>
     <ToolsDir Condition="'$(ToolsDir)'==''">$(PackagesDir)Microsoft.DotNet.BuildTools.$(BuildToolsVersion)/lib/</ToolsDir>
@@ -60,6 +62,53 @@
     <NuGetIngoreLockFile>true</NuGetIngoreLockFile>
   </PropertyGroup>
 
+  <!--
+    Set up Roslyn predefines
+  -->
+  <PropertyGroup>
+    <RoslynPackageDir>$(PackagesDir)/$(RoslynPackageName).$(RoslynVersion)/</RoslynPackageDir>
+    <RoslynPropsFile>$(RoslynPackageDir)build/Microsoft.Net.ToolsetCompilers.props</RoslynPropsFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(OsEnvironment)'=='Unix' and '$(UseRoslynCompiler)'=='true'">
+    <!--
+      PDB support isn't implemented yet. https://github.com/dotnet/roslyn/issues/2449
+      Note that both DebugSymbols and DebugType need set or project references will assume they need to copy pdbs and fail.
+    -->
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <!--
+      Delay signing with the ECMA key currently doesn't work.
+      https://github.com/dotnet/roslyn/issues/2444
+    -->
+    <UseECMAKey>false</UseECMAKey>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(OsEnvironment)'=='Unix' and '$(UseRoslynCompiler)'=='true'">
+    <!--
+      System.Diagnostics.Debug.Tests currently fails trying to resolve types against System.Runtime
+      https://github.com/dotnet/corefx/issues/1609
+    -->
+    <ExcludeProjects Include="System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj" />
+    <!--
+      The OpenSourceSign target complains about System.Diagnostics.FileVersionInfo.TestAssembly.dll not being delay signed.
+      https://github.com/dotnet/corefx/issues/1610
+    -->
+    <ExcludeProjects Include="System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
+    <!--
+      Mono currently doesn't include VB targets for portable, notably /lib/mono/xbuild/Microsoft/Portable/v4.5/Microsoft.Portable.VisualBasic.targets.
+      Fixed in https://github.com/mono/mono/pull/1726.
+    -->
+    <IncludeVbProjects>false</IncludeVbProjects>
+    <!--
+      Building packages fails for two reasons.
+      First, nuget doesn't like the paths in the nuspec having backslashes as directory separators.
+      Second, we aren't yet building pdbs, which the nuspecs specify.
+    -->
+    <SkipBuildPackages>true</SkipBuildPackages>
+  </PropertyGroup>
+
   <!-- 
   Projects that have no OS-specific implementations just use Debug and Release for $(Configuration).
   Projects that do have OS-specific implementations use OS_Debug and OS_Release, for all OS's we support even
@@ -151,4 +200,13 @@
     <MakePriExtensionPath>$(_WindowsPhoneKitBinPath)\x86\MrmEnvironmentExtDl.dll</MakePriExtensionPath>
     <MakePriExtensionPath_x64>$(_WindowsPhoneKitBinPath)\x64\MrmEnvironmentExtDl.dll</MakePriExtensionPath_x64>
   </PropertyGroup>
+
+  <Import Project="$(RoslynPropsFile)"
+          Condition="'$(UseRoslynCompiler)'=='true' and Exists('$(RoslynPropsFile)')" />
+
+  <!-- Building the build.proj should restore successfully, so ignore in that case -->
+  <Target Name="CheckRoslyn" Condition="'$(UseRoslynCompiler)'=='true' and '$(MSBuildProjectFile)'!='build.proj'">
+    <Warning Condition="!Exists('$(RoslynPropsFile)')"
+             Text="The Roslyn targets do not exist- Roslyn will not be used for this build, but the package should be restored if you build again." />
+  </Target>
 </Project>
diff --git a/dir.targets b/dir.targets
index 284e22794e..7942e69e31 100644
--- a/dir.targets
+++ b/dir.targets
@@ -88,11 +88,13 @@
     <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(PackagesDir)" SkipUnchangedFiles="true" />
     <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(IntermediateOutputRootPath)" SkipUnchangedFiles="true" />
 
-    <!-- Add DNU execute rights -->
+    <!-- Add DNU and Roslyn tool execute rights -->
     <Exec Condition="'$(OsEnvironment)'=='Unix'"
           Command="chmod a+x &quot;$(DnxPackageDir)/bin/dnu&quot;" />
     <Exec Condition="'$(OsEnvironment)'=='Unix'"
           Command="chmod a+x &quot;$(DnxPackageDir)/bin/dnx&quot;" />
+    <Exec Condition="'$(OsEnvironment)'=='Unix'"
+          Command="find '$(RoslynPackageDir)tools' -name &quot;*.exe&quot; -exec chmod &quot;+x&quot; '{}' ';'" /> 
 
     <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'"
            Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
@@ -110,5 +112,4 @@
   <Target Name="BuildAndTest" DependsOnTargets="Build;Test" />
 
   <Target Name="Test" />
-
 </Project>
diff --git a/override.targets b/override.targets
index d4942f148a..e4b89b7031 100644
--- a/override.targets
+++ b/override.targets
@@ -4,4 +4,5 @@
   -->
 
   <Import Project="mono.targets" Condition="'$(OsEnvironment)'=='Unix'" />
+  <Import Project="roslyn.xplat.targets" Condition="'$(OsEnvironment)'=='Unix' and '$(UseRoslynCompiler)'=='true'" />
 </Project>
diff --git a/roslyn.xplat.targets b/roslyn.xplat.targets
new file mode 100644
index 0000000000..3459aa12c6
--- /dev/null
+++ b/roslyn.xplat.targets
@@ -0,0 +1,14 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    Overrides for Roslyn on Unix
+  -->
+
+  <PropertyGroup>
+    <!-- PDB support isn't implemented yet. -->
+    <!-- Some .csproj files override the settings coming from dir.props so we have to set again here to trump them. -->
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
+
+  <!-- This target in the build tools partialfacades.targets assumes that a pdb exists. -->
+  <Target Name="FillPartialFacade" />
+</Project>
diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config
index f2524f510a..e39333da31 100644
--- a/src/.nuget/packages.config
+++ b/src/.nuget/packages.config
@@ -4,4 +4,5 @@
   <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-11580" />
   <package id="Microsoft.DotNet.BuildTools.ApiTools" version="1.0.0-prerelease" />
   <package id="dnx-mono" version="1.0.0-beta5-11624" />
+  <package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc2-20150421-01" />
 </packages>
diff --git a/src/System.IO.Compression/src/System.IO.Compression.csproj b/src/System.IO.Compression/src/System.IO.Compression.csproj
index 58dd47692d..7c04994fd3 100644
--- a/src/System.IO.Compression/src/System.IO.Compression.csproj
+++ b/src/System.IO.Compression/src/System.IO.Compression.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <ProjectGuid>{5471BFE8-8071-466F-838E-5ADAA779E742}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <UseECMAKey>true</UseECMAKey>
+    <UseECMAKey Condition="'$(UseECMAKey)'==''">true</UseECMAKey>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Linux_Debug|AnyCPU'" />
@@ -73,4 +73,4 @@
     </Content>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/System.Private.Uri/src/System.Private.Uri.CoreCLR.csproj b/src/System.Private.Uri/src/System.Private.Uri.CoreCLR.csproj
index 23846d3234..67e7c72286 100644
--- a/src/System.Private.Uri/src/System.Private.Uri.CoreCLR.csproj
+++ b/src/System.Private.Uri/src/System.Private.Uri.CoreCLR.csproj
@@ -55,7 +55,7 @@
     <Compile Include="System\UriBuilder.cs" />
     <Compile Include="System\UriEnumTypes.cs" />
     <Compile Include="System\UriExt.cs" />
-    <Compile Include="System\URIFormatException.cs" />
+    <Compile Include="System\UriFormatException.cs" />
     <Compile Include="System\UriHelper.cs" />
     <Compile Include="System\UriHostNameType.cs" />
     <Compile Include="System\UriPartial.cs" />
diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.CoreCLR.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.CoreCLR.csproj
index ee984c704e..e11c7fd7fd 100644
--- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.CoreCLR.csproj
+++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.CoreCLR.csproj
@@ -23,15 +23,15 @@
     <Compile Include="System\Runtime\InteropServices\HandleCollector.CoreCLR.cs" />
     <Compile Include="System\Runtime\InteropServices\DefaultParameterValueAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\HandleCollector.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\ADVF.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\DATADIR.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\DVASPECT.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\FORMATETC.cs" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\advf.cs" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\datadir.cs" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\dvaspect.cs" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\formatetc.cs" />
     <Compile Include="System\Runtime\InteropServices\ComTypes\IAdviseSink.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\IEnumFORMATETC.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\STATDATA.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\STGMEDIUM.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\TYMED.cs" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\IEnumFormatETC.cs" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\statdata.cs" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\stgmedium.cs" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\tymed.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,4 +39,4 @@
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/dirs.proj b/src/dirs.proj
index aa2752ad6f..86fd0da794 100644
--- a/src/dirs.proj
+++ b/src/dirs.proj
@@ -3,10 +3,10 @@
   <Import Project="BuildValues.props" />
 
   <ItemGroup>
-    <Project Include="*\src\*.csproj" Exclude="$(ExcludeProjects)" />
-    <Project Include="*\src\*.vbproj" Exclude="$(ExcludeProjects)" />
-    <Project Include="*\tests\**\*.csproj" Exclude="$(ExcludeProjects)" />
-    <Project Include="*\tests\**\*.vbproj" Exclude="$(ExcludeProjects)" />
+    <Project Include="*\src\*.csproj" Exclude="@(ExcludeProjects)" />
+    <Project Include="*\src\*.vbproj" Condition="'$(IncludeVbProjects)'!='false'" Exclude="@(ExcludeProjects)" />
+    <Project Include="*\tests\**\*.csproj" Exclude="@(ExcludeProjects)" />
+    <Project Include="*\tests\**\*.vbproj" Condition="'$(IncludeVbProjects)'!='false'" Exclude="@(ExcludeProjects)" />
   </ItemGroup>
 
   <Import Project="..\dir.targets" />
@@ -29,4 +29,4 @@
   <Import Project="$(ToolsDir)CodeCoverage.targets" Condition="Exists('$(ToolsDir)CodeCoverage.targets')" />
   <Import Project="$(ToolsDir)PerfTesting.targets" Condition="Exists('$(ToolsDir)PerfTesting.targets')" />
 
-</Project>
\ No newline at end of file
+</Project>