Skip to content

Commit 4e96708

Browse files
brettfobrettfo
committed
Merge remote-tracking branch 'upstream/master' into merges/dev15.8-to-master
2 parents 9a428d9 + bffb2ab commit 4e96708

File tree

18 files changed

+49
-85
lines changed

18 files changed

+49
-85
lines changed

‎fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ItemGroup>
3030
<Reference Include="System.Runtime" />
3131
<Reference Include="System.IO" />
32-
<PackageReference Update="FSharp.Core" Version="4.1.*" />
32+
<PackageReference Include="FSharp.Core" Version="4.1.18" />
3333
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3434
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3535
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>

‎fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<ItemGroup>
3232
<Reference Include="System.Runtime" />
3333
<Reference Include="System.IO" />
34-
<PackageReference Update="FSharp.Core" Version="4.1.*" />
34+
<PackageReference Include="FSharp.Core" Version="4.1.18" />
3535
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3636
</ItemGroup>
3737
</Project>

‎fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
2929
<Private>false</Private>
3030
</Reference>
31-
<PackageReference Update="FSharp.Core" Version="4.1.*" />
31+
<PackageReference Include="FSharp.Core" Version="4.1.18" />
3232
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3333
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
3434
<Private>false</Private>

‎fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<None Include="App.config" />
7373
</ItemGroup>
7474
<ItemGroup>
75-
<PackageReference Update="FSharp.Core" Version="4.2.*" />
75+
<PackageReference Include="FSharp.Core" Version="4.2.3" />
7676
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
7777
<PackageReference Include="NUnit" Version="3.9.0" />
7878
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@
635635
</Compile>
636636
</ItemGroup>
637637
<ItemGroup>
638-
<PackageReference Update="FSharp.Core" Version="4.1.*" />
638+
<PackageReference Include="FSharp.Core" Version="4.1.18" />
639639
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
640640
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
641641
</ItemGroup>

‎src/fsharp/FSharp.Build/Microsoft.FSharp.Targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,7 @@ this file.
394394
Overwrite="true"/>
395395

396396
<ItemGroup>
397-
<CompileBefore Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(AdditionalSourcesText)' != '' AND ('$(OutputType)' == 'Exe' OR '$(OutputType)' == 'WinExe')"/>
398-
<CompileAfter Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(AdditionalSourcesText)' != '' AND '$(OutputType)' != 'Exe' AND '$(OutputType)' != 'WinExe'"/>
397+
<CompileBefore Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(AdditionalSourcesText)' != ''"/>
399398
</ItemGroup>
400399

401400
</Target>

‎src/utils/CompilerLocationUtils.fs‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -217,31 +217,13 @@ module internal FSharpEnvironment =
217217
match probePoint with
218218
| Some p when safeExists (Path.Combine(p,"FSharp.Core.dll")) -> Some p
219219
| _ ->
220-
221-
// On windows the location of the compiler is via a registry key
222-
223-
// Note: If the keys below change, be sure to update code in:
224-
// Property pages (ApplicationPropPage.vb)
225-
let keys =
226-
[|
227-
@"Software\Microsoft\FSharp\10.1\Runtime\v4.0";
228-
@"Software\Microsoft\FSharp\4.1\Runtime\v4.0";
229-
@"Software\Microsoft\FSharp\4.0\Runtime\v4.0"
230-
|]
231-
let path = keys |> Seq.tryPick(fun k -> tryRegKey k)
232-
match path with
233-
| Some _ -> path
234-
| None ->
235-
// On Unix we let you set FSHARP_COMPILER_BIN. I've rarely seen this used and its not documented in the install instructions.
236-
let result =
237-
let var = System.Environment.GetEnvironmentVariable("FSHARP_COMPILER_BIN")
238-
if String.IsNullOrEmpty(var) then None
239-
else Some(var)
240-
match result with
241-
| Some _ -> result
242-
| None ->
243-
// For the prototype compiler, we can just use the current domain
244-
tryCurrentDomain()
220+
// We let you set FSHARP_COMPILER_BIN. I've rarely seen this used and its not documented in the install instructions.
221+
let result = System.Environment.GetEnvironmentVariable("FSHARP_COMPILER_BIN")
222+
if not (String.IsNullOrEmpty(result)) then
223+
Some result
224+
else
225+
// For the prototype compiler, we can just use the current domain
226+
tryCurrentDomain()
245227
with e ->
246228
System.Diagnostics.Debug.Assert(false, "Error while determining default location of F# compiler")
247229
None

‎tests/fsharp/core/byrefs/test.bsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ test.fsx(66,34,66,47): typecheck error FS1204: This construct is for use in the
4343

4444
test.fsx(66,34,66,47): typecheck error FS1204: This construct is for use in the FSharp.Core library and should not be used directly
4545

46-
test.fsx(71,21,71,23): typecheck error FS3236: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
46+
test.fsx(71,21,71,23): typecheck error FS3238: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
4747

48-
test.fsx(72,21,72,23): typecheck error FS3236: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
48+
test.fsx(72,21,72,23): typecheck error FS3238: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
4949

50-
test.fsx(78,21,78,37): typecheck error FS3236: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
50+
test.fsx(78,21,78,37): typecheck error FS3238: Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address.
5151

5252
test.fsx(85,22,85,23): typecheck error FS0001: This expression was expected to have type
5353
'inref<System.DateTime>'

‎tests/fsharp/core/span/test.bsl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
test.fsx(303,46,303,86): typecheck error FS3233: The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope.
2+
test.fsx(303,46,303,86): typecheck error FS3235: The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope.
33

4-
test.fsx(306,13,306,86): typecheck error FS3229: This value can't be assigned because the target 'param1' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
4+
test.fsx(306,13,306,86): typecheck error FS3230: This value can't be assigned because the target 'param1' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
55

6-
test.fsx(309,13,309,62): typecheck error FS3229: This value can't be assigned because the target 'param1' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
6+
test.fsx(309,13,309,62): typecheck error FS3230: This value can't be assigned because the target 'param1' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
77

8-
test.fsx(348,13,348,57): typecheck error FS3229: This value can't be assigned because the target 'addr' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
8+
test.fsx(348,13,348,57): typecheck error FS3230: This value can't be assigned because the target 'addr' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
99

10-
test.fsx(351,13,351,38): typecheck error FS3229: This value can't be assigned because the target 'param1' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
10+
test.fsx(351,13,351,38): typecheck error FS3230: This value can't be assigned because the target 'param1' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope.
1111

1212
test.fsx(354,14,354,29): typecheck error FS3209: The address of the variable 'stackReferring3' or a related expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
1313

‎tests/fsharp/core/span/test2.bsl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ test2.fsx(119,14,119,37): typecheck error FS3228: The address of a value returne
2525

2626
test2.fsx(124,14,124,15): typecheck error FS3209: The address of the variable 'y' or a related expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
2727

28-
test2.fsx(128,13,128,42): typecheck error FS3235: A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
28+
test2.fsx(128,13,128,42): typecheck error FS3237: A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
2929

3030
test2.fsx(132,14,132,41): typecheck error FS3228: The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
3131

3232
test2.fsx(136,14,136,71): typecheck error FS3228: The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
3333

34-
test2.fsx(140,13,140,52): typecheck error FS3235: A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
34+
test2.fsx(140,13,140,52): typecheck error FS3237: A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
3535

36-
test2.fsx(144,13,144,14): typecheck error FS3234: The Span or IsByRefLike variable 's' cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
36+
test2.fsx(144,13,144,14): typecheck error FS3236: The Span or IsByRefLike variable 's' cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
3737

38-
test2.fsx(149,13,149,52): typecheck error FS3235: A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
38+
test2.fsx(149,13,149,52): typecheck error FS3237: A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
3939

40-
test2.fsx(153,21,153,84): typecheck error FS3233: The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope.
40+
test2.fsx(153,21,153,84): typecheck error FS3235: The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope.
4141

42-
test2.fsx(154,13,154,14): typecheck error FS3234: The Span or IsByRefLike variable 'y' cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
42+
test2.fsx(154,13,154,14): typecheck error FS3236: The Span or IsByRefLike variable 'y' cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
4343

44-
test2.fsx(158,13,158,83): typecheck error FS3235: A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
44+
test2.fsx(158,13,158,83): typecheck error FS3237: A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope.
4545

46-
test2.fsx(163,13,163,14): typecheck error FS3234: The Span or IsByRefLike variable 'y' cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
46+
test2.fsx(163,13,163,14): typecheck error FS3236: The Span or IsByRefLike variable 'y' cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
4747

4848
test2.fsx(167,14,167,71): typecheck error FS3228: The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope.
4949

0 commit comments

Comments
 (0)