Fix #4075 - Replace Embed property with EmbeddedFiles item group in M…

…icrosoft.FSharp.Targets (#5487) * Fix #4075 * EmbeddedFiles
dotnet · Aug 22, 2018 · 89275d2 · 89275d2
1 parent 46b758f
commit 89275d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs
@@ -38,7 +38,7 @@ type public Fsc () as this =
     let mutable documentationFile : string = null
     let mutable dotnetFscCompilerPath : string = null
     let mutable embedAllSources = false
-    let mutable embed : string = null
+    let mutable embeddedFiles : ITaskItem[] = [||]
     let mutable generateInterfaceFile : string = null
     let mutable highEntropyVA : bool = false
     let mutable keyFile : string = null
@@ -106,7 +106,9 @@ type public Fsc () as this =
                 | _          -> null)
         if embedAllSources then
             builder.AppendSwitch("--embed+")
-        builder.AppendSwitchIfNotNull("--embed:", embed)
+        if embeddedFiles <> null then 
+            for item in embeddedFiles do
+                builder.AppendSwitchIfNotNull("--embed:", item.ItemSpec)
         builder.AppendSwitchIfNotNull("--sourcelink:", sourceLink)
         // NoFramework
         if noFramework then 
@@ -290,9 +292,9 @@ type public Fsc () as this =
         with get() = embedAllSources
         and  set(s) = embedAllSources <- s
 
-    member fsc.Embed
-        with get() = embed
-        and set(e) = embed <- e
+    member fsc.EmbeddedFiles
+        with get() = embeddedFiles
+        and set(e) = embeddedFiles <- e
 
     // --generate-interface-file <string>: 
     //     Print the inferred interface of the

diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
@@ -260,6 +260,10 @@ this file.
                 Include="@(_CoreCompileResourceInputs);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)" />
         </ItemGroup>
 
+        <ItemGroup>
+            <EmbeddedFiles Include="@(Embed)" KeepDuplicates="false" />
+        </ItemGroup>
+
         <!-- Condition is to filter out the _CoreCompileResourceInputs so that it doesn't pass in culture resources to the compiler -->
         <!-- NOTE: ManifestResourceWithNoCulture and ManifestNonResxWithNoCultureOnDisk are generated by Mono targets files --> 
         <Fsc  Condition=" '%(_CoreCompileResourceInputs.WithCulture)' != 'true' "
@@ -273,7 +277,7 @@ this file.
               DocumentationFile="$(DocumentationFile)"
               DotnetFscCompilerPath="$(DotnetFscCompilerPath)"
               EmbedAllSources="$(EmbedAllSources)"
-              Embed="$(Embed)"
+              EmbeddedFiles="@(EmbeddedFiles)"
               GenerateInterfaceFile="$(GenerateInterfaceFile)"
               HighEntropyVA="$(HighEntropyVA)"
               KeyFile="$(KeyOriginatorFile)"