Update Microsoft.FSharp.targets to match what is shipped in VS. This had gotten stale over the past couple of releases. (changeset 1275028)

Author: latkin

src/fsharp/FSharp.Build/Microsoft.FSharp.targets

@@ -20,19 +20,24 @@ this file.
     <UsingTask TaskName="Fsc" AssemblyFile="FSharp.Build{BuildSuffix}.dll"/>
     <UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="FSharp.Build{BuildSuffix}.dll"/>
 
+    <PropertyGroup>
+        <ImportByWildcardBeforeMicrosoftFSharpTargets Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>
+        <ImportByWildcardAfterMicrosoftFSharpTargets Condition="'$(ImportByWildcardAfterMicrosoftFSharpTargets)' == ''">true</ImportByWildcardAfterMicrosoftFSharpTargets>
+    </PropertyGroup>
+
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore\*" Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore')"/>
 
     <PropertyGroup>
-        <!-- FSharpTargetsDir is the directory where the targets file lives -->
-        <FSharpTargetsDir Condition="'$(FSharpTargetsDir)'==''">{FSharpTargetsDir}</FSharpTargetsDir>
-        <!-- FSharpTargetsFullPath is the full path (dir + filename) of the targets file -->
-        <FSharpTargetsFullPath Condition="'$(FSharpTargetsDir)'!=''">$(FSharpTargetsDir)\Microsoft.FSharp{BuildSuffix}.targets</FSharpTargetsFullPath>
-        <MSBuildAllProjects>$(MSBuildAllProjects);$(FSharpTargetsFullPath)</MSBuildAllProjects>
+        <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
         <DefaultLanguageSourceExtension>.fs</DefaultLanguageSourceExtension>
         <Language>F#</Language>
+        <TargetRuntime>Managed</TargetRuntime>
         <Tailcalls Condition="'$(Tailcalls)'==''">$(Optimize)</Tailcalls>
         <FrameworkRegistryBase Condition="'$(TargetFrameworkIdentifier)'=='Silverlight'">Software\Microsoft\Microsoft SDKs\$(TargetFrameworkIdentifier)</FrameworkRegistryBase>
         <!-- Visual studio requires a non-empty RootNamespace value for "Add New Item" to work. -->
         <RootNamespace Condition="'$(RootNamespace)'==''">RootNamespace</RootNamespace>
+        <Actual32Bit Condition="'$(TargetFrameworkVersion)'=='v2.0' or '$(TargetFrameworkVersion)'=='v3.0' or '$(TargetFrameworkVersion)'=='v3.5' or '$(TargetFrameworkVersion)'=='v4.0'">false</Actual32Bit>
+        <Actual32Bit Condition="!('$(TargetFrameworkVersion)'=='v2.0' or '$(TargetFrameworkVersion)'=='v3.0' or '$(TargetFrameworkVersion)'=='v3.5' or '$(TargetFrameworkVersion)'=='v4.0')">$(Prefer32Bit)</Actual32Bit>    
     </PropertyGroup>
 
     <!--
@@ -70,20 +75,20 @@ this file.
 
         <!-- Create manifest names for culture and non-culture Resx files, and for non-culture Non-Resx resources -->
         <CreateFSharpManifestResourceName
-            ResourceFiles="@(EmbeddedResource)"
-            RootNamespace="$(RootNamespace)"
-            Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
+              ResourceFiles="@(EmbeddedResource)"
+              RootNamespace="$(RootNamespace)"
+              Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
 
             <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
 
         </CreateFSharpManifestResourceName>
 
         <!-- Create manifest names for all culture non-resx resources -->
         <CreateFSharpManifestResourceName
-            ResourceFiles="@(EmbeddedResource)"
-            RootNamespace="$(RootNamespace)"
-            PrependCultureAsDirectory="false"
-            Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
+              ResourceFiles="@(EmbeddedResource)"
+              RootNamespace="$(RootNamespace)"
+              PrependCultureAsDirectory="false"
+              Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
 
             <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
 
@@ -132,15 +137,14 @@ this file.
                  @(_DebugSymbolsIntermediatePath);                 
                  $(NonExistentFile);
                  @(CustomAdditionalCompileOutputs)"
+        Returns=""
         DependsOnTargets="$(CoreCompileDependsOn)"
     >
 
-        <!-- See bug 6053
-        <Error  
-            Condition="'$(SilverlightVersion)' != '' and !(Exists('$(ProgramFiles)\Microsoft F#\Silverlight\Libraries\Client\$(SilverlightVersion)\FSharp.Core.dll'))"
-            Text="F# runtime for Silverlight version $(SilverlightVersion) is not installed. Please go to http://go.microsoft.com/fwlink/?LinkId=177463 to download and install matching F# runtime"
-          />
-          -->
+        <Error
+            Condition="'$(SilverlightVersion)' != '' and '$(SilverlightVersion)' != 'v5.0'"
+            Text="In this version of Visual Studio, F# for Silverlight can only target Silverlight v5.0. Use a prior version of Visual Studio to target previous versions of Silverlight with F#."
+        />
 
         <Warning
             Condition="'$(Win32ResourceFile)' != '' "
@@ -165,6 +169,7 @@ this file.
               OutputAssembly="@(IntermediateAssembly)"
               PdbFile="$(PdbFile)"
               Platform="$(PlatformTarget)"
+              Prefer32Bit="$(Actual32Bit)"
               References="@(ReferencePath)"
               ReferencePath="$(ReferencePath)"
               Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)"
@@ -182,14 +187,57 @@ this file.
               WarningsAsErrors="$(WarningsAsErrors)"
               Win32ManifestFile="$(Win32Manifest)"
               Win32ResourceFile="$(Win32Resource)"
-                />
+              SubsystemVersion="$(SubsystemVersion)"
+              HighEntropyVA="$(HighEntropyVA)"
+              TargetProfile="$(TargetProfile)"
+              SqmSessionGuid="$(SqmSessionGuid)"
+        />
 
         <ItemGroup>
             <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
         </ItemGroup>
 
     </Target>
 
+
     <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets"/>
 
+  <!--
+      ============================================================
+                                          GenerateTargetFrameworkMonikerAttribute
+
+      Emit the target framework moniker attribute as  a code fragment into a temporary source file for the compiler.
+
+      ============================================================
+      -->
+
+    <Target Name="GenerateTargetFrameworkMonikerAttribute" BeforeTargets="BeforeCompile" DependsOnTargets="PrepareForBuild;GetReferenceAssemblyPaths" Inputs="$(MSBuildThisFileFullPath)" Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(GenerateTargetFrameworkAttribute)' == 'true'">
+
+        <PropertyGroup>
+            <!-- This attribute is only available in mscorlib v4 and later -->
+            <AdditionalSourcesText Condition="'$(TargetFrameworkMoniker)' != '' and '$(TargetingClr2Framework)' != 'true'">
+                $(AdditionalSourcesText)
+                namespace Microsoft.BuildSettings
+                [&lt;System.Runtime.Versioning.TargetFrameworkAttribute(&quot;$(TargetFrameworkMoniker)&quot;, FrameworkDisplayName=&quot;$(TargetFrameworkMonikerDisplayName)&quot;)&gt;]
+                do ()
+            </AdditionalSourcesText>
+        </PropertyGroup>
+
+        <!-- This is a file shared between projects so we have to take care to handle simultaneous writes (by ContinueOnError)
+             and a race between clean from one project and build from another (by not adding to FilesWritten so it doesn't clean) -->
+        <WriteLinesToFile
+            File="$(TargetFrameworkMonikerAssemblyAttributesPath)"
+            Lines="$(AdditionalSourcesText)"
+            Condition="'$(AdditionalSourcesText)' != ''"
+            ContinueOnError="true"
+            Overwrite="true"/>
+
+        <ItemGroup>
+            <CompileBefore Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(AdditionalSourcesText)' != ''"/>
+        </ItemGroup>
+
+    </Target>
+
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter\*" Condition="'$(ImportByWildcardAfterMicrosoftFSharpTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter')"/>
+
 </Project>