Commit89275d2

authored

Fix #4075 - Replace Embed property with EmbeddedFiles item group in Microsoft.FSharp.Targets (#5487)

* Fix #4075* EmbeddedFiles

1 parent46b758f commit89275d2Copy full SHA for 89275d2

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ type public Fsc () as this =`
`38`	`38`	`let mutabledocumentationFile:string=null`
`39`	`39`	`let mutabledotnetFscCompilerPath:string=null`
`40`	`40`	`let mutableembedAllSources=false`
`41`		`-let mutableembed:string=null`
	`41`	`+let mutableembeddedFiles:ITaskItem[]=[\|\|]`
`42`	`42`	`let mutablegenerateInterfaceFile:string=null`
`43`	`43`	`let mutablehighEntropyVA:bool=false`
`44`	`44`	`let mutablekeyFile:string=null`
`@@ -106,7 +106,9 @@ type public Fsc () as this =`
`106`	`106`	`\|_->null)`
`107`	`107`	`if embedAllSourcesthen`
`108`	`108`	`builder.AppendSwitch("--embed+")`
`109`		`- builder.AppendSwitchIfNotNull("--embed:", embed)`
	`109`	`+if embeddedFiles<>nullthen`
	`110`	`+for itemin embeddedFilesdo`
	`111`	`+ builder.AppendSwitchIfNotNull("--embed:", item.ItemSpec)`
`110`	`112`	`builder.AppendSwitchIfNotNull("--sourcelink:", sourceLink)`
`111`	`113`	`// NoFramework`
`112`	`114`	`if noFrameworkthen`
`@@ -290,9 +292,9 @@ type public Fsc () as this =`
`290`	`292`	`with get()= embedAllSources`
`291`	`293`	`andset(s)= embedAllSources<- s`
`292`	`294`
`293`		`-memberfsc.Embed`
`294`		`-with get()=embed`
`295`		`-andset(e)=embed<- e`
	`295`	`+memberfsc.EmbeddedFiles`
	`296`	`+with get()=embeddedFiles`
	`297`	`+andset(e)=embeddedFiles<- e`
`296`	`298`
`297`	`299`	`// --generate-interface-file <string>:`
`298`	`300`	`// Print the inferred interface of the`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,10 @@ this file.`
`260`	`260`	`Include="@(_CoreCompileResourceInputs);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)" />`
`261`	`261`	`</ItemGroup>`
`262`	`262`
	`263`	`+ <ItemGroup>`
	`264`	`+ <EmbeddedFilesInclude="@(Embed)"KeepDuplicates="false" />`
	`265`	`+ </ItemGroup>`
	`266`	`+`
`263`	`267`	`<!-- Condition is to filter out the _CoreCompileResourceInputs so that it doesn't pass in culture resources to the compiler-->`
`264`	`268`	`<!-- NOTE: ManifestResourceWithNoCulture and ManifestNonResxWithNoCultureOnDisk are generated by Mono targets files-->`
`265`	`269`	`<FscCondition=" '%(_CoreCompileResourceInputs.WithCulture)' != 'true'"`
`@@ -273,7 +277,7 @@ this file.`
`273`	`277`	`DocumentationFile="$(DocumentationFile)"`
`274`	`278`	`DotnetFscCompilerPath="$(DotnetFscCompilerPath)"`
`275`	`279`	`EmbedAllSources="$(EmbedAllSources)"`
`276`		`-Embed="$(Embed)"`
	`280`	`+EmbeddedFiles="@(EmbeddedFiles)"`
`277`	`281`	`GenerateInterfaceFile="$(GenerateInterfaceFile)"`
`278`	`282`	`HighEntropyVA="$(HighEntropyVA)"`
`279`	`283`	`KeyFile="$(KeyOriginatorFile)"`

Comments

(0)