Merge pull request #23529 from agocke/fix-signing

Quick fix for signing failures

build/Targets/Imports.targets

@@ -143,8 +143,9 @@
             <PublicKey>$(RoslynInternalKey)</PublicKey>
             <PublicKeyToken>fc793a00266884fb</PublicKeyToken>
           </PropertyGroup>
-          <!-- Real-signing is only supported cross-platform in the boostrap toolset -->
-          <PropertyGroup Condition="'$(OS)' != 'Windows_NT' AND '$(BootstrapBuildPath)' == ''">
+          <!-- Real-signing cross-platform currently has a blocking bug:
+               https://github.com/dotnet/roslyn/issues/23521 -->
+          <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
               <PublicSign>true</PublicSign>
           </PropertyGroup>
         </Otherwise>

src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs

@@ -5826,7 +5826,7 @@ public void EmittedSubsystemVersion()
             Assert.Equal(1, peHeaders.PEHeader.MinorSubsystemVersion);
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/dotnet/roslyn/pull/23529")]
         public void CreateCompilationWithKeyFile()
         {
             string source = @"

src/Compilers/Core/Portable/CommandLine/CommonCommandLineArguments.cs

@@ -284,12 +284,10 @@ public CompilationOptions CompilationOptions
 
         internal StrongNameProvider GetStrongNameProvider(StrongNameFileSystem fileSystem)
         {
-            bool fallback = 
-                ParseOptionsCore.Features.ContainsKey("UseLegacyStrongNameProvider") ||
-                CompilationOptionsCore.CryptoKeyContainer != null;
-            return fallback ?
-                (StrongNameProvider)new DesktopStrongNameProvider(KeyFileSearchPaths, null, fileSystem) :
-                (StrongNameProvider)new PortableStrongNameProvider(KeyFileSearchPaths, fileSystem);
+            // https://github.com/dotnet/roslyn/issues/23521
+            // Disable the portable strong name provider until we can find and fix the
+            // root cause of the bug
+            return new DesktopStrongNameProvider(KeyFileSearchPaths, null, fileSystem);
         }
 
         internal CommandLineArguments()

src/Compilers/VisualBasic/Test/CommandLine/CommandLineTests.vb

@@ -107,7 +107,7 @@ End Module
             Assert.Equal("", output.ToString().Trim())
         End Sub
 
-        <Fact>
+        <Fact(Skip:= "https://github.com/dotnet/roslyn/pull/23529")>
         Public Sub CreateCompilationWithKeyFile()
             Dim source = "
 Public Class C