Merge branch 'ctaggart-assemblyinfo'

Author: fsgit

.gitignore

@@ -79,3 +79,4 @@ TestResults.xml
 extras
 ossreadme*.txt
 *.XML
+src/assemblyinfo/assemblyinfo.shared.fs

src/assemblyinfo/assemblyinfo.shared.fs

@@ -73,7 +73,7 @@
     <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.dll.fs">
       <Link>AssemblyInfo/assemblyinfo.FSharp.Compiler.Service.dll.fs</Link>
     </Compile>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.shared.fs">
+    <Compile Include="..\..\assemblyinfo\assemblyinfo.shared.fs" Condition="Exists('..\..\assemblyinfo\assemblyinfo.shared.fs')">
       <Link>AssemblyInfo/assemblyinfo.shared.fs</Link>
     </Compile>
     <FsSrGen Include="..\FSComp.txt">

src/fsharp/FSharp.Compiler.Service.Browser/FSharp.Compiler.Service.Browser.fsproj

@@ -67,7 +67,7 @@
     <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.dll.fs">
       <Link>AssemblyInfo/assemblyinfo.FSharp.Compiler.Service.dll.fs</Link>
     </Compile>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.shared.fs">
+    <Compile Include="..\..\assemblyinfo\assemblyinfo.shared.fs" Condition="Exists('..\..\assemblyinfo\assemblyinfo.shared.fs')">
       <Link>AssemblyInfo/assemblyinfo.shared.fs</Link>
     </Compile>
     <FsSrGen Include="..\FSComp.txt" Condition="'$(NoFsSrGenTask)' != 'true'">