Merge branch 'main' into merges/release/dev17.5-to-main

Author: KevinRansom

azure-pipelines.yml

@@ -217,6 +217,13 @@ stages:
             name: $(DncEngPublicBuildPool)
             demands: ImageOverride -equals $(WindowsMachineQueueName)
           timeoutInMinutes: 90
+          strategy:
+            maxParallel: 2
+            matrix:
+              regular:
+                _experimental_flag: null
+              experimental_features:
+                _experimental_flag: 1
           steps:
           - checkout: self
             clean: true
@@ -229,6 +236,8 @@ stages:
               workingDirectory: $(Build.SourcesDirectory)
               installationPath: $(Build.SourcesDirectory)/.dotnet
           - script: .\eng\test-determinism.cmd -configuration Debug
+            env:
+              FSHARP_EXPERIMENTAL_FEATURES: $(_experimental_flag)
             displayName: Determinism tests with Debug configuration
           - task: PublishPipelineArtifact@1
             displayName: Publish Determinism Logs
@@ -280,64 +289,6 @@ stages:
         helixRepo: dotnet/fsharp
         jobs:
 
-        # Windows
-        - job: Windows
-          pool:
-            # The PR build definition sets this variable:
-            #   WindowsMachineQueueName=Windows.vs2022.amd64.open
-            # and there is an alternate build definition that sets this to a queue that is always scouting the
-            # next preview of Visual Studio.
-            name: $(DncEngPublicBuildPool)
-            demands: ImageOverride -equals $(WindowsMachineQueueName)
-          timeoutInMinutes: 120
-          strategy:
-            maxParallel: 4
-            matrix:
-              desktop_release:
-                _configuration: Release
-                _testKind: testDesktop
-              coreclr_release:
-                _configuration: Release
-                _testKind: testCoreclr
-              fsharpqa_release:
-                _configuration: Release
-                _testKind: testFSharpQA
-              vs_release:
-                _configuration: Release
-                _testKind: testVs
-          steps:
-          - checkout: self
-            clean: true
-          - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind)
-            displayName: Build / Test
-          - task: PublishTestResults@2
-            displayName: Publish Test Results
-            inputs:
-              testResultsFormat: 'NUnit'
-              testResultsFiles: '*.xml'
-              searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_configuration)'
-            continueOnError: true
-            condition: ne(variables['_testKind'], 'testFSharpQA')
-          - task: PublishBuildArtifacts@1
-            displayName: Publish Test Logs
-            inputs:
-              PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults\$(_configuration)'
-              ArtifactName: 'Windows $(_configuration) $(_testKind) test logs'
-              publishLocation: Container
-            continueOnError: true
-            condition: failed()
-          - script: dotnet build $(Build.SourcesDirectory)/eng/DumpPackageRoot/DumpPackageRoot.csproj
-            displayName: Dump NuGet cache contents
-            condition: failed()
-          - task: PublishBuildArtifacts@1
-            displayName: Publish NuGet cache contents
-            inputs:
-              PathtoPublish: '$(Build.SourcesDirectory)\artifacts\NugetPackageRootContents'
-              ArtifactName: 'NuGetPackageContents Windows $(_testKind)'
-              publishLocation: Container
-            continueOnError: true
-            condition: failed()
-
         # Windows With Compressed Metadata
         - job: WindowsCompressedMetadata
           pool:
@@ -492,11 +443,22 @@ stages:
           pool:
             name: $(DncEngPublicBuildPool)
             demands: ImageOverride -equals $(WindowsMachineQueueName)
+          strategy:
+            maxParallel: 2
+            matrix:
+              regular:
+                _experimental_flag: null
+              experimental_features:
+                _experimental_flag: 1
           steps:
           - checkout: self
             clean: true
           - script: .\Build.cmd -c Release -pack
+            env:
+              FSHARP_EXPERIMENTAL_FEATURES: $(_experimental_flag)
           - script: .\tests\EndToEndBuildTests\EndToEndBuildTests.cmd -c Release
+            env:
+              FSHARP_EXPERIMENTAL_FEATURES: $(_experimental_flag)
             displayName: End to end build tests
 
         # Up-to-date - disabled due to it being flaky
@@ -512,35 +474,8 @@ stages:
         #      filePath: eng\tests\UpToDate.ps1
         #      arguments: -configuration $(_BuildConfig) -ci -binaryLog
 
-        # Run Build with --test:ParallelCheckingWithSignatureFilesOn
-        - job: ParallelCheckingWithSignatureFiles
-          condition: eq(variables['Build.Reason'], 'PullRequest')
-          variables:
-            - name: _SignType
-              value: Test
-          pool:
-            name: $(DncEngPublicBuildPool)
-            demands: ImageOverride -equals $(WindowsMachineQueueName)
-          timeoutInMinutes: 90
-          steps:
-            - checkout: self
-              clean: true
-            - task: UseDotNet@2
-              displayName: install SDK
-              inputs:
-                packageType: sdk
-                useGlobalJson: true
-                includePreviewVersions: false
-                workingDirectory: $(Build.SourcesDirectory)
-                installationPath: $(Build.SourcesDirectory)/.dotnet
-            - script: .\build.cmd -c Release -binaryLog /p:ParallelCheckingWithSignatureFilesOn=true
-              displayName: ParallelCheckingWithSignatureFiles build with Debug configuration
-            - task: PublishPipelineArtifact@1
-              displayName: Publish ParallelCheckingWithSignatureFiles Logs
-              inputs:
-                targetPath: '$(Build.SourcesDirectory)/artifacts/log/Release'
-                artifactName: 'ParallelCheckingWithSignatureFiles Attempt $(System.JobAttempt) Logs'
-              continueOnError: true
+        # Run Build with Fsharp Experimental Features
+        # Possible change: --times:$(Build.SourcesDirectory)/artifacts/log/Release/compiler_timing.csv
 
         # Plain build Windows
         - job: Plain_Build_Windows

buildtools/fslex/Arg.fs

@@ -1,11 +1,6 @@
 // (c) Microsoft Corporation 2005-2009. 
 
-#if INTERNALIZED_FSLEXYACC_RUNTIME
-namespace Internal.Utilities
-#else
-namespace Microsoft.FSharp.Text
-#endif
-
+namespace FSharp.Text
 
 type ArgType = 
   | ClearArg of bool ref
@@ -35,38 +30,38 @@ exception HelpText of string
 [<Sealed>]
 type ArgParser() = 
     static let getUsage specs u =  
-      let sbuf = new System.Text.StringBuilder 100  
+      let sbuf = System.Text.StringBuilder 100  
       let pstring (s:string) = sbuf.Append s |> ignore 
       let pendline s = pstring s; pstring "\n" 
       pendline u;
       List.iter (fun (arg:ArgInfo) -> 
         match arg.Name, arg.ArgType, arg.HelpText with
-        | (s, (UnitArg _ | SetArg _ | ClearArg _), helpText) -> pstring "\t"; pstring s; pstring ": "; pendline helpText
-        | (s, StringArg _, helpText) -> pstring "\t"; pstring s; pstring " <string>: "; pendline helpText
-        | (s, IntArg _, helpText) -> pstring "\t"; pstring s; pstring " <int>: "; pendline helpText
-        | (s, FloatArg _, helpText) ->  pstring "\t"; pstring s; pstring " <float>: "; pendline helpText
-        | (s, RestArg _, helpText) -> pstring "\t"; pstring s; pstring " ...: "; pendline helpText)
+        | s, (UnitArg _ | SetArg _ | ClearArg _), helpText -> pstring "\t"; pstring s; pstring ": "; pendline helpText
+        | s, StringArg _, helpText -> pstring "\t"; pstring s; pstring " <string>: "; pendline helpText
+        | s, IntArg _, helpText -> pstring "\t"; pstring s; pstring " <int>: "; pendline helpText
+        | s, FloatArg _, helpText ->  pstring "\t"; pstring s; pstring " <float>: "; pendline helpText
+        | s, RestArg _, helpText -> pstring "\t"; pstring s; pstring " ...: "; pendline helpText)
         specs;
       pstring "\t"; pstring "--help"; pstring ": "; pendline "display this list of options";
       pstring "\t"; pstring "-help"; pstring ": "; pendline "display this list of options";
       sbuf.ToString()
 
 
     static member ParsePartial(cursor,argv,arguments:seq<ArgInfo>,?otherArgs,?usageText) =
-        let otherArgs = defaultArg otherArgs (fun _ -> ())
+        let other = defaultArg otherArgs (fun _ -> ())
         let usageText = defaultArg usageText ""
         let nargs = Array.length argv 
         incr cursor;
-        let arguments = arguments |> Seq.toList
-        let specs = arguments |> List.map (fun (arg:ArgInfo) -> arg.Name, arg.ArgType)
+        let argSpecs = arguments |> Seq.toList
+        let specs = argSpecs |> List.map (fun (arg:ArgInfo) -> arg.Name, arg.ArgType)
         while !cursor < nargs do
           let arg = argv.[!cursor] 
           let rec findMatchingArg args = 
             match args with
-            | ((s, action) :: _) when s = arg -> 
+            | (s, action) :: _ when s = arg -> 
                let getSecondArg () = 
                    if !cursor + 1 >= nargs then 
-                     raise(Bad("option "+s+" needs an argument.\n"+getUsage arguments usageText));
+                     raise(Bad("option "+s+" needs an argument.\n"+getUsage argSpecs usageText));
                    argv.[!cursor+1] 
 
                match action with 
@@ -85,40 +80,40 @@ type ArgParser() =
                  cursor := !cursor + 2
                | IntArg f -> 
                  let arg2 = getSecondArg () 
-                 let arg2 = try int32 arg2 with _ -> raise(Bad(getUsage arguments usageText)) in  
+                 let arg2 = try int32 arg2 with _ -> raise(Bad(getUsage argSpecs usageText)) in  
                  f arg2;
                  cursor := !cursor + 2;
                | FloatArg f -> 
                  let arg2 = getSecondArg() 
-                 let arg2 = try float arg2 with _ -> raise(Bad(getUsage arguments usageText)) in 
+                 let arg2 = try float arg2 with _ -> raise(Bad(getUsage argSpecs usageText)) in 
                  f arg2; 
                  cursor := !cursor + 2;
                | RestArg f -> 
                  incr cursor;
                  while !cursor < nargs do
-                     f (argv.[!cursor]);
+                     f argv.[!cursor];
                      incr cursor;
 
-            | (_ :: more)  -> findMatchingArg more 
+            | _ :: more  -> findMatchingArg more 
             | [] -> 
                 if arg = "-help" || arg = "--help" || arg = "/help" || arg = "/help" || arg = "/?" then
-                    raise (HelpText (getUsage arguments usageText))
+                    raise (HelpText (getUsage argSpecs usageText))
                 // Note: for '/abc/def' does not count as an argument
                 // Note: '/abc' does
-                elif arg.Length>0 && (arg.[0] = '-' || (arg.[0] = '/' && not (arg.Length > 1 && arg.[1..].Contains ("/")))) then
-                    raise (Bad ("unrecognized argument: "+ arg + "\n" + getUsage arguments usageText))
+                elif arg.Length>0 && (arg.[0] = '-' || (arg.[0] = '/' && not (arg.Length > 1 && arg.[1..].Contains "/"))) then
+                    raise (Bad ("unrecognized argument: "+ arg + "\n" + getUsage argSpecs usageText))
                 else 
-                   otherArgs arg;
+                   other arg;
                    incr cursor
           findMatchingArg specs 
 
-    static member Usage (arguments,?usage) = 
+    static member Usage (arguments, ?usage) = 
         let usage = defaultArg usage ""
         System.Console.Error.WriteLine (getUsage (Seq.toList arguments) usage)
 
     #if FX_NO_COMMAND_LINE_ARGS
     #else
-    static member Parse (arguments,?otherArgs,?usageText) = 
+    static member Parse (arguments, ?otherArgs,?usageText) = 
         let current = ref 0
         let argv = System.Environment.GetCommandLineArgs() 
         try ArgParser.ParsePartial (current, argv, arguments, ?otherArgs=otherArgs, ?usageText=usageText)
@@ -128,6 +123,6 @@ type ArgParser() =
               System.Console.Error.WriteLine h; 
               System.Console.Error.Flush();  
               System.Environment.Exit(1); 
-          | e -> 
+          | _ -> 
               reraise()
     #endif

buildtools/fslex/Arg.fsi

@@ -1,11 +1,7 @@
 // (c) Microsoft Corporation 2005-2009. 
 
 /// A simple command-line argument processor.
-#if INTERNALIZED_FSLEXYACC_RUNTIME
-namespace Internal.Utilities
-#else
-namespace Microsoft.FSharp.Text
-#endif
+namespace FSharp.Text
 
 /// The spec value describes the action of the argument,
 /// and whether it expects a following parameter.
@@ -37,7 +33,7 @@ type ArgParser =
     [<System.Obsolete("This method should not be used directly as it will be removed in a future revision of this library")>]
     static member ParsePartial: cursor: int ref * argv: string[] * arguments:seq<ArgInfo> * ?otherArgs: (string -> unit) * ?usageText:string -> unit
 
-    /// Parse the arguments given by System.Environment.GetEnvironmentVariables()
+    /// Parse the arguments given by System.Environment.GetCommandLineArgs()
     /// according to the argument processing specifications "specs".
     /// Args begin with "-". Non-arguments are passed to "f" in
     /// order.  "use" is printed as part of the usage line if an error occurs.