Commit0e46498

authored

Merge pull requestdotnet#6120 from Microsoft/merges/dev15.9-to-dev16.0

Merge dev15.9 to dev16.0

2 parents7b73f62 +45ac261 commit0e46498Copy full SHA for 0e46498

File tree

-1

lines changed

-1

lines changed

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)