Update bootstrap binaries and targets

Update the bootstrap binaries and targets.
fsharp · Oct 25, 2012 · 1c078c9 · 1c078c9
1 parent bc724cf
commit 1c078c9
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 36 deletions.
diff --git a/lib/bootstrap/4.0/FSharp.Build.dll b/lib/bootstrap/4.0/FSharp.Build.dll
diff --git a/lib/bootstrap/4.0/FSharp.Compiler.Interactive.Settings.dll b/lib/bootstrap/4.0/FSharp.Compiler.Interactive.Settings.dll
diff --git a/lib/bootstrap/4.0/FSharp.Compiler.Server.Shared.dll b/lib/bootstrap/4.0/FSharp.Compiler.Server.Shared.dll
diff --git a/lib/bootstrap/4.0/FSharp.Compiler.dll b/lib/bootstrap/4.0/FSharp.Compiler.dll
diff --git a/lib/bootstrap/4.0/FSharp.Core.dll b/lib/bootstrap/4.0/FSharp.Core.dll
diff --git a/lib/bootstrap/4.0/FSharp.Core.optdata b/lib/bootstrap/4.0/FSharp.Core.optdata
diff --git a/lib/bootstrap/4.0/FSharp.Core.sigdata b/lib/bootstrap/4.0/FSharp.Core.sigdata
diff --git a/lib/bootstrap/4.0/Microsoft.FSharp.targets b/lib/bootstrap/4.0/Microsoft.FSharp.targets
@@ -22,10 +22,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
 
     <PropertyGroup>
-        <!-- FSharpTargetsDir is the directory where the targets file lives -->
-        <FSharpTargetsDir Condition="'$(FSharpTargetsDir)'==''">unused</FSharpTargetsDir>
-        <!-- FSharpTargetsFullPath is the full path (dir + filename) of the targets file -->
-        <FSharpTargetsFullPath Condition="'$(FSharpTargetsDir)'!=''">$(FSharpTargetsDir)\Microsoft.FSharp.targets</FSharpTargetsFullPath>
         <MSBuildAllProjects>$(MSBuildAllProjects);$(FSharpTargetsFullPath)</MSBuildAllProjects>
         <DefaultLanguageSourceExtension>.fs</DefaultLanguageSourceExtension>
         <Language>F#</Language>
@@ -58,42 +54,37 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <PropertyGroup>
         <CreateManifestResourceNamesDependsOn></CreateManifestResourceNamesDependsOn>
     </PropertyGroup>
-    <Target
-        Name="CreateManifestResourceNames"
-        Condition="'@(EmbeddedResource)' != ''"
-        DependsOnTargets="$(CreateManifestResourceNamesDependsOn)"
-    >
-
-        <ItemGroup>
-            <_Temporary Remove="@(_Temporary)" />
-        </ItemGroup>
-
-        <!-- 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')">
-
-            <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'">
-
-            <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
-
-        </CreateFSharpManifestResourceName>
-
+
+	<Target Name="CreateManifestResourceNames" 
+        Condition="'@(EmbeddedResource)' != ''"
+        DependsOnTargets="$(CreateManifestResourceNamesDependsOn)">
+		<CreateFSharpManifestResourceName Condition="'@(ResxWithNoCulture)' != ''"
+			ResourceFiles="@(ResxWithNoCulture)" RootNamespace="$(RootNamespace)">
+			<Output TaskParameter = "ManifestResourceNames" ItemName = "ManifestResourceWithNoCultureName" />
+		</CreateFSharpManifestResourceName>
+
+		<CreateFSharpManifestResourceName Condition="'@(NonResxWithNoCulture)' != ''"
+			ResourceFiles="@(NonResxWithNoCulture)" RootNamespace="$(RootNamespace)">
+			<Output TaskParameter = "ManifestResourceNames" ItemName = "ManifestNonResxWithNoCulture" />
+		</CreateFSharpManifestResourceName>
+
+		<CreateFSharpManifestResourceName Condition="'@(ResxWithCulture)' != ''"
+			ResourceFiles="@(ResxWithCulture)" RootNamespace="$(RootNamespace)">
+			<Output TaskParameter = "ManifestResourceNames" ItemName = "ManifestResourceWithCultureName" />
+		</CreateFSharpManifestResourceName>
+
+		<CreateFSharpManifestResourceName Condition="'@(NonResxWithCulture)' != ''"
+			ResourceFiles="@(NonResxWithCulture)" RootNamespace="$(RootNamespace)">
+			<Output TaskParameter = "ManifestResourceNames" ItemName = "ManifestNonResxWithCulture" />
+		</CreateFSharpManifestResourceName>
+
+
         <ItemGroup>
             <EmbeddedResource Remove="@(EmbeddedResource)" Condition="'%(EmbeddedResource.ManifestResourceName)' == ''"/>
             <EmbeddedResource Include="@(_Temporary)" />
             <_Temporary Remove="@(_Temporary)" />
         </ItemGroup>
+
     </Target>
 
     <ItemGroup>
@@ -167,7 +158,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
               Platform="$(PlatformTarget)"
               References="@(ReferencePath)"
               ReferencePath="$(ReferencePath)"
-              Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)"
+              Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)"
               Sources="@(CompileBefore);@(Compile);@(CompileAfter)"
               Tailcalls="$(Tailcalls)"
               TargetType="$(OutputType)"
@@ -194,3 +185,4 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
 </Project>
 
+
diff --git a/lib/bootstrap/4.0/fsc.exe b/lib/bootstrap/4.0/fsc.exe
diff --git a/lib/bootstrap/4.0/fsi.exe b/lib/bootstrap/4.0/fsi.exe