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

Commit49a323a

Browse files
authored
Merge pull requestdotnet#4554 from Microsoft/merges/master-to-dev15.7
Merge master to dev15.7
2 parentsfeb6d4e +d7653dd commit49a323a

File tree

43 files changed

+19
-1570
lines changed

Some content is hidden

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

43 files changed

+19
-1570
lines changed

‎FSharp.Directory.Build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
<PropertyGroup>
1818
<!-- default NuGet package restore location-->
1919
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
20-
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
21-
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot>
20+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot>
2221
<!-- ensure there is a trailing slash-->
2322
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
2423
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>

‎build.cmd‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
652652
)
653653
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
654654
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
655-
setNUGET_PACKAGES=%~dp0Packages
655+
setNUGET_PACKAGES=%~dp0packages
656656
setpath=%~dp0Tools\dotnet20\;%path%
657657

658658
echo ----------- Done with package restore, starting dependency uptake check -------------
@@ -963,6 +963,7 @@ set HOSTED_COMPILER=1
963963

964964
if"%TEST_NET40_FSHARPQA_SUITE%"=="1" (
965965

966+
setCSC_PIPE=%~dp0packages\Microsoft.Net.Compilers.2.7.0\tools\csc.exe
966967
setFSC=!FSCBINPATH!\fsc.exe
967968
setFSCOREDLLPATH=!FSCBinPath!\FSharp.Core.dll
968969
setPATH=!FSCBINPATH!;!PATH!

‎src/fsharp/NicePrint.fs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1970,7 +1970,6 @@ let isGeneratedExceptionField pos f = TastDefinitionPrinting.isGeneratedExce
19701970
letstringOfTyparConstraint denv tpc= stringOfTyparConstraints denv[tpc]
19711971
letstringOfTy denv x= x|> PrintTypes.layoutType denv|> showL
19721972
letprettyLayoutOfType denv x= x|> PrintTypes.prettyLayoutOfType denv
1973-
letprettyLayoutOfTypeNoCx denv x= x|> PrintTypes.prettyLayoutOfTypeNoConstraints denv
19741973
letprettyStringOfTy denv x= x|> PrintTypes.prettyLayoutOfType denv|> showL
19751974
letprettyStringOfTyNoCx denv x= x|> PrintTypes.prettyLayoutOfTypeNoConstraints denv|> showL
19761975
letstringOfRecdField denv x= x|> TastDefinitionPrinting.layoutRecdFieldfalse denv|> showL

‎src/fsharp/service/service.fs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -908,9 +908,6 @@ type TypeCheckInfo
908908
match itemwith
909909
| Item.Types_| Item.ModuleOrNamespaces_->true
910910
|_->false
911-
912-
/// Find the most precise display context for the given line and column.
913-
member__.GetBestDisplayEnvForPos cursorPos= GetBestEnvForPos cursorPos
914911

915912
member__.GetVisibleNamespacesAndModulesAtPosition(cursorPos:pos):ModuleOrNamespaceRef list=
916913
let(nenv,ad),m= GetBestEnvForPos cursorPos
@@ -1985,7 +1982,6 @@ type FSharpCheckFileResults(filename: string, errors: FSharpErrorInfo[], scopeOp
19851982
|_->
19861983
async.Return dflt
19871984

1988-
19891985
memberinfo.GetToolTipText(line,colAtEndOfNames,lineStr,names,tokenTag,userOpName)=
19901986
info.GetStructuredToolTipText(line, colAtEndOfNames, lineStr, names, tokenTag, ?userOpName=userOpName)
19911987
|> Tooltips.Map Tooltips.ToFSharpToolTipText
@@ -2097,13 +2093,6 @@ type FSharpCheckFileResults(filename: string, errors: FSharpErrorInfo[], scopeOp
20972093
RequireCompilationThread ctok
20982094
scope.IsRelativeNameResolvableFromSymbol(pos, plid, symbol))
20992095

2100-
memberinfo.GetDisplayEnvForPos(pos:pos):Async<DisplayEnvoption>=
2101-
letuserOpName="CodeLens"
2102-
reactorOp userOpName"GetDisplayContextAtPos" None(fun ctok scope->
2103-
DoesNotRequireCompilerThreadTokenAndCouldPossiblyBeMadeConcurrent ctok
2104-
let(nenv,_),_= scope.GetBestDisplayEnvForPos pos
2105-
Some nenv.DisplayEnv)
2106-
21072096
memberinfo.ImplementationFiles=
21082097
ifnot keepAssemblyContentsthen invalidOp"The 'keepAssemblyContents' flag must be set to true on the FSharpChecker in order to access the checked contents of assemblies"
21092098
scopeOptX

‎src/fsharp/service/service.fsi‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,6 @@ type public FSharpCheckFileResults =
242242

243243
member internal GetVisibleNamespacesAndModulesAtPoint: pos-> Async<Tast.ModuleOrNamespaceRef[]>
244244

245-
/// Find the most precise display environment for the given line and column.
246-
member internal GetDisplayEnvForPos: pos: pos-> Async<DisplayEnv option>
247-
248245
/// Determines if a long ident is resolvable at a specific point.
249246
///<param name="userOpName">An optional string usedfor tracing compiler operations associatedwith this request.</param>
250247
memberinternalIsRelativeNameResolvable:cursorPos:pos* plid: string list* item: Item* ?userOpName: string-> Async<bool>

‎src/fsharp/symbols/Symbols.fs‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,23 +1844,6 @@ and FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) =
18441844
prefix+ x.LogicalName
18451845
with_->"??"
18461846

1847-
memberx.FormatLayout(denv:FSharpDisplayContext)=
1848-
match x.IsMember, dwith
1849-
|true, V v->
1850-
NicePrint.prettyLayoutOfValOrMemberNoInst{(denv.Contents cenv.g)with showMemberContainers=true} v.Deref
1851-
|_,_->
1852-
checkIsResolved()
1853-
letty=
1854-
match dwith
1855-
| E e-> e.GetDelegateType(cenv.amap, range0)
1856-
| P p-> p.GetPropertyType(cenv.amap, range0)
1857-
| M m| C m->
1858-
letrty= m.GetFSharpReturnTy(cenv.amap, range0, m.FormalMethodInst)
1859-
letargtysl= m.GetParamTypes(cenv.amap, range0, m.FormalMethodInst)
1860-
mkIteratedFunTy(List.map(mkRefTupledTy cenv.g) argtysl) rty
1861-
| V v-> v.TauType
1862-
NicePrint.prettyLayoutOfTypeNoCx(denv.Contents cenv.g) ty
1863-
18641847

18651848
andFSharpType(cenv,typ:TType)=
18661849

@@ -2006,11 +1989,7 @@ and FSharpType(cenv, typ:TType) =
20061989

20071990
memberx.Format(denv:FSharpDisplayContext)=
20081991
protect<|fun()->
2009-
NicePrint.prettyStringOfTyNoCx(denv.Contents cenv.g) typ
2010-
2011-
memberx.FormatLayout(denv:FSharpDisplayContext)=
2012-
protect<|fun()->
2013-
NicePrint.prettyLayoutOfTypeNoCx(denv.Contents cenv.g) typ
1992+
NicePrint.prettyStringOfTyNoCx(denv.Contents cenv.g) typ
20141993

20151994
overridex.ToString()=
20161995
protect<|fun()->

‎src/fsharp/symbols/Symbols.fsi‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -819,9 +819,6 @@ and [<Class>] public FSharpMemberOrFunctionOrValue =
819819

820820
/// Indicates if this is a constructor.
821821
memberIsConstructor:bool
822-
823-
/// Format the type using the rules of the given display context
824-
memberFormatLayout:context:FSharpDisplayContext->Layout
825822

826823

827824
/// A subtype of FSharpSymbol that represents a parameter
@@ -934,9 +931,6 @@ and [<Class>] public FSharpType =
934931
/// Format the type using the rules of the given display context
935932
memberFormat:context:FSharpDisplayContext->string
936933

937-
/// Format the type using the rules of the given display context
938-
memberFormatLayout:context:FSharpDisplayContext->Layout
939-
940934
/// Instantiate generic type parameters in a type
941935
memberInstantiate:(FSharpGenericParameter* FSharpType)list->FSharpType
942936

‎tests/fsharp/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="Microsoft.Net.Compilers"version="2.4.0" />
3+
<packageid="Microsoft.Net.Compilers"version="2.7.0" />
44
<packageid="NUnit3TestAdapter"version="3.7.0"targetFramework="net45" />
55
<packageid="runtime.win-x64.Microsoft.NETCore.ILDAsm"version="2.0.3" />
66
<packageid="runtime.win-x86.Microsoft.NETCore.ILDAsm"version="2.0.3" />

‎tests/fsharp/test-framework.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ let config configurationName envVars =
155155
letfsi_flags="-r:System.Core.dll --nowarn:20 --define:INTERACTIVE --maxerrors:1 --abortonerror"
156156
letIs64BitOperatingSystem= WindowsPlatform.Is64BitOperatingSystem envVars
157157
letarchitectureMoniker=if Is64BitOperatingSystemthen"x64"else"x86"
158-
letCSC= requireFile(packagesDir++"Microsoft.Net.Compilers.2.4.0"++"tools"++"csc.exe")
158+
letCSC= requireFile(packagesDir++"Microsoft.Net.Compilers.2.7.0"++"tools"++"csc.exe")
159159
letILDASM= requireFile(packagesDir++("runtime.win-"+ architectureMoniker+".Microsoft.NETCore.ILDAsm.2.0.3")++"runtimes"++("win-"+ architectureMoniker)++"native"++"ildasm.exe")
160160
letcoreclrdll= requireFile(packagesDir++("runtime.win-"+ architectureMoniker+".Microsoft.NETCore.Runtime.CoreCLR.2.0.3")++"runtimes"++("win-"+ architectureMoniker)++"native"++"coreclr.dll")
161161
letPEVERIFY= requireFile(SCRIPT_ROOT++".."++"fsharpqa"++"testenv"++"src"++"PEVerify"++"bin"++ configurationName++"net46"++"PEVerify.exe")

‎tests/fsharpqa/Source/Import/AccessibilityTests.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ public class Accessibility
1010
privateintPrivate{get;set;}
1111
protectedintProtected{get;set;}
1212
internalintInternal{get;set;}
13-
// Note: accessibility was modified using dnspy
14-
publicintFamOrAssembly{get;set;}
15-
// Note: accessibility was modified using dnspy
16-
publicintFamAndAssembly{get;set;}
13+
protectedinternalintFamOrAssembly{get;set;}
14+
privateprotectedintFamAndAssembly{get;set;}
1715
}
1816

0 commit comments

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