Merge branch 'main' into 12013-type-syntax-for-5d-6d-etc-arrays

Author: T-Gro

eng/Version.Details.xml

@@ -8,14 +8,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22473.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22477.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
+      <Sha>0213f8ad31ac8c63ad41760f02a929998abf69bb</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22473.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22477.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
+      <Sha>0213f8ad31ac8c63ad41760f02a929998abf69bb</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/templates/job/execute-sdl.yml

@@ -34,7 +34,7 @@ jobs:
 - job: Run_SDL
   dependsOn: ${{ parameters.dependsOn }}
   displayName: Run SDL tool
-  condition: eq( ${{ parameters.enable }}, 'true')
+  condition: and(succeededOrFailed(), eq( ${{ parameters.enable }}, 'true'))
   variables:
     - group: DotNet-VSTS-Bot
     - name: AzDOProjectName

eng/common/templates/post-build/post-build.yml

@@ -98,7 +98,7 @@ stages:
     jobs:
     - job:
       displayName: NuGet Validation
-      condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
+      condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true'))
       pool:
         # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
         ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -282,4 +282,4 @@ stages:
               -MaestroToken '$(MaestroApiAccessToken)'
               -WaitPublishingFinish true
               -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

global.json

@@ -18,7 +18,7 @@
     "perl": "5.32.1.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22473.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22473.1"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22477.1",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22477.1"
   }
 }

src/Compiler/Checking/AttributeChecking.fs

@@ -507,7 +507,8 @@ let CheckUnionCaseAttributes g (x:UnionCaseRef) m =
 /// Check the attributes on a record field, returning errors and warnings as data.
 let CheckRecdFieldAttributes g (x:RecdFieldRef) m =
     CheckEntityAttributes g x.TyconRef m ++ (fun () ->
-    CheckFSharpAttributes g x.PropertyAttribs m)
+    CheckFSharpAttributes g x.PropertyAttribs m) ++ (fun () ->
+    CheckFSharpAttributes g x.RecdField.FieldAttribs m)
 
 /// Check the attributes on an F# value, returning errors and warnings as data.
 let CheckValAttributes g (x:ValRef) m =

src/Compiler/Checking/CheckDeclarations.fs

@@ -545,6 +545,7 @@ module TcRecdUnionAndEnumDeclarations =
 
     let TcEnumDecl cenv env parent thisTy fieldTy (SynEnumCase(attributes=Attributes synAttrs; ident= SynIdent(id,_); value=v; xmlDoc=xmldoc; range=m)) =
         let attrs = TcAttributes cenv env AttributeTargets.Field synAttrs
+        
         match v with 
         | SynConst.Bytes _
         | SynConst.UInt16s _

src/Compiler/Checking/PatternMatchCompilation.fs

@@ -143,7 +143,6 @@ let GetSubExprOfInput g (gtps, tyargs, tinst) (SubExpr(accessf, (ve2, v2))) =
 // The ints record which choices taken, e.g. tuple/record fields.
 type Path =
     | PathQuery of Path * Unique
-    | PathConj of Path * int
     | PathTuple of Path * TypeInst * int
     | PathRecd of Path * TyconRef * TypeInst * int
     | PathUnionConstr of Path * UnionCaseRef * TypeInst * int
@@ -154,7 +153,6 @@ type Path =
 let rec pathEq p1 p2 =
     match p1, p2 with
     | PathQuery(p1, n1), PathQuery(p2, n2) -> (n1 = n2) && pathEq p1 p2
-    | PathConj(p1, n1), PathConj(p2, n2) -> (n1 = n2) && pathEq p1 p2
     | PathTuple(p1, _, n1), PathTuple(p2, _, n2) -> (n1 = n2) && pathEq p1 p2
     | PathRecd(p1, _, _, n1), PathRecd(p2, _, _, n2) -> (n1 = n2) && pathEq p1 p2
     | PathUnionConstr(p1, _, _, n1), PathUnionConstr(p2, _, _, n2) -> (n1 = n2) && pathEq p1 p2
@@ -203,8 +201,6 @@ let RefuteDiscrimSet g m path discrims =
     let rec go path tm =
         match path with
         | PathQuery _ -> raise CannotRefute
-        | PathConj (p, _j) ->
-            go p tm
         | PathTuple (p, tys, j) ->
             let k, eCoversVals = mkOneKnown tm j tys
             go p (fun _ -> mkRefTupled g m k tys, eCoversVals)
@@ -391,8 +387,6 @@ type Frontier = Frontier of ClauseNumber * Actives * ValMap<Expr>
 type InvestigationPoint = Investigation of ClauseNumber * DecisionTreeTest * Path
 
 // Note: actives must be a SortedDictionary
-// REVIEW: improve these data structures, though surprisingly these functions don't tend to show up
-// on profiling runs
 let rec isMemOfActives p1 actives =
     match actives with
     | [] -> false
@@ -1624,7 +1618,7 @@ let CompilePatternBasic
             subPats |> List.collect (fun subPat -> BindProjectionPattern (Active(inpPath, inpExpr, subPat)) activeState)
 
         | TPat_conjs(subPats, _m) ->
-            let newActives = List.mapi (mkSubActive (fun path j -> PathConj(path, j)) (fun _j -> inpAccess)) subPats
+            let newActives = List.mapi (mkSubActive (fun path _j -> path) (fun _j -> inpAccess)) subPats
             BindProjectionPatterns newActives activeState
 
         | TPat_range (c1, c2, m) ->

tests/FSharp.Compiler.ComponentTests/Language/ObsoleteAttributeCheckingTests.fs

@@ -206,9 +206,9 @@ C.Update()
         |> withDiagnostics [
             (Error 101, Line 9, Col 1, Line 9, Col 9, "This construct is deprecated. Use B instead")
         ]  
-        
+
     [<Fact>]
-    let ``Obsolete attribute is taken into account when used on an enum and invocation`` () =
+    let ``Obsolete attribute error is taken into account when used on an enum and invocation`` () =
         Fsx """
 open System
 
@@ -219,15 +219,14 @@ type Color =
     
 let c = Color.Red
         """
-        |> ignoreWarnings
         |> compile
         |> shouldFail
         |> withDiagnostics [
             (Error 101, Line 9, Col 9, Line 9, Col 14, "This construct is deprecated. Use B instead")
         ]
-        
+     
     [<Fact>]
-    let ``Obsolete attribute is taken into account when used on an enum entry and invocation`` () =
+    let ``Obsolete attribute error is taken into account when used on an enum field and invocation`` () =
         Fsx """
 open System
 
@@ -237,9 +236,28 @@ type Color =
     
 let c = Color.Red
         """
-        |> ignoreWarnings
         |> compile
-        |> shouldSucceed
+        |> shouldFail
+        |> withDiagnostics [
+            (Error 101, Line 8, Col 9, Line 8, Col 18, "This construct is deprecated. Use B instead")
+        ]
+
+    [<Fact>]
+    let ``Obsolete attribute warning is taken into account when used on an enum field and invocation`` () =
+        Fsx """
+open System
+
+type Color =
+    | [<Obsolete("Use B instead")>] Red = 0
+    | Green = 1
+    
+let c = Color.Red
+        """
+        |> compile
+        |> shouldFail
+        |> withDiagnostics [
+            (Warning 44, Line 8, Col 9, Line 8, Col 18, "This construct is deprecated. Use B instead")
+        ]
 
     [<Fact>]
     let ``Obsolete attribute is taken into account when used on an type and use extension method`` () =

tests/fsharp/tests.fs

@@ -2586,6 +2586,21 @@ module TypecheckTests =
         peverify cfg "pos40.exe"
         exec cfg ("." ++ "pos40.exe") ""
 
+    [<Test>]
+    let ``sigs pos1281`` () =
+        let cfg = testConfig "typecheck/sigs"
+        // This checks that warning 25 "incomplete matches" is not triggered
+        fsc cfg "%s --target:exe -o:pos1281.exe --warnaserror --nowarn:26" cfg.fsc_flags ["pos1281.fs"]
+        peverify cfg "pos1281.exe"
+        exec cfg ("." ++ "pos1281.exe") ""
+
+    [<Test>]
+    let ``sigs pos3294`` () =
+        let cfg = testConfig "typecheck/sigs"
+        fsc cfg "%s --target:exe -o:pos3294.exe --warnaserror" cfg.fsc_flags ["pos3294.fs"]
+        peverify cfg "pos3294.exe"
+        exec cfg ("." ++ "pos3294.exe") ""
+
     [<Test>]
     let ``sigs pos23`` () =
         let cfg = testConfig "typecheck/sigs"

tests/fsharp/typecheck/sigs/pos1281.fs

@@ -0,0 +1,17 @@
+module Pos1281
+
+type Cond = Foo | Bar | Baz
+let (|SetV|) x _ = x
+
+let c = Cond.Foo
+
+match c with
+| Baz -> 
+    printfn "Baz"
+| Foo & SetV "and" kwd
+| Bar & SetV "or" kwd ->
+    printfn "Keyword: %s" kwd
+| Baz -> failwith "wat"
+
+printfn "test completed"
+exit 0