Commit0a38f47

authored

Merge pull requestdotnet#2357 from jaredpar/fix-sdk

Move to new VS SDK build tools

2 parentsa982ecf +4b85261 commit0a38f47Copy full SHA for 0a38f47

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ echo .`
`374`	`374`	`echo .`
`375`	`375`
`376`	`376`	`echo ---------------- Done with arguments, starting preparation -----------------`
`377`		`-setBuildToolsPackage=Microsoft.VSSDK.BuildTools.15.0.25929-RC2`
	`377`	`+setBuildToolsPackage=Microsoft.VSSDK.BuildTools.15.0.26124-RC3`
`378`	`378`	`if '%VSSDKInstall%'=='' (`
`379`	`379`	`setVSSDKInstall=%~dp0packages\%BuildToolsPackage%\tools\vssdk`
`380`	`380`	`)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`<packageid="VisualCppTools"version="14.0.24519-Pre"/>`
`30`	`30`	`<packageid="Newtonsoft.Json"version="6.0.8"/>`
`31`	`31`	`<packageid="Microsoft.FSharp.TupleSample"version="1.0.0-alpha-161121"/>`
`32`		`- <packageid="Microsoft.VSSDK.BuildTools"version="15.0.25929-RC2" />`
	`32`	`+ <packageid="Microsoft.VSSDK.BuildTools"version="15.0.26124-RC3" />`
`33`	`33`
`34`	`34`	`<!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute-->`
`35`	`35`	`<!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools-->`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />`
`8`	`8`	`<packageid="MicroBuild.Core"version="0.2.0" />`
`9`	`9`	`<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />`
`10`		`- <packageid="MicroBuild.Plugins.SwixBuild"version="1.0.101" />`
	`10`	`+ <packageid="MicroBuild.Plugins.SwixBuild"version="1.1.0-g0701ee829f" />`
`11`	`11`	`<packageid="WiX.Toolset.2015"version="3.10.0.1503" />`
`12`	`12`	`<packageid="Microsoft.VisualFSharp.Core.Redist"version="1.0.0" />`
`13`	`13`	`<packageid="Microsoft.VisualStudio.Shell.14.0"version="14.3.25407"targetFramework="net46" />`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`<WarningsAsErrors />`
`32`	`32`
`33`	`33`	`<FX_NO_LOADERCondition=" '$(FX_NO_LOADER)'==''">false</FX_NO_LOADER>`
`34`		`- <VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.25929-RC2</VSSDK_BUILDTOOLS_VERSION>`
	`34`	`+ <VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26124-RC3</VSSDK_BUILDTOOLS_VERSION>`
`35`	`35`
`36`	`36`	`<!-- Always qualify the IntermediateOutputPath by the TargetFramework if any exists-->`
`37`	`37`	`<IntermediateOutputPath>obj\$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>`

Comments

(0)