Merge pull request #15512 from dotnet/merges/main-to-release/net8

Merge main to release/net8
dotnet · Jun 27, 2023 · 9bf50f7 · 9bf50f7
2 parents 635d129 + 6151b1f
commit 9bf50f7
Show file tree

Hide file tree

Showing 22 changed files with 389 additions and 233 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -28,5 +28,6 @@ targets.make text eol=lf
 *.sh text eol=lf
 
 *.bsl linguist-vendored=true
+*.xlf linguist-generated=true
 
 *.png binary
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -223,7 +223,7 @@ stages:
               regular:
                 _experimental_flag: ''
               experimental_features:
-                _experimental_flag: 1
+                _experimental_flag: ''
           steps:
           - checkout: self
             clean: true
@@ -513,7 +513,7 @@ stages:
               regular:
                 _experimental_flag: ''
               experimental_features:
-                _experimental_flag: 1
+                _experimental_flag: ''
           steps:
           - checkout: self
             clean: true

diff --git a/src/Compiler/Driver/GraphChecking/TypeCheckingGraphProcessing.fs b/src/Compiler/Driver/GraphChecking/TypeCheckingGraphProcessing.fs
diff --git a/src/Compiler/Driver/GraphChecking/TypeCheckingGraphProcessing.fsi b/src/Compiler/Driver/GraphChecking/TypeCheckingGraphProcessing.fsi
diff --git a/src/Compiler/Driver/GraphChecking/Types.fs b/src/Compiler/Driver/GraphChecking/Types.fs
@@ -167,4 +167,4 @@ type internal FilePairMap(files: FileInProject array) =
     member x.IsSignature(index: FileIndex) = Map.containsKey index sigToImpl
 
 /// Callback that returns a previously calculated 'Result and updates 'State accordingly.
-type internal Finisher<'State, 'Result> = delegate of 'State -> 'Result * 'State
+type internal Finisher<'Node, 'State, 'Result> = Finisher of node: 'Node * finisher: ('State -> 'Result * 'State)
diff --git a/src/Compiler/Driver/GraphChecking/Types.fsi b/src/Compiler/Driver/GraphChecking/Types.fsi
@@ -114,4 +114,4 @@ type internal FilePairMap =
     member IsSignature: index: FileIndex -> bool
 
 /// Callback that returns a previously calculated 'Result and updates 'State accordingly.
-type internal Finisher<'State, 'Result> = delegate of 'State -> 'Result * 'State
+type internal Finisher<'Node, 'State, 'Result> = Finisher of node: 'Node * finisher: ('State -> 'Result * 'State)