Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4e96708

Browse files
committed
Merge remote-tracking branch 'upstream/master' into merges/dev15.8-to-master
2 parents9a428d9 +bffb2ab commit4e96708

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
<ReferenceInclude="System.Runtime" />
3131
<ReferenceInclude="System.IO" />
32-
<PackageReferenceUpdate="FSharp.Core"Version="4.1.*" />
32+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3333
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3434
<ReferenceInclude="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
<ReferenceInclude="System.Runtime" />
3333
<ReferenceInclude="System.IO" />
34-
<PackageReferenceUpdate="FSharp.Core"Version="4.1.*" />
34+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3535
<ProjectReferenceInclude="..\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-
<PackageReferenceUpdate="FSharp.Core"Version="4.1.*" />
31+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3232
<ReferenceInclude="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
<NoneInclude="App.config" />
7373
</ItemGroup>
7474
<ItemGroup>
75-
<PackageReferenceUpdate="FSharp.Core"Version="4.2.*" />
75+
<PackageReferenceInclude="FSharp.Core"Version="4.2.3" />
7676
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="15.6.0" />
7777
<PackageReferenceInclude="NUnit"Version="3.9.0" />
7878
<PackageReferenceInclude="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-
<PackageReferenceUpdate="FSharp.Core"Version="4.1.*" />
638+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
639639
<PackageReferenceInclude="System.Collections.Immutable"Version="1.5.0" />
640640
<PackageReferenceInclude="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-
<CompileBeforeInclude="$(TargetFrameworkMonikerAssemblyAttributesPath)"Condition="'$(AdditionalSourcesText)' != '' AND ('$(OutputType)' == 'Exe' OR '$(OutputType)' == 'WinExe')"/>
398-
<CompileAfterInclude="$(TargetFrameworkMonikerAssemblyAttributesPath)"Condition="'$(AdditionalSourcesText)' != '' AND '$(OutputType)' != 'Exe' AND '$(OutputType)' != 'WinExe'"/>
397+
<CompileBeforeInclude="$(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 probePointwith
218218
| Some pwhen 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-
letkeys=
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-
letpath= keys|> Seq.tryPick(fun k-> tryRegKey k)
232-
match pathwith
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-
letresult=
237-
letvar= System.Environment.GetEnvironmentVariable("FSHARP_COMPILER_BIN")
238-
if String.IsNullOrEmpty(var)then None
239-
else Some(var)
240-
match resultwith
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+
letresult= System.Environment.GetEnvironmentVariable("FSHARP_COMPILER_BIN")
222+
ifnot(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 isfor usein the FSharp.Core libraryand shouldnot be used directly
4545

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

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

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

5252
test.fsx(85,22,85,23): typecheck error FS0001: This expression was expectedto 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 errorFS3233: The functionor method call cannot be used at this point, because one argument that is a byref of a non-stack-local Spanor IsByRefLike type is used with another argument that is a stack-local Spanor IsByRefLike type. This isto ensure the address of the local value doesnot escape its scope.
2+
test.fsx(303,46,303,86): typecheck errorFS3235: The functionor method call cannot be used at this point, because one argument that is a byref of a non-stack-local Spanor IsByRefLike type is used with another argument that is a stack-local Spanor IsByRefLike type. This isto ensure the address of the local value doesnot escape its scope.
33

4-
test.fsx(306,13,306,86): typecheck errorFS3229: This value can't be assigned because the target 'param1' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto stack-bound memory escaping their scope.
4+
test.fsx(306,13,306,86): typecheck errorFS3230: This value can't be assigned because the target 'param1' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto stack-bound memory escaping their scope.
55

6-
test.fsx(309,13,309,62): typecheck errorFS3229: This value can't be assigned because the target 'param1' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto stack-bound memory escaping their scope.
6+
test.fsx(309,13,309,62): typecheck errorFS3230: This value can't be assigned because the target 'param1' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto stack-bound memory escaping their scope.
77

8-
test.fsx(348,13,348,57): typecheck errorFS3229: This value can't be assigned because the target 'addr' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto stack-bound memory escaping their scope.
8+
test.fsx(348,13,348,57): typecheck errorFS3230: This value can't be assigned because the target 'addr' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto stack-bound memory escaping their scope.
99

10-
test.fsx(351,13,351,38): typecheck errorFS3229: This value can't be assigned because the target 'param1' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto stack-bound memory escaping their scope.
10+
test.fsx(351,13,351,38): typecheck errorFS3230: This value can't be assigned because the target 'param1' may referto non-stack-local memory,while the expression being assigned is assessedto potentially referto stack-local memory. This isto help prevent pointersto 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 isto ensure the address of the local value doesnot 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 isto ensure the address of the local value doesnot escape its scope.
2727

28-
test2.fsx(128,13,128,42): typecheck errorFS3235: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
28+
test2.fsx(128,13,128,42): typecheck errorFS3237: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot 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 isto ensure the address of the local value doesnot 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 isto ensure the address of the local value doesnot escape its scope.
3333

34-
test2.fsx(140,13,140,52): typecheck errorFS3235: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
34+
test2.fsx(140,13,140,52): typecheck errorFS3237: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
3535

36-
test2.fsx(144,13,144,14): typecheck errorFS3234: The Spanor IsByRefLike variable 's' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
36+
test2.fsx(144,13,144,14): typecheck errorFS3236: The Spanor IsByRefLike variable 's' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
3737

38-
test2.fsx(149,13,149,52): typecheck errorFS3235: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
38+
test2.fsx(149,13,149,52): typecheck errorFS3237: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
3939

40-
test2.fsx(153,21,153,84): typecheck errorFS3233: The functionor method call cannot be used at this point, because one argument that is a byref of a non-stack-local Spanor IsByRefLike type is used with another argument that is a stack-local Spanor IsByRefLike type. This isto ensure the address of the local value doesnot escape its scope.
40+
test2.fsx(153,21,153,84): typecheck errorFS3235: The functionor method call cannot be used at this point, because one argument that is a byref of a non-stack-local Spanor IsByRefLike type is used with another argument that is a stack-local Spanor IsByRefLike type. This isto ensure the address of the local value doesnot escape its scope.
4141

42-
test2.fsx(154,13,154,14): typecheck errorFS3234: The Spanor IsByRefLike variable 'y' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
42+
test2.fsx(154,13,154,14): typecheck errorFS3236: The Spanor IsByRefLike variable 'y' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
4343

44-
test2.fsx(158,13,158,83): typecheck errorFS3235: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
44+
test2.fsx(158,13,158,83): typecheck errorFS3237: A Spanor IsByRefLike value returned from the expression cannot be used at ths point. This isto ensure the address of the local value doesnot escape its scope.
4545

46-
test2.fsx(163,13,163,14): typecheck errorFS3234: The Spanor IsByRefLike variable 'y' cannot be used at this point. This isto ensure the address of the local value doesnot escape its scope.
46+
test2.fsx(163,13,163,14): typecheck errorFS3236: The Spanor IsByRefLike variable 'y' cannot be used at this point. This isto ensure the address of the local value doesnot 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 isto ensure the address of the local value doesnot escape its scope.
4949

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp