Commitdd6f474

committed

Merge remote-tracking branch 'upstream/master' into merges/master-to-dev16.0

2 parents8dcfd9a +a1553ee commitdd6f474Copy full SHA for dd6f474

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests.FSharpSuite",`
`31`	`31`	`EndProject`
`32`	`32`	`Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.UnitTests","tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"`
`33`	`33`	`EndProject`
`34`		`-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"`
	`34`	`+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"`
`35`	`35`	`EndProject`
`36`	`36`	`Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Compiler","Compiler","{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"`
`37`	`37`	`EndProject`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ build:`
`38`	`38`	`MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj`
`39`	`39`	`MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj`
`40`	`40`	`MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj`
`41`		`-MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj`
	`41`	`+MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj`
`42`	`42`	`mkdir -p$(Configuration)/fsharp30/net40/bin`
`43`	`43`	`mkdir -p$(Configuration)/fsharp31/net40/bin`
`44`	`44`	`mkdir -p$(Configuration)/fsharp40/net40/bin`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,12 @@`
`62`	`62`	`<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->`
`63`	`63`
`64`	`64`	`<ItemGroupCondition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >`
`65`		`- <ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>`
	`65`	`+ <ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>`
`66`	`66`	`<ProjectsWithNet40Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>`
`67`	`67`	`</ItemGroup>`
`68`	`68`
`69`	`69`	`<ItemGroupCondition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">`
`70`		`- <ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>`
	`70`	`+ <ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>`
`71`	`71`	`<ProjectsWithCoreClrInclude="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>`
`72`	`72`	`</ItemGroup>`
`73`	`73`

File renamed without changes.

File renamed without changes.

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@`
`120`	`120`	`<CompileInclude="StructTuples.fs" />`
`121`	`121`	`<CompileInclude="SurfaceArea.$(TargetDotnetProfile).fs" />`
`122`	`122`	`<CompileInclude="Program.fs"Condition="'$(TargetDotnetProfile)' == 'coreclr'" />`
`123`		`- <CopyAndSubstituteTextInclude="FSharp.Core.Unittests.dll.config">`
`124`		`- <TargetFilename>FSharp.Core.Unittests.dll.config</TargetFilename>`
	`123`	`+ <CopyAndSubstituteTextInclude="FSharp.Core.UnitTests.dll.config">`
	`124`	`+ <TargetFilename>FSharp.Core.UnitTests.dll.config</TargetFilename>`
`125`	`125`	`<Pattern1>FSCoreVersion</Pattern1>`
`126`	`126`	`<Replacement1>$(FSCoreVersion)</Replacement1>`
`127`	`127`	`</CopyAndSubstituteText>`

Comments

(0)