Commita2764f8

authored

Merge pull requestfsharp#818 from dsyme/t6

Use strong-name signed FSharp.Compiler.Interactive.Settings.dll in FSharp.Compiler.Tools package

2 parents561af8b +6624925 commita2764f8Copy full SHA for a2764f8

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+4.1.34`
	`2`	`+* Use strong-name signed FSharp.Compiler.Interactive.Settings.dll in FSharp.Compiler.Tools package`
	`3`	`+`
`1`	`4`	`4.1.33`
`2`	`5`	`* Cherry pickhttps://github.com/Microsoft/visualfsharp/pull/4348/`
`3`	`6`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@`
`35`	`35`	`<filesrc="..\Release\net40\bin\FSharp.Compiler.Private.xml"target="tools\FSharp.Compiler.Private.xml" />`
`36`	`36`	`<filesrc="..\Release\net40\bin\FSharp.Compiler.Server.Shared.dll"target="tools\FSharp.Compiler.Server.Shared.dll" />`
`37`	`37`	`<filesrc="..\Release\net40\bin\FSharp.Compiler.Server.Shared.xml"target="tools\FSharp.Compiler.Server.Shared.xml" />`
`38`		`- <filesrc="..\Release\net40\bin\FSharp.Compiler.Interactive.Settings.dll"target="tools\FSharp.Compiler.Interactive.Settings.dll" />`
`39`		`- <filesrc="..\Release\net40\bin\FSharp.Compiler.Interactive.Settings.xml"target="tools\FSharp.Compiler.Interactive.Settings.xml" />`
	`38`	`+ <filesrc="..\lib\bootstrap\signed\SDK\4.1\FSharp.Compiler.Interactive.Settings.dll"target="tools\FSharp.Compiler.Interactive.Settings.dll" />`
`40`	`39`	`<filesrc="..\Release\net40\bin\fsiAnyCpu.exe"target="tools\fsiAnyCpu.exe" />`
`41`	`40`	`<filesrc="..\Release\net40\bin\fsiAnyCpu.exe.config"target="tools\fsiAnyCpu.exe.config" />`
`42`	`41`	`<filesrc="..\Release\net40\bin\fsiAnyCpu.xml"target="tools\fsiAnyCpu.xml" />`

49.7 KB

Binary file not shown.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`# the version under development, update after a release`
`3`		`-$version='4.1.33'`
	`3`	`+$version='4.1.34'`
`4`	`4`
`5`	`5`	`functionisVersionTag($tag){`
`6`	`6`	`$v=New-Object Version`

Comments

(0)