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

Commitcc1b137

Browse files
brettfoKevinRansom
authored andcommitted
Merge master into vs2017-rtm (#3458)
* Document project options and mark lots of things as deprecated (#3449)* Document project options and mark lots of things as deprecated* delete some code that is no longer used* fix packaging of FSharp.Core. (#3452)* implement IDisposable interfaces explicitly (#3447)* added IDisposable* reverted Dispose change* ngen open source install (#3456)* handle "Blue (high contrast)" theme (#3443)
1 parentf41a9a8 commitcc1b137

File tree

58 files changed

+585
-643
lines changed

Some content is hidden

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

58 files changed

+585
-643
lines changed

‎src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
<projectUrl>$projectUrl$</projectUrl>
2626
<tags>$tags$</tags>
2727
<dependencies>
28+
<grouptargetFramework="net20">
29+
</group>
30+
<grouptargetFramework="net40">
31+
</group>
32+
<grouptargetFramework="net45">
33+
</group>
2834
<grouptargetFramework=".NETStandard1.6">
2935
<dependencyid="System.Collections"version="4.0.11" />
3036
<dependencyid="System.Console"version="4.0.0" />
@@ -50,6 +56,18 @@
5056
<dependencyid="System.Threading.ThreadPool"version="4.0.10" />
5157
<dependencyid="System.Threading.Timer"version="4.0.1" />
5258
</group>
59+
<grouptargetFramework="portable-net45+monoandroid10+monotouch10+xamarinios10">
60+
</group>
61+
<grouptargetFramework="portable-net45+netcore45">
62+
</group>
63+
<grouptargetFramework="portable-net45+netcore45+wp8">
64+
</group>
65+
<grouptargetFramework="portable-net45+netcore45+wpa81+wp8">
66+
</group>
67+
<grouptargetFramework="portable-net45+sl5+netcore45">
68+
</group>
69+
<grouptargetFramework="xamarinmac20">
70+
</group>
5371
</dependencies>
5472
</metadata>
5573
<files>

‎src/fsharp/FSharp.Core.nuget/FSharp.Core.4.2.xxx.nuspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
<dependencyid="System.Threading.ThreadPool"version="4.0.10" />
4545
<dependencyid="System.Threading.Timer"version="4.0.1" />
4646
</group>
47+
<grouptargetFramework="net45">
48+
</group>
4749
</dependencies>
4850
</metadata>
4951
<files>

‎src/fsharp/FSharp.Core/prim-types.fs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5260,10 +5260,11 @@ namespace Microsoft.FSharp.Core
52605260
state.Current
52615261

52625262
{new IEnumerator<'T>with
5263-
member__.Dispose()=()
5264-
52655263
member__.Current= current()
52665264

5265+
interface System.IDisposablewith
5266+
member__.Dispose()=()
5267+
52675268
interface IEnumeratorwith
52685269
member__.Current= box(current())
52695270

@@ -5317,9 +5318,11 @@ namespace Microsoft.FSharp.Core
53175318
derefValue
53185319

53195320
{new IEnumerator<'T>with
5320-
member__.Dispose()=()
53215321
member__.Current= current()
53225322

5323+
interface System.IDisposablewith
5324+
member__.Dispose()=()
5325+
53235326
interface IEnumeratorwith
53245327
member__.Current= box(current())
53255328
member__.Reset()= value:= n- LanguagePrimitives.GenericOne

‎src/fsharp/FSharp.Core/seq.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ namespace Microsoft.FSharp.Collections
406406
ifnot finishedthen disposeG g
407407

408408
// Internal type, used to optimize Enumerator/Generator chains
409-
typeLazyGeneratorWrappingEnumerator<'T>(e:System.Collections.Generic.IEnumerator<'T>)=
409+
typeLazyGeneratorWrappingEnumerator<'T>(e:IEnumerator<'T>)=
410410
memberg.Enumerator= e
411411
interface Generator<'T>with
412412
memberg.Apply=(fun()->
@@ -419,9 +419,9 @@ namespace Microsoft.FSharp.Collections
419419
letEnumerateFromGenerator(g:Generator<'T>)=
420420
match gwith
421421
|:? LazyGeneratorWrappingEnumerator<'T>as g-> g.Enumerator
422-
|_->(new EnumeratorWrappingLazyGenerator<_>(g):>System.Collections.Generic.IEnumerator<_>)
422+
|_->(new EnumeratorWrappingLazyGenerator<'T>(g):> IEnumerator<'T>)
423423

424-
letGenerateFromEnumerator(e:System.Collections.Generic.IEnumerator<'T>)=
424+
letGenerateFromEnumerator(e:IEnumerator<'T>)=
425425
match ewith
426426
|:? EnumeratorWrappingLazyGenerator<'T>as e-> e.Generator
427427
|_->(new LazyGeneratorWrappingEnumerator<'T>(e):> Generator<'T>)

‎src/fsharp/FSharp.Core/seqcore.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ namespace Microsoft.FSharp.Core.CompilerServices
395395
memberx.GetEnumerator()=(x.GetFreshEnumerator():> IEnumerator)
396396
interface IEnumerator<'T>with
397397
memberx.Current=if redirectthen redirectTo.LastGeneratedelse x.LastGenerated
398+
interface System.IDisposablewith
398399
memberx.Dispose()=if redirectthen redirectTo.Close()else x.Close()
399400
interface IEnumeratorwith
400401
memberx.Current= box(if redirectthen redirectTo.LastGeneratedelse x.LastGenerated)

‎src/fsharp/FSharp.Core/seqcore.fsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,4 @@ namespace Microsoft.FSharp.Core.CompilerServices
148148
interface IEnumerable
149149
interface IEnumerator<'T>
150150
interface IEnumerator
151+
interface IDisposable

‎vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Actions>
1616
<ActionType="Ngen"Path="fsiAnyCpu.exe" />
1717
<ActionType="Ngen"Path="fsi.exe" />
18-
<ActionType="Ngen"Path="FSharp.Compiler.Service.dll" />
18+
<ActionType="Ngen"Path="FSharp.Compiler.Private.dll" />
1919
<ActionType="Ngen"Path="FSharp.Compiler.Interactive.Settings.dll" />
2020
<ActionType="Ngen"Path="FSharp.Compiler.Server.Shared.dll" />
2121
<ActionType="Ngen"Path="FSharp.Core.dll" />

‎vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module internal ClassificationDefinitions =
6565
)=
6666

6767
let(|LightTheme|DarkTheme|UnknownTheme|)id=
68-
if id= KnownColorThemes.Light|| id= KnownColorThemes.Bluethen LightTheme
68+
if id= KnownColorThemes.Light|| id= KnownColorThemes.Blue|| id= Guids.blueHighContrastThemeIdthen LightTheme
6969
elif id= KnownColorThemes.Darkthen DarkTheme
7070
else UnknownTheme
7171

‎vsintegration/src/FSharp.Editor/Classification/ColorizationService.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type internal FSharpColorizationService
2121
[<ImportingConstructor>]
2222
(
2323
checkerProvider: FSharpCheckerProvider,
24-
projectInfoManager:ProjectInfoManager
24+
projectInfoManager:FSharpProjectOptionsManager
2525
)=
2626
static letuserOpName="SemanticColorization"
2727

‎vsintegration/src/FSharp.Editor/CodeFix/AddOpenCodeFixProvider.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type internal FSharpAddOpenCodeFixProvider
2222
[<ImportingConstructor>]
2323
(
2424
checkerProvider: FSharpCheckerProvider,
25-
projectInfoManager:ProjectInfoManager,
25+
projectInfoManager:FSharpProjectOptionsManager,
2626
assemblyContentProvider: AssemblyContentProvider
2727
)=
2828
inherit CodeFixProvider()

0 commit comments

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