Commit3edc0b8

committed

Merge remote-tracking branch 'upstream/dev15.9' into merges/dev15.9-to-master

2 parents0bea66a +de04e29 commit3edc0b8Copy full SHA for 3edc0b8

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>`
`23`	`23`
`24`	`24`	`<FSCoreMajorVersion>4.5</FSCoreMajorVersion>`
`25`		`- <FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>`
	`25`	`+ <FSCorePackageVersion>$(FSCoreMajorVersion).5</FSCorePackageVersion>`
`26`	`26`	`<FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>`
`27`	`27`
`28`	`28`	`<FSPackageMajorVersion>10.2</FSPackageMajorVersion>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@`
`68`	`68`	`We require a reference to Microsoft.VisualStudio.Shell.14.0.dll, but that causes some issues with duplicate type`
`69`	`69`	`names. The ~hack~ fix is to include the package reference and ensure the Aliases metadata gets set afterwards.`
`70`	`70`	`-->`
`71`		`- <ReferencePathWithRefAssembliesUpdate="%(Identity)"Aliases="Shell14"Condition="'%(ReferencePathWithRefAssemblies.NuGetPackageId)' == 'Microsoft.VisualStudio.Shell.14.0'" />`
	`71`	`+ <ReferencePathWithRefAssembliesUpdate="%(Identity)"Aliases="Shell14"Condition="'%(ReferencePathWithRefAssemblies.FusionName)' == 'Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'" />`
`72`	`72`	`</ItemGroup>`
`73`	`73`	`</Target>`
`74`	`74`

Comments

(0)