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

Commita3e5bb5

Browse files
authored
Merge pull requestdotnet#4687 from Microsoft/merges/master-to-dev15.8
Merge master to dev15.8
2 parents42c06b8 +203d4b3 commita3e5bb5

File tree

53 files changed

+528
-331
lines changed

Some content is hidden

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

53 files changed

+528
-331
lines changed

‎VisualFSharp.sln‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ EndProject
8383
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
8484
EndProject
8585
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="VisualFSharp","VisualFSharp","{4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}"
86+
ProjectSection(SolutionItems) =preProject
87+
vsintegration\readme.md=vsintegration\readme.md
88+
EndProjectSection
8689
EndProject
8790
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Compiler","Compiler","{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
8891
EndProject
@@ -138,7 +141,9 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Build.UnitTests", "t
138141
EndProject
139142
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="PEVerify","tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj","{B0689A4E-07D8-494D-A0C8-791CB1D74E54}"
140143
EndProject
141-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="PatternMatcher","vsintegration\src\PatternMatcher\PatternMatcher.csproj","{18227628-DF90-4C47-AF3D-CC72D2EDD986}"
144+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="FSharp.PatternMatcher","vsintegration\src\FSharp.PatternMatcher\FSharp.PatternMatcher.csproj","{18227628-DF90-4C47-AF3D-CC72D2EDD986}"
145+
EndProject
146+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Legacy","Legacy","{CCAB6E50-34C6-42AF-A6B0-567C29FCD91B}"
142147
EndProject
143148
Global
144149
GlobalSection(SolutionConfigurationPlatforms) =preSolution
@@ -576,9 +581,9 @@ Global
576581
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
577582
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
578583
{65E0E82A-EACE-4787-8994-888674C2FE87} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
579-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
584+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7} ={CCAB6E50-34C6-42AF-A6B0-567C29FCD91B}
580585
{FCFB214C-462E-42B3-91CA-FC557EFEE74F} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
581-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
586+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44} ={CCAB6E50-34C6-42AF-A6B0-567C29FCD91B}
582587
{C9B1D3F5-4971-4F04-9C26-37E3AC809AB4} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
583588
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7} ={F7876C9B-FB6A-4EFB-B058-D6967DB75FB2}
584589
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F} ={F7876C9B-FB6A-4EFB-B058-D6967DB75FB2}
@@ -628,6 +633,7 @@ Global
628633
{400FAB03-786E-40CC-85A8-04B0C2869B14} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
629634
{B0689A4E-07D8-494D-A0C8-791CB1D74E54} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
630635
{18227628-DF90-4C47-AF3D-CC72D2EDD986} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
636+
{CCAB6E50-34C6-42AF-A6B0-567C29FCD91B} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
631637
EndGlobalSection
632638
GlobalSection(ExtensibilityGlobals) =postSolution
633639
SolutionGuid ={48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

‎build.cmd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,9 @@ if not "%PB_PackageVersionPropsUrl%" == "" (
663663
:: restore dependencies
664664
%_nugetexe% restore!dependencyUptakeDir!\packages.config -PackagesDirectory packages -ConfigFile!dependencyUptakeDir!\NuGet.config
665665
ifERRORLEVEL1echo Error restoring dependency uptake packages&&goto :failure
666+
667+
:: set DotNetPackageVersionPropsPath
668+
setDotNetPackageVersionPropsPath=!dependencyUptakeDir!\PackageVersions.props
666669
)
667670

668671
echo ----------- Done with package restore, starting dependency uptake check -------------

‎build/config/AssemblySignToolData.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"net40\\bin\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
3333
"net40\\bin\\FSharp.ProjectSystem.FSharp.dll",
3434
"net40\\bin\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
35-
"net40\\bin\\PatternMatcher.dll",
35+
"net40\\bin\\FSharp.PatternMatcher.dll",
3636
"coreclr\\bin\\FSharp.Core.dll",
3737
"coreclr\\bin\\*\\FSharp.Core.resources.dll",
3838
"coreclr\\bin\\FSharp.Build.dll",

‎build/targets/PackageVersions.props‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
<MicrosoftVisualStudioComponentModelHostPackageVersion>15.0.26201-alpha</MicrosoftVisualStudioComponentModelHostPackageVersion>
2222
<MicrosoftVisualStudioDesignerInterfacesPackageVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesPackageVersion>
2323
<MicrosoftVisualStudioEditorPackageVersion>15.0.26201</MicrosoftVisualStudioEditorPackageVersion>
24-
<MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>15.0.26201</MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>
25-
<MicrosoftVisualStudioLanguageIntellisensePackageVersion>15.0.26201</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
24+
<MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>15.6.27740</MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>
25+
<MicrosoftVisualStudioLanguagePackageVersion>15.6.27740</MicrosoftVisualStudioLanguagePackageVersion>
26+
<MicrosoftVisualStudioLanguageIntellisensePackageVersion>15.6.27740</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
2627
<MicrosoftVisualStudioManagedInterfacesPackageVersion>8.0.50727</MicrosoftVisualStudioManagedInterfacesPackageVersion>
2728
<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
2829
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
@@ -35,6 +36,8 @@
3536
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
3637
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
3738
<MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30110</MicrosoftVisualStudioShellInterop120PackageVersion>
39+
<MicrosoftVisualStudioTextUIPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIPackageVersion>
40+
<MicrosoftVisualStudioTextUIWpfPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIWpfPackageVersion>
3841
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>
3942
<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>
4043
<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>
@@ -58,10 +61,6 @@
5861
</PropertyGroup>
5962

6063
<!-- dependency uptake version overrides-->
61-
<PropertyGroup>
62-
<DependencyUptakePackageVersionPropsFile>$(MSBuildThisFileDirectory)..\..\Tools\dependencyUptake\PackageVersions.props</DependencyUptakePackageVersionPropsFile>
63-
</PropertyGroup>
64-
65-
<ImportProject="$(DependencyUptakePackageVersionPropsFile)"Condition="Exists('$(DependencyUptakePackageVersionPropsFile)')" />
64+
<ImportProject="$(DotNetPackageVersionPropsPath)"Condition="'$(DotNetPackageVersionPropsPath)' != '' AND Exists('$(DotNetPackageVersionPropsPath)')" />
6665

6766
</Project>

‎src/fsharp/TypeChecker.fs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16307,7 +16307,11 @@ module TcDeclarations =
1630716307
(fun _binds -> [ (* no values are available yet *) ])
1630816308
cenv true scopem m
1630916309

16310-
let _ = TcMutRecSignatureDecls_Phase2 cenv scopem envMutRecPrelimWithReprs withEnvs
16310+
let mutRecDefnsAfterVals = TcMutRecSignatureDecls_Phase2 cenv scopem envMutRecPrelimWithReprs withEnvs
16311+
16312+
// Updates the types of the modules to contain the contents so far, which now includes values and members
16313+
MutRecBindingChecking.TcMutRecDefns_UpdateModuleContents mutRecNSInfo mutRecDefnsAfterVals
16314+
1631116315
envMutRec
1631216316

1631316317
//-------------------------------------------------------------------------

‎src/fsharp/service/ServiceParseTreeWalk.fs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,9 @@ module public AstTraversal =
312312
dive synExpr2 synExpr2.Range traverseSynExpr
313313
dive synExpr3 synExpr3.Range traverseSynExpr]
314314
|> pick expr
315-
| SynExpr.ForEach(_sequencePointInfoForForLoop,_seqExprOnly,_isFromSource,_synPat, synExpr, synExpr2,_range)->
316-
[dive synExpr synExpr.Range traverseSynExpr
315+
| SynExpr.ForEach(_sequencePointInfoForForLoop,_seqExprOnly,_isFromSource, synPat, synExpr, synExpr2,_range)->
316+
[dive synPat synPat.Range traversePat
317+
dive synExpr synExpr.Range traverseSynExpr
317318
dive synExpr2 synExpr2.Range traverseSynExpr]
318319
|> pick expr
319320
| SynExpr.ArrayOrListOfSeqExpr(_, synExpr,_range)-> traverseSynExpr synExpr
@@ -434,8 +435,9 @@ module public AstTraversal =
434435
| SynExpr.ImplicitZero(_range)-> None
435436
| SynExpr.YieldOrReturn(_, synExpr,_range)-> traverseSynExpr synExpr
436437
| SynExpr.YieldOrReturnFrom(_, synExpr,_range)-> traverseSynExpr synExpr
437-
| SynExpr.LetOrUseBang(_sequencePointInfoForBinding,_,_,_synPat, synExpr, synExpr2,_range)->
438-
[dive synExpr synExpr.Range traverseSynExpr
438+
| SynExpr.LetOrUseBang(_sequencePointInfoForBinding,_,_, synPat, synExpr, synExpr2,_range)->
439+
[dive synPat synPat.Range traversePat
440+
dive synExpr synExpr.Range traverseSynExpr
439441
dive synExpr2 synExpr2.Range traverseSynExpr]
440442
|> pick expr
441443
| SynExpr.DoBang(synExpr,_range)-> traverseSynExpr synExpr
@@ -598,13 +600,17 @@ module public AstTraversal =
598600
letpath= TraverseStep.MatchClause mc:: path
599601
letdefaultTraverse mc=
600602
match mcwith
601-
|(SynMatchClause.Clause(_synPat, synExprOption, synExpr,_range,_sequencePointInfoForTarget)as all)->
602-
[
603+
|(SynMatchClause.Clause(synPat, synExprOption, synExpr,_range,_sequencePointInfoForTarget)as all)->
604+
[dive synPat synPat.Range traversePat]
605+
@
606+
([
603607
match synExprOptionwith
604608
| None->()
605609
| Some guard->yield guard
606610
yield synExpr
607-
]|> List.map(fun x-> dive x x.Range(traverseSynExpr path))|> pick all.Range all
611+
]
612+
|> List.map(fun x-> dive x x.Range(traverseSynExpr path))
613+
)|> pick all.Range all
608614
visitor.VisitMatchClause(defaultTraverse,mc)
609615

610616
andtraverseSynBinding path b=

‎tests/fsharp/tests.fs‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1684,12 +1684,24 @@ module TypecheckTests =
16841684
#endif
16851685

16861686
#if!FSHARP_SUITE_DRIVES_CORECLR_TESTS
1687+
1688+
[<Test>]
1689+
let``sigs pos26``()=
1690+
letcfg= testConfig"typecheck/sigs"
1691+
fsc cfg"%s --target:exe -o:pos26.exe" cfg.fsc_flags["pos26.fsi";"pos26.fs"]
1692+
peverify cfg"pos26.exe"
1693+
1694+
[<Test>]
1695+
let``sigs pos25``()=
1696+
letcfg= testConfig"typecheck/sigs"
1697+
fsc cfg"%s --target:exe -o:pos25.exe" cfg.fsc_flags["pos25.fs"]
1698+
peverify cfg"pos25.exe"
1699+
16871700
[<Test>]
16881701
let``sigs pos27``()=
16891702
letcfg= testConfig"typecheck/sigs"
16901703
fsc cfg"%s --target:exe -o:pos27.exe" cfg.fsc_flags["pos27.fs"]
16911704
copy_y cfg(cfg.FSCBinPath++"System.ValueTuple.dll")("."++"System.ValueTuple.dll")
1692-
16931705
peverify cfg"pos27.exe"
16941706

16951707
[<Test>]
@@ -1699,16 +1711,10 @@ module TypecheckTests =
16991711
peverify cfg"pos28.exe"
17001712

17011713
[<Test>]
1702-
let``sigspos26``()=
1714+
let``sigspos29``()=
17031715
letcfg= testConfig"typecheck/sigs"
1704-
fsc cfg"%s --target:exe -o:pos26.exe" cfg.fsc_flags["pos26.fsi";"pos26.fs"]
1705-
peverify cfg"pos26.exe"
1706-
1707-
[<Test>]
1708-
let``sigs pos25``()=
1709-
letcfg= testConfig"typecheck/sigs"
1710-
fsc cfg"%s --target:exe -o:pos25.exe" cfg.fsc_flags["pos25.fs"]
1711-
peverify cfg"pos25.exe"
1716+
fsc cfg"%s --target:exe -o:pos29.exe" cfg.fsc_flags["pos29.fsi";"pos29.fs";"pos29.app.fs"]
1717+
peverify cfg"pos29.exe"
17121718

17131719
[<Test>]
17141720
let``sigs pos24``()=
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
modulerecPos29App
2+
3+
letv= Pos29.x
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
modulePos29
2+
3+
typeA= int
4+
letx=1
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
modulerecPos29
2+
3+
valx:A
4+
typeA= int

0 commit comments

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