Merge branch 'main' into 18061-DependencyProvider

Author: psfinaki

eng/Version.Details.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24619.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25060.3">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>e2b1d16fd66540b3a5813ec0ac1fd166688c3e0a</Sha>
+      <Sha>f5fa796273e4e59926e3fab26e1ab9e7d577f5e5</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->

src/Compiler/Driver/CompilerDiagnostics.fs

@@ -438,7 +438,7 @@ module OldStyleMessages =
     let ConstraintSolverTupleDiffLengthsE () = Message("ConstraintSolverTupleDiffLengths", "%d%d")
     let ConstraintSolverInfiniteTypesE () = Message("ConstraintSolverInfiniteTypes", "%s%s")
     let ConstraintSolverMissingConstraintE () = Message("ConstraintSolverMissingConstraint", "%s")
-    let ConstraintSolverNullnessWarningEquivWithTypesE () = Message("ConstraintSolverNullnessWarningEquivWithTypes", "%s%s")
+    let ConstraintSolverNullnessWarningEquivWithTypesE () = Message("ConstraintSolverNullnessWarningEquivWithTypes", "%s")
     let ConstraintSolverNullnessWarningWithTypesE () = Message("ConstraintSolverNullnessWarningWithTypes", "%s%s")
     let ConstraintSolverNullnessWarningWithTypeE () = Message("ConstraintSolverNullnessWarningWithType", "%s")
     let ConstraintSolverNullnessWarningE () = Message("ConstraintSolverNullnessWarning", "%s")
@@ -678,8 +678,7 @@ type Exception with
 
             let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv ty1 ty2
 
-            os.Append(ConstraintSolverNullnessWarningEquivWithTypesE().Format t1 t2)
-            |> ignore
+            os.Append(ConstraintSolverNullnessWarningEquivWithTypesE().Format t1) |> ignore
 
             if m.StartLine <> m2.StartLine then
                 os.Append(SeeAlsoE().Format(stringOfRange m)) |> ignore

src/Compiler/FSStrings.resx

@@ -130,7 +130,7 @@
     <value>A type parameter is missing a constraint '{0}'</value>
   </data>
   <data name="ConstraintSolverNullnessWarningEquivWithTypes" xml:space="preserve">
-    <value>Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability.</value>
+    <value>Nullness warning: A non-nullable '{0}' was expected but this expression is nullable. Consider either changing the target to also be nullable, or use pattern matching to safely handle the null case of this expression.</value>
   </data>
   <data name="ConstraintSolverNullnessWarningWithTypes" xml:space="preserve">
     <value>Nullness warning: The types '{0}' and '{1}' do not have compatible nullability.</value>

src/Compiler/xlf/FSStrings.cs.xlf

@@ -143,14 +143,6 @@ let ``Using getSource and notifications instead of filesystem`` () =
 
 [<Fact>]
 let GetAllUsesOfAllSymbols() =
-    let traceProvider =
-        Sdk.CreateTracerProviderBuilder()
-                .AddSource("fsc")
-                .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(serviceName="F#", serviceVersion = "1"))
-                .AddJaegerExporter()
-                .Build()
-
-    use _ = Activity.start "GetAllUsesOfAllSymbols" [  ]
 
     let result =
         async {
@@ -162,9 +154,6 @@ let GetAllUsesOfAllSymbols() =
             return checkProjectResults.GetAllUsesOfAllSymbols()
         } |> Async.RunSynchronously
 
-    traceProvider.ForceFlush() |> ignore
-    traceProvider.Dispose()
-
     if result.Length <> 79 then failwith $"Expected 81 symbolUses, got {result.Length}:\n%A{result}"
 
 [<Fact>]

src/Compiler/xlf/FSStrings.de.xlf

@@ -556,13 +556,6 @@ let fuzzingTest seed (project: SyntheticProject) = task {
             do! Task.Delay (rng.Next maxCheckingDelayMs)
     }
 
-    use _tracerProvider =
-        Sdk.CreateTracerProviderBuilder()
-            .AddSource("fsc")
-            .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(serviceName="F# Fuzzing", serviceVersion = "1"))
-            .AddJaegerExporter()
-            .Build()
-
     use _ = Activity.start $"Fuzzing {project.Name}" [ Activity.Tags.project, project.Name; "seed", seed.ToString() ]
 
     do! task {