Revert more

dotnet · Jan 3, 2024 · 628f42c · 628f42c
1 parent f4cd26e
commit 628f42c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -37,7 +37,7 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="8.0.0">
+    <Dependency Name="System.Text.Json" Version="7.0.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
     </Dependency>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -251,7 +251,7 @@
     <SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
     <SystemTextEncodingExtensionsVersion>4.3.0</SystemTextEncodingExtensionsVersion>
     <!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild. -->
-    <SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
+    <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
     <SystemThreadingChannelsVersion>7.0.0</SystemThreadingChannelsVersion>
     <SystemThreadingTasksDataflowVersion>7.0.0</SystemThreadingTasksDataflowVersion>
     <!-- We need System.ValueTuple assembly version at least 4.0.3.0 on net47 to make F5 work against Dev15 - see https://github.com/dotnet/roslyn/issues/29705 -->

diff --git a/src/Compilers/VisualBasic/Test/Semantic/HasValidFonts.vb b/src/Compilers/VisualBasic/Test/Semantic/HasValidFonts.vb
@@ -12,11 +12,7 @@ Friend Class HasValidFonts
     Public Overrides ReadOnly Property ShouldSkip As Boolean
         Get
             Try
-#If NET8_0 Then
-                If OperatingSystem.IsWindowsVersionAtLeast(6, 1) Then
-#Else
                 If RuntimeInformation.IsOSPlatform(OSPlatform.Windows) Then
-#End If
                     ' SystemFont.DefaultFont is only available on windows 6.1 and later
                     Dim result = SystemFonts.DefaultFont
                     Return result Is Nothing