Commit6c62eb3

authored

Update dotnetcli (dotnet#4830)

* Fix buildfromsource build* Update dotnet cli* Address AssemblyVersionGeneration for fcs

1 parent2a515a6 commit6c62eb3Copy full SHA for 6c62eb3

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ echo Build and run a subset of test suites`
`17`	`17`	`echo.`
`18`	`18`	`echo Usage:`
`19`	`19`	`echo.`
`20`		`-echo build.cmd^<all^\|net40^\|coreclr^\|vs^>`
	`20`	`+echo build.cmd^<all^\|net40^\|coreclr^\|vs^\|fcs^>`
`21`	`21`	`echo^<proto^\|protofx^>`
`22`	`22`	`echo^<ci^\|ci_part1^\|ci_part2^\|ci_part3^\|ci_part4^\|microbuild^\|nuget^>`
`23`	`23`	`echo^<debug^\|release^>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`<VersionPrefix>22.0.3</VersionPrefix>`
`7`	`7`	`<OtherFlags>--version:$(VersionPrefix)</OtherFlags>`
	`8`	`+ <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>`
`8`	`9`	`<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build-->`
`9`	`10`	`<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->`
`10`	`11`	`<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@`
`19`	`19`	`<EmbeddedResourceInclude="$(FsCoreDir)\FSCore.resx">`
`20`	`20`	`<Link>FSCore.resx</Link>`
`21`	`21`	`</EmbeddedResource>`
`22`		`- <CompileInclude="$(FsCoreDir)\prim-types-prelude.fsi">`
	`22`	`+ <CompileBeforeInclude="$(FsCoreDir)\prim-types-prelude.fsi">`
`23`	`23`	`<Link>Primitives/prim-types-prelude.fsi</Link>`
`24`		`- </Compile>`
`25`		`- <CompileInclude="$(FsCoreDir)\prim-types-prelude.fs">`
	`24`	`+ </CompileBefore>`
	`25`	`+ <CompileBeforeInclude="$(FsCoreDir)\prim-types-prelude.fs">`
`26`	`26`	`<Link>Primitives/prim-types-prelude.fs</Link>`
`27`		`- </Compile>`
	`27`	`+ </CompileBefore>`
`28`	`28`	`<CompileInclude="$(FsCoreDir)\SR.fs">`
`29`	`29`	`<Link>Primitives/SR.fs</Link>`
`30`	`30`	`</Compile>`

Comments

(0)