Commit2b3f7cd

authored

Merge pull requestdotnet#5816 from Microsoft/merges/master-to-dev16.0

Merge master to dev16.0

2 parents8aa2d15 +dc8373a commit2b3f7cdCopy full SHA for 2b3f7cd

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@`
`26`	`26`	`</WizardExtension>`
`27`	`27`	`<WizardData>`
`28`	`28`	`<packagesrepository="extension"repositoryId="VisualFSharpTemplates">`
`29`		`- <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40" />`
`30`		`- <packageid="FSharp.Core"version="4.5.2"targetFramework="net40" />`
	`29`	`+ <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40"skipAssemblyReferences="true"/>`
	`30`	`+ <packageid="FSharp.Core"version="4.5.2"targetFramework="net40"skipAssemblyReferences="true"/>`
`31`	`31`	`</packages>`
`32`	`32`	`</WizardData>`
`33`	`33`	`</VSTemplate>`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@`
`26`	`26`	`</WizardExtension>`
`27`	`27`	`<WizardData>`
`28`	`28`	`<packagesrepository="extension"repositoryId="VisualFSharpTemplates">`
`29`		`- <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40" />`
`30`		`- <packageid="FSharp.Core"version="4.5.2"targetFramework="net40" />`
	`29`	`+ <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40"skipAssemblyReferences="true"/>`
	`30`	`+ <packageid="FSharp.Core"version="4.5.2"targetFramework="net40"skipAssemblyReferences="true"/>`
`31`	`31`	`</packages>`
`32`	`32`	`</WizardData>`
`33`	`33`	`</VSTemplate>`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`</WizardExtension>`
`25`	`25`	`<WizardData>`
`26`	`26`	`<packagesrepository="extension"repositoryId="VisualFSharpTemplates">`
`27`		`- <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40" />`
`28`		`- <packageid="FSharp.Core"version="4.5.2"targetFramework="net40" />`
	`27`	`+ <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40"skipAssemblyReferences="true"/>`
	`28`	`+ <packageid="FSharp.Core"version="4.5.2"targetFramework="net40"skipAssemblyReferences="true"/>`
`29`	`29`	`</packages>`
`30`	`30`	`</WizardData>`
`31`	`31`	`</VSTemplate>`

Comments

(0)