Merge pull request #13059 from dotnet/merges/main-to-release/dev17.3

Merge main to release/dev17.3

src/fsharp/fsi/console.fs

@@ -6,26 +6,6 @@ open System
 open System.Text
 open System.Collections.Generic
 
-/// System.Console.ReadKey appears to return an ANSI character (not the expected the unicode character).
-/// When this fix flag is true, this byte is converted to a char using the System.Console.InputEncoding.
-/// This is a code-around for bug://1345.
-/// Fixes to System.Console.ReadKey may break this code around, hence the option here.
-module internal ConsoleOptions =
-
-  let readKeyFixup (c:char) =
-      // Assumes the c:char is actually a byte in the System.Console.InputEncoding.
-      // Convert it to a Unicode char through the encoding.
-      if 0 <= int c && int c <= 255 then
-          let chars = System.Console.InputEncoding.GetChars [| byte c |]
-          if chars.Length = 1 then
-              chars.[0] // fixed up char
-          else
-              assert("readKeyFixHook: InputEncoding.GetChars(single-byte) returned multiple chars" = "")
-              c // no fix up
-      else
-          assert("readKeyFixHook: given char is outside the 0..255 byte range" = "")
-          c
-
 type internal Style = Prompt | Out | Error
 
 /// Class managing the command History.
@@ -367,7 +347,6 @@ type internal ReadLineConsole() =
             // REVIEW: the Ctrl-Z code is not recognised as EOF by the lexer.
             // REVIEW: looks like a relic of the port of readline, which is currently removable.
             let c = if (key.Key = ConsoleKey.F6) then '\x1A' else key.KeyChar
-            let c = ConsoleOptions.readKeyFixup c
             insertChar(c)
             
         let backspace() =

src/fsharp/fsi/fsi.fsproj

@@ -8,6 +8,9 @@
     <TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Unix'">net6.0</TargetFrameworks>
     <NoWarn>$(NoWarn);44</NoWarn> <!-- Obsolete -->
+    <!-- NU1504 reports duplicate package download for various packages.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn);NU1504</NoWarn>
     <AllowCrossTargeting>true</AllowCrossTargeting>
     <OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
     <Win32Resource>fsi.res</Win32Resource>

vsintegration/src/FSharp.ProjectSystem.Base/FSharp.ProjectSystem.Base.csproj

@@ -7,6 +7,9 @@
     <AssemblyName>FSharp.ProjectSystem.Base</AssemblyName>
     <NoWarn>$(NoWarn),618,1570,1572,1573,1574,1591,3001,3002,3003,3005,3008,3009,3021,3024</NoWarn>
     <NoWarn>$(NoWarn);VSTHRD010</NoWarn>
+    <!-- NU1504 reports duplicate package download for various packages.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn);NU1504</NoWarn>
     <DefineConstants>$(DefineConstants);CODE_ANALYSIS</DefineConstants>
     <RootNamespace>Microsoft.VisualStudio.FSharp.ProjectSystem</RootNamespace>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>

vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.ProjectSystem.PropertyPages.vbproj

@@ -12,6 +12,9 @@
     <RegisterForComInterop>false</RegisterForComInterop>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
     <NoWarn>40026;42105;42107;42353</NoWarn>
+    <!-- NU1504 reports duplicate package download for various packages.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn);NU1504</NoWarn>
     <TargetFramework>net472</TargetFramework>
     <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <ImportVsSDK>true</ImportVsSDK>

vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj

@@ -7,6 +7,9 @@
     <PlatformTarget>x86</PlatformTarget>
     <OutputType>Library</OutputType>
     <NoWarn>$(NoWarn);44;58;75;3005</NoWarn>
+    <!-- NU1504 reports duplicate package download for various packages.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn);NU1504</NoWarn>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>