Merge pull request #18470 from dotnet/merge/main-to-release/dev18.0

[automated] Merge branch 'main' => 'release/dev18.0'

Author: T-Gro

DEVGUIDE.md

@@ -252,6 +252,15 @@ For example:
 module TimeCritical =
 ```
 
+For stress testing async code you can use a custom `FSharp.Test.StressAttribute`.
+For example, applied to a single xUnit test case:
+```fsharp
+[<Theory; Stress(Count = 1000)>]
+```
+it will start it many times at the same time, and execute in parallel.
+
+
+
 
 ### Updating FCS surface area baselines
 

NuGet.config

@@ -8,7 +8,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-8e42d4a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8e42d4a4/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-7a09d5e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7a09d5ee/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

eng/Build.ps1

@@ -615,7 +615,8 @@ try {
 
     if ($testDesktop -and $ci) {
         $bgJob = TestUsingMSBuild -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharpSuite.Tests\" -asBackgroundJob $true
-
+        
+        TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Test.Utilities\"
         TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\"
         TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
         TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework  -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Private.Scripting.UnitTests\"

eng/Version.Details.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25204.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25209.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>643689c88b1d5a0f1561383972c4189a0c673abe</Sha>
+      <Sha>7dbf5deea5bdccf513df73cba179c4c0ad106010</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.23-preview-25208-06">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.24-preview-25209-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>8e42d4a440e0f85c1e8dce43767e7a50d86aa8ff</Sha>
+      <Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.13.23">
+    <Dependency Name="Microsoft.Build" Version="17.13.24">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>8e42d4a440e0f85c1e8dce43767e7a50d86aa8ff</Sha>
+      <Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Framework" Version="17.13.23">
+    <Dependency Name="Microsoft.Build.Framework" Version="17.13.24">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>8e42d4a440e0f85c1e8dce43767e7a50d86aa8ff</Sha>
+      <Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.13.23">
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.13.24">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>8e42d4a440e0f85c1e8dce43767e7a50d86aa8ff</Sha>
+      <Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.13.23">
+    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.13.24">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>8e42d4a440e0f85c1e8dce43767e7a50d86aa8ff</Sha>
+      <Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.Metadata" Version="8.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -102,7 +102,7 @@
     <MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
     <VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
     <MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
-    <MicrosoftBuildVersion>17.13.23</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion>17.13.24</MicrosoftBuildVersion>
     <!-- Roslyn packages -->
     <MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
     <MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
@@ -138,9 +138,9 @@
     <MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
     <!-- -->
     <!-- Microsoft Build packages -->
-    <MicrosoftBuildFrameworkVersion>17.13.23</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildTasksCoreVersion>17.13.23</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>17.13.23</MicrosoftBuildUtilitiesCoreVersion>
+    <MicrosoftBuildFrameworkVersion>17.13.24</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildTasksCoreVersion>17.13.24</MicrosoftBuildTasksCoreVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>17.13.24</MicrosoftBuildUtilitiesCoreVersion>
     <!-- -->
     <!-- Visual Studio Editor packages -->
     <MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>

eng/build.sh

@@ -331,6 +331,7 @@ BuildSolution
 
 if [[ "$test_core_clr" == true ]]; then
   coreclrtestframework=$tfm
+  Test --testproject "$repo_root/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj" --targetframework $coreclrtestframework
   Test --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework
   Test --testproject "$repo_root/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" --targetframework $coreclrtestframework
   Test --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework

src/Compiler/TypedTree/TypedTreePickle.fs

@@ -135,6 +135,14 @@ type NodeOutTable<'Data, 'Node> =
             Table = Table<_>.Create nm
         }
 
+// Small glossary for future generations:
+// o... - output
+// i... - input
+// os - output stream
+// is - input stream
+// tab - table
+// osgn - output stream graph nodes
+
 [<NoEquality; NoComparison>]
 type WriterState =
     {
@@ -1937,7 +1945,7 @@ let u_tcref st =
     match tag with
     | 0 -> u_local_item_ref st.ientities st |> ERefLocal
     | 1 -> u_nleref st |> ERefNonLocal
-    | _ -> ufailwith st "u_item_ref"
+    | _ -> ufailwith st "u_tcref"
 
 let u_ucref st =
     let a, b = u_tup2 u_tcref u_string st
@@ -2027,7 +2035,7 @@ let u_vref st =
     match tag with
     | 0 -> u_local_item_ref st.ivals st |> VRefLocal
     | 1 -> u_nonlocal_val_ref st |> VRefNonLocal
-    | _ -> ufailwith st "u_item_ref"
+    | _ -> ufailwith st "u_vref"
 
 let u_vrefs = u_list u_vref
 
@@ -3206,7 +3214,7 @@ and u_parentref st =
     match tag with
     | 0 -> ParentNone
     | 1 -> u_tcref st |> Parent
-    | _ -> ufailwith st "u_attribkind"
+    | _ -> ufailwith st "u_parentref"
 
 and u_attribkind st =
     let tag = u_byte st
@@ -3496,7 +3504,7 @@ and u_lval_op_kind st =
     | 1 -> LByrefGet
     | 2 -> LSet
     | 3 -> LByrefSet
-    | _ -> ufailwith st "uval_op_kind"
+    | _ -> ufailwith st "ulval_op_kind"
 
 and p_op x st =
     match x with

tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs

@@ -422,18 +422,19 @@ let ``Cancel running jobs with the same key`` () =
     // detach requests from their running computations
     cts.Cancel()
 
+    // Cancel the Get requests, leaving the jobs running unawaited.
     for job in jobsToCancel do assertTaskCanceled job
 
+    // Start another request.
     let job = cache.Get(key 11, work) |> Async.StartAsTask
 
     // up til now the jobs should have been running unobserved
     let current = eventsWhen events (received Requested)
     Assert.Equal(0, current |> countOf Canceled)
 
-    // waitUntil events (countOf Canceled >> (=) 10)
-
-    waitUntil events (received Started)
+    waitUntil events (countOf Started >> (=) 11)
 
+    // Allow the single current request to finish.
     jobCanContinue.Set() |> ignore
 
     job.Wait()

tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj

@@ -10,7 +10,8 @@
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <Optimize>false</Optimize>
     <Tailcalls>false</Tailcalls>
-    <IsTestProject>false</IsTestProject>
+    <UnitTestType>xunit</UnitTestType>
+    <IsTestProject>true</IsTestProject>
     <OtherFlags>$(OtherFlags) --warnon:1182 --realsig-</OtherFlags>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <!--Extra xUnit customizations, not required for the test suite to work, but can speed up local test runs and help with debugging.-->
@@ -23,10 +24,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectCapability Remove="TestContainer" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <Content Include="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Compile Include="..\scripts\scriptlib.fsx">
       <Link>scriptlib.fsx</Link>
     </Compile>
@@ -46,11 +46,10 @@
     <Compile Include="ReflectionHelper.fs" />
     <Compile Include="SurfaceArea.fs" />
     <Compile Include="XunitHelpers.fs" />
+    <Compile Include="XunitSetup.fs" />
+    <Compile Include="Tests.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="XunitSetup.fs" />
-  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(FSharpSourcesRoot)\Compiler\FSharp.Compiler.Service.fsproj" />
@@ -70,11 +69,6 @@
     <ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Build\FSharp.Build.fsproj" />
   </ItemGroup>
 
-
-  <ItemGroup>
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-  </ItemGroup>
-
   <!-- Runtime dependencies. Beware. -->
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(MicrosoftNETCoreILDAsmVersion)" />

tests/FSharp.Test.Utilities/Tests.fs

@@ -0,0 +1,45 @@
+module FSharp.Test.UtilitiesTests
+
+open System
+open System.Threading
+open Xunit
+open FSharp.Test
+
+type RunOrFail(name) =
+    let mutable count = 0
+    member _.Run(shouldFail: bool) =
+        let count = Interlocked.Increment &count
+        if shouldFail && count = 42 then
+            failwith $"{name}, failed as expected on {count}"
+        else
+            printfn $"{name}, iteration {count} passed"
+            count
+
+let passing = RunOrFail "Passing"
+let failing = RunOrFail "Failing"
+
+[<Theory(Skip = "Explicit, unskip to run"); Stress(true, Count = 50)>]
+let ``Stress attribute should catch intermittent failure`` shouldFail _ =
+    failing.Run shouldFail
+
+[<Theory; Stress(Count = 5)>]
+let ``Stress attribute works`` _ =
+    passing.Run false
+
+[<Fact>]
+let ``TestConsole captures output`` () =
+    let rnd = Random()
+    let task n =
+        async {
+            use console = new TestConsole.ExecutionCapture()
+            do! Async.Sleep (rnd.Next 50)
+            printf $"Hello, world! {n}"
+            do! Async.Sleep (rnd.Next 50)
+            eprintf $"Some error {n}"
+            return console.OutText, console.ErrorText
+        }
+
+    let expected = [ for n in 0 .. 9 -> $"Hello, world! {n}", $"Some error {n}" ]
+
+    let results = Seq.init 10 task |> Async.Parallel |> Async.RunSynchronously
+    Assert.Equal(expected, results)