Commitfacec98

authored

Merge pull requestdotnet#4773 from Microsoft/merges/master-to-dev15.8

Merge master to dev15.8

2 parentsf29e04a +31cc4ab commitfacec98Copy full SHA for facec98

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>`
`11`	`11`	`<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>`
`12`	`12`	`<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>`
	`13`	`+ <UseStandardResourceNames>false</UseStandardResourceNames>`
`13`	`14`	`<DefineConstants>$(DefineConstants);BUILD_FROM_SOURCE</DefineConstants>`
`14`	`15`
`15`	`16`	`<!-- Signing flags currently done using OtherFlags. Can migrate to properties once build target updated-->`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`<authors>$authors$</authors>`
`24`	`24`	`<licenseUrl>$licenseUrl$</licenseUrl>`
`25`	`25`	`<projectUrl>$projectUrl$</projectUrl>`
	`26`	`+ <iconUrl>http://fsharp.org/img/logo.png</iconUrl>`
`26`	`27`	`<tags>$tags$</tags>`
`27`	`28`	`<dependencies>`
`28`	`29`	`<grouptargetFramework="net20">`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`<authors>$authors$</authors>`
`19`	`19`	`<licenseUrl>$licenseUrl$</licenseUrl>`
`20`	`20`	`<projectUrl>$projectUrl$</projectUrl>`
	`21`	`+ <iconUrl>http://fsharp.org/img/logo.png</iconUrl>`
`21`	`22`	`<tags>$tags$</tags>`
`22`	`23`	`<requireLicenseAcceptance>false</requireLicenseAcceptance>`
`23`	`24`	`<dependencies>`

Comments

(0)