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

Commite5c6c9e

Browse files
authored
Merge pull requestdotnet#4247 from Microsoft/master
merge master into 15.6
2 parents29eeaf9 +daf9b9e commite5c6c9e

File tree

95 files changed

+1609
-828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1609
-828
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
/packages
44
/Tools
55

6+
/tests/scripts/current
7+
/release
8+
/debug
9+
/Proto
10+
611
# Patches that may have been generated by scripts.
712
# (These aren't generally useful to commit directly; if anything, they should be applied.)
813
scripts/*.patch

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
4646
<CompileInclude="$(FSharpSourcesRoot)\..\tests\service\EditorTests.fs">
4747
<Link>EditorTests.fs</Link>
4848
</Compile>
49+
<CompileInclude="$(FSharpSourcesRoot)\..\tests\service\Symbols.fs">
50+
<Link>Symbols.fs</Link>
51+
</Compile>
4952
<CompileInclude="$(FSharpSourcesRoot)\..\tests\service\FileSystemTests.fs">
5053
<Link>FileSystemTests.fs</Link>
5154
</Compile>

‎fcs/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ which does things like:
6060
Yu can push the packages if you have permissions, either automatically using``build Release`` or manually
6161

6262
set APIKEY=...
63-
.nuget\nuget.exe push Release\FSharp.Compiler.Service.16.0.3.nupkg %APIKEY% -Source https://nuget.org
64-
.nuget\nuget.exe push Release\FSharp.Compiler.Service.MSBuild.v12.16.0.3.nupkg %APIKEY% -Source https://nuget.org
65-
.nuget\nuget.exe push Release\FSharp.Compiler.Service.ProjectCracker.16.0.3.nupkg %APIKEY% -Source https://nuget.org
63+
.nuget\nuget.exe push Release\FSharp.Compiler.Service.19.0.1.nupkg %APIKEY% -Source https://nuget.org
64+
.nuget\nuget.exe push Release\FSharp.Compiler.Service.MSBuild.v12.19.0.1.nupkg %APIKEY% -Source https://nuget.org
65+
.nuget\nuget.exe push Release\FSharp.Compiler.Service.ProjectCracker.19.0.1.nupkg %APIKEY% -Source https://nuget.org
6666

6767

6868
###Use of Paket and FAKE

‎fcs/RELEASE_NOTES.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
####19.0.1
2+
* Rename``LogicalEnclosingEntity`` to``ApparentEnclosingEntity`` for consistency int he F# codebase terminology.
3+
* Rename``EnclosingEntity`` to``DeclaringEntity``. In the case of extension properties,``EnclosingEntity`` was incorrectly returning the logical enclosing entity (i.e. the type the property appears to extend), and in this case``ApparentEnclosingEntity`` should be used instead.
4+
5+
####18.0.1
6+
* Integrate visualfsharp master
7+
8+
####17.0.2
9+
* Integrate visualfsharp master
10+
111
####16.0.3
212
*[File name deduplication not working with ParseAndCheckFileInProject](https://github.com/fsharp/FSharp.Compiler.Service/issues/819)
313

@@ -404,7 +414,7 @@
404414
* Return additional 'property' and 'event' methods for F#-defined types to regularize symbols (#108,#143)
405415
* Add IsPropertySetterMethod and IsPropertyGetterMethod which only return true for getter/setter methods, not properties. Deprecate IsSetterMethod and IsGetterMethod in favour of these.
406416
* Add IsEventAddMethod and IsEventRemoveMethod which return true for add/remove methods with an associated event
407-
* Change IsProperty and IsEvent to only return true for the symbols for properties and events, rather than the methodsassocaited with these
417+
* Change IsProperty and IsEvent to only return true for the symbols for properties and events, rather than the methodsassociated with these
408418
* Fix value of Assembly for some symbols (e.g. property symbols)
409419

410420
####0.0.45 -

‎fcs/docsrc/content/ja/symbols.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ fnVal.CurriedParameterGroups.[0].[0].Name // "x"
113113
fnVal.CurriedParameterGroups.[0].[1].Name// "y"
114114
fnVal.DeclarationLocation.StartLine// 3
115115
fnVal.DisplayName// "foo"
116-
fnVal.EnclosingEntity.DisplayName// "Test"
117-
fnVal.EnclosingEntity.DeclarationLocation.StartLine// 1
116+
fnVal.DeclaringEntity.DisplayName// "Test"
117+
fnVal.DeclaringEntity.DeclarationLocation.StartLine// 1
118118
fnVal.GenericParameters.Count// 0
119119
fnVal.InlineAnnotation// FSharpInlineAnnotation.OptionalInline
120120
fnVal.IsActivePattern// false

‎fcs/docsrc/content/symbols.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ fnVal.CurriedParameterGroups.[0].[0].Name // "x"
109109
fnVal.CurriedParameterGroups.[0].[1].Name// "y"
110110
fnVal.DeclarationLocation.StartLine// 3
111111
fnVal.DisplayName// "foo"
112-
fnVal.EnclosingEntity.DisplayName// "Test"
113-
fnVal.EnclosingEntity.DeclarationLocation.StartLine// 1
112+
fnVal.DeclaringEntity.DisplayName// "Test"
113+
fnVal.DeclaringEntity.DeclarationLocation.StartLine// 1
114114
fnVal.GenericParameters.Count// 0
115115
fnVal.InlineAnnotation// FSharpInlineAnnotation.OptionalInline
116116
fnVal.IsActivePattern// false

‎fcs/fcs.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
55

6-
<VersionPrefix>16.0.3</VersionPrefix>
6+
<VersionPrefix>19.0.1</VersionPrefix>
77
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build-->
88
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
99
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>

‎fcs/nuget/FSharp.Compiler.Service.MSBuild.v12.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<description>Adds legacy MSBuild 12.0 support to the F# compiler services package for resolving references such as #r "System, Version=4.1.0.0,..."</description>
66
<language>en-US</language>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
8-
<version>16.0.3</version>
8+
<version>19.0.1</version>
99
<authors>Microsoft Corporation and F# community contributors</authors>
1010
<licenseUrl>https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE</licenseUrl>
1111
<projectUrl>https://github.com/fsharp/FSharp.Compiler.Service</projectUrl>
@@ -14,7 +14,7 @@
1414
<summary>F# compiler services for creating IDE tools, language extensions and for F# embedding.</summary>
1515
<dependencies>
1616
<grouptargetFramework="net45">
17-
<dependencyid="FSharp.Compiler.Service"version="16.0.3" />
17+
<dependencyid="FSharp.Compiler.Service"version="19.0.1" />
1818
</group>
1919
</dependencies>
2020
</metadata>

‎fcs/nuget/FSharp.Compiler.Service.ProjectCracker.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<description>The F# compiler services package contains a custom build of the F# compiler that exposes additional functionality for implementing F# language bindings, additional tools based on the compiler or refactoring tools. The package also includes F# interactive service that can be used for embedding F# scripting into your applications.</description>
66
<language>en-US</language>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
8-
<version>16.0.3</version>
8+
<version>19.0.1</version>
99
<authors>Microsoft Corporation and F# community contributors</authors>
1010
<licenseUrl>https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE</licenseUrl>
1111
<projectUrl>https://github.com/fsharp/FSharp.Compiler.Service</projectUrl>
@@ -14,7 +14,7 @@
1414
<summary>F# compiler services for creating IDE tools, language extensions and for F# embedding.</summary>
1515
<dependencies>
1616
<grouptargetFramework="net45">
17-
<dependencyid="FSharp.Compiler.Service"version="16.0.3" />
17+
<dependencyid="FSharp.Compiler.Service"version="19.0.1" />
1818
</group>
1919
</dependencies>
2020
</metadata>

‎fcs/nuget/FSharp.Compiler.Service.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<description>The F# compiler services package contains a custom build of the F# compiler that exposes additional functionality for implementing F# language bindings, additional tools based on the compiler or refactoring tools. The package also includes F# interactive service that can be used for embedding F# scripting into your applications.</description>
66
<language>en-US</language>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
8-
<version>16.0.3</version>
8+
<version>19.0.1</version>
99
<authors>Microsoft Corporation and F# community contributors</authors>
1010
<licenseUrl>https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE</licenseUrl>
1111
<projectUrl>https://github.com/fsharp/FSharp.Compiler.Service</projectUrl>

0 commit comments

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