Commit3d37608

authored

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

Merge master to dev15.8

2 parents81c4144 +f69dcf4 commit3d37608Copy full SHA for 3d37608

File tree

+93

-134

lines changed

+93

-134

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -804,6 +804,12 @@ echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BU`
`804`	`804`	`%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG%`
`805`	`805`	`ifERRORLEVEL1echo Error building NuGet packages&&goto :failure`
`806`	`806`
	`807`	`+ifnot"%SIGN_TYPE%"=="" (`
	`808`	`+echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json`
	`809`	`+call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json`
	`810`	`+ifERRORLEVEL1echo Error running sign tool&&goto :failure`
	`811`	`+)`
	`812`	`+`
`807`	`813`	`if"%BUILD_SETUP%"=="1" (`
`808`	`814`	`echo%_msbuildexe%%msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%`
`809`	`815`	`%_msbuildexe%%msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,24 @@`
	`1`	`+{`
	`2`	`+"sign": [`
	`3`	`+ {`
	`4`	`+"certificate":"NuGet",`
	`5`	`+"strongName":null,`
	`6`	`+"values": [`
	`7`	`+"artifacts\\*.nupkg",`
	`8`	`+"artifacts\\\\.nupkg"`
	`9`	`+ ]`
	`10`	`+ }`
	`11`	`+ ],`
	`12`	`+"exclude": [`
	`13`	`+"FSharp.Build.resources.dll",`
	`14`	`+"FSharp.Compiler.Interactive.Settings.resources.dll",`
	`15`	`+"FSharp.Compiler.Private.resources.dll",`
	`16`	`+"FSharp.Core.resources.dll",`
	`17`	`+"fsc.exe",`
	`18`	`+"FSharp.Build.dll",`
	`19`	`+"FSharp.Compiler.Interactive.Settings.dll",`
	`20`	`+"FSharp.Compiler.Private.dll",`
	`21`	`+"FSharp.Core.dll",`
	`22`	`+"fsi.exe"`
	`23`	`+ ]`
	`24`	`+}`

Comments

(0)