Merge pull request #7009 from davidwengier/UpdateSystemNetHttp

eng/Versions.props

@@ -155,7 +155,7 @@
     <Tooling_MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</Tooling_MicrosoftVisualStudioLanguageServicesPackageVersion>
     <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
     <XunitCombinatorialPackageVersion>1.4.1</XunitCombinatorialPackageVersion>
-    <XunitVersion>2.4.1</XunitVersion>
+    <XunitVersion>2.4.2</XunitVersion>
     <XunitExtensibilityExecutionPackageVersion>$(XunitVersion)</XunitExtensibilityExecutionPackageVersion>
     <!-- Temporary hack to workaround package restrictions for dev17 -->
     <MicrosoftInternalVisualStudioShellFrameworkPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkPackageVersion>
@@ -163,7 +163,7 @@
     <!-- Compiler Deps -->
     <BenchmarkDotNetVersion>0.13.0.1555</BenchmarkDotNetVersion>
     <DiffPlexVersion>1.5.0</DiffPlexVersion>
-    <FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
+    <FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
     <MicrosoftBuildVersion>17.2.0-preview-22178-03</MicrosoftBuildVersion>
     <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>

global.json

@@ -3,20 +3,22 @@
     "dotnet": "7.0.100-rc.1.22431.12",
     "runtimes": {
       "dotnet": [
-        "2.1.11",
+        "2.1.30",
         "$(MicrosoftNETCoreBrowserDebugHostTransportPackageVersion)",
-        "3.1.0"
+        "3.1.30"
       ]
     },
     "vs": {
-      "version": "16.3",
+      "version": "17.2",
       "components": [
         "Microsoft.VisualStudio.Component.VSSDK"
       ]
     }
   },
   "sdk": {
-    "version": "7.0.100-rc.1.22431.12"
+    "version": "7.0.100-rc.1.22431.12",
+    "allowPrerelease": true,
+    "rollForward": "latestPatch"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22513.2",

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/RazorDiagnosticsEndpointTest.cs

@@ -259,6 +259,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
         }
 
@@ -295,6 +296,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
         }
 
@@ -332,6 +334,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
         }
 
@@ -369,6 +372,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
             Assert.Equal(1337, response.HostDocumentVersion);
         }
@@ -479,6 +483,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
             Assert.Equal(1337, response.HostDocumentVersion);
         }
@@ -581,6 +586,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
             Assert.Equal(1337, response.HostDocumentVersion);
         }
@@ -699,6 +705,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
             Assert.Equal(1337, response.HostDocumentVersion);
         }
@@ -729,6 +736,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
             Assert.Equal(1337, response.HostDocumentVersion);
         }
@@ -759,6 +767,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
             Assert.Equal(1337, response.HostDocumentVersion);
         }
@@ -790,6 +799,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
             Assert.Equal(1337, response.HostDocumentVersion);
         }
@@ -828,6 +838,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Collection(response.Diagnostics,
                 d => Assert.Equal(new Range { Start = new Position(0, 1),End =  new Position(0, 2)}, d.Range),
                 d => Assert.Equal(new Range { Start = new Position(0, 55), End = new Position(0, 57)}, d.Range));
@@ -876,6 +887,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
             Assert.Equal(1337, response.HostDocumentVersion);
         }
@@ -931,6 +943,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             var d = Assert.Single(response.Diagnostics);
             Assert.Equal(HtmlErrorCodes.InvalidNestingErrorCode, d.Code);
             Assert.Equal(10, d.Range.Start.Line);
@@ -963,6 +976,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             var returnedDiagnostic = Assert.Single(response.Diagnostics);
             Assert.NotNull(returnedDiagnostic.Code);
             Assert.True(returnedDiagnostic.Code!.Value.TryGetSecond(out var str));
@@ -996,6 +1010,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
         }
 
@@ -1026,6 +1041,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             var diagnostic = Assert.Single(response.Diagnostics);
             Assert.NotNull(diagnostic.Code);
             Assert.True(diagnostic.Code!.Value.TryGetSecond(out var str));
@@ -1070,6 +1086,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
         }
 
@@ -1100,6 +1117,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics
             var response = await Task.Run(() => diagnosticsEndpoint.HandleRequestAsync(request, requestContext, default));
 
             // Assert
+            Assert.NotNull(response.Diagnostics);
             Assert.Empty(response.Diagnostics);
         }
 

src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/MarkupTransitionCompletionItemProviderTest.cs

@@ -326,8 +326,8 @@ namespace Microsoft.CodeAnalysis.Razor.Completion
 
         private static void AssertRazorCompletionItem(RazorCompletionItem item)
         {
-            Assert.Equal(item.DisplayText, SyntaxConstants.TextTagName);
-            Assert.Equal(item.InsertText, SyntaxConstants.TextTagName);
+            Assert.Equal(SyntaxConstants.TextTagName, item.DisplayText);
+            Assert.Equal(SyntaxConstants.TextTagName, item.InsertText);
             var completionDescription = item.GetMarkupTransitionCompletionDescription();
             Assert.Equal(CodeAnalysisResources.MarkupTransition_Description, completionDescription.Description);
         }