Remove NetFramework-only files from netcore compile sources

ellahathaway · ellahathaway · commit 08f8600ca81c · 2025-02-04T17:38:46.000Z
diff --git a/src/SignCheck/Microsoft.SignCheck/Interop/Ole32.cs b/src/SignCheck/Microsoft.SignCheck/Interop/Ole32.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Runtime.InteropServices;
 
-#if NETFRAMEWORK
 using Microsoft.VisualStudio.OLE.Interop;
 
 namespace Microsoft.SignCheck.Interop
@@ -29,4 +28,3 @@ public static extern int StgCreateDocfile(
             out IStorage ppstgOpen);
     }
 }
-#endif
diff --git a/src/SignCheck/Microsoft.SignCheck/Interop/StructuredStorage.cs b/src/SignCheck/Microsoft.SignCheck/Interop/StructuredStorage.cs
@@ -5,11 +5,8 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Deployment.WindowsInstaller;
-
-#if NETFRAMEWORK
 using Microsoft.VisualStudio.OLE.Interop;
 using STATSTG = Microsoft.VisualStudio.OLE.Interop.STATSTG;
-#endif
 
 namespace Microsoft.SignCheck.Interop
 {
@@ -23,7 +20,6 @@ public class StructuredStorage
 
         public const int S_OK = 0;
 
-#if NETFRAMEWORK
         /// <summary>
         /// Returns true if the storage represents a patch (MSP)
         /// </summary>
@@ -134,7 +130,6 @@ public static void SaveStorage(IStorage rootStorage, string storageDir, string s
                 Marshal.ReleaseComObject(stg);
             }
         }
-#endif
 
         public static void SaveStream(Record record, string dir)
         {
diff --git a/src/SignCheck/Microsoft.SignCheck/Interop/WinCrypt.cs b/src/SignCheck/Microsoft.SignCheck/Interop/WinCrypt.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NETFRAMEWORK
-
 using System;
 using System.Runtime.InteropServices;
 using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
@@ -317,5 +315,3 @@ public struct CRYPT_TIMESTAMP_INFO
         public IntPtr rgExtension;
     }
 }
-
-#endif
diff --git a/src/SignCheck/Microsoft.SignCheck/Interop/WinTrust.cs b/src/SignCheck/Microsoft.SignCheck/Interop/WinTrust.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NETFRAMEWORK
 using System;
 using System.Runtime.InteropServices;
 
@@ -16,4 +15,3 @@ public static class WinTrust {
         public static extern uint WinVerifyTrust(IntPtr hWnd, IntPtr pgActionID, IntPtr pWinTrustData);
     }
 }
-#endif
diff --git a/src/SignCheck/Microsoft.SignCheck/Interop/WinTrustData.cs b/src/SignCheck/Microsoft.SignCheck/Interop/WinTrustData.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NETFRAMEWORK
-
 using System;
 using System.Runtime.InteropServices;
 
@@ -25,5 +23,3 @@ public struct WinTrustData
         public uint dwUIContext;
     }
 }
-
-#endif
diff --git a/src/SignCheck/Microsoft.SignCheck/Interop/WinTrustFileInfo.cs b/src/SignCheck/Microsoft.SignCheck/Interop/WinTrustFileInfo.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NETFRAMEWORK
 using System;
 using System.Runtime.InteropServices;
 
@@ -17,5 +16,3 @@ public struct WinTrustFileInfo
         public IntPtr pgKnownSubject;
     }
 }
-
-#endif
diff --git a/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj b/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj
@@ -36,6 +36,27 @@
              CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == '$(NetToolCurrent)'">
+    <!-- Interop -->
+    <Compile Remove="Interop\**" />
+    <EmbeddedResource Remove="Interop\**" />
+
+    <!-- Unsupported file types -->
+    <Compile Remove="Verification\AuthentiCode.cs" />
+    <Compile Remove="Verification\AuthentiCodeVerifier.cs" />
+    <Compile Remove="Verification\CabVerifier.cs" />
+    <Compile Remove="Verification\ExeVerifier.cs" />
+    <Compile Remove="Verification\JarVerifier.cs" />
+    <Compile Remove="Verification\MsiVerifier.cs" />
+    <Compile Remove="Verification\MspVerifier.cs" />
+    <Compile Remove="Verification\MsuVerifier.cs" />
+    <Compile Remove="Verification\PortableExecutableVerifier.cs" />
+    <Compile Remove="Verification\StrongName.cs" />
+    <Compile Remove="Verification\VsixVerifier.cs" />
+    <Compile Remove="Verification\Jar\JarFile.cs" />
+    <Compile Remove="Verification\Jar\JarSignatureFile.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="SignCheckResources.Designer.cs"
              DesignTime="True"
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/AuthentiCode.cs b/src/SignCheck/Microsoft.SignCheck/Verification/AuthentiCode.cs
@@ -19,7 +19,6 @@ public static class AuthentiCode
     {
         public static uint IsSigned(string path)
         {
-#if NETFRAMEWORK
             WinTrustFileInfo fileInfo = new WinTrustFileInfo()
             {
                 cbStruct = (uint)Marshal.SizeOf(typeof(WinTrustFileInfo)),
@@ -58,12 +57,8 @@ public static uint IsSigned(string path)
             Marshal.FreeHGlobal(pData);
 
             return result;
-#else
-            throw new PlatformNotSupportedException();
-#endif
         }
 
-#if NETFRAMEWORK
         /// <summary>
         /// Searches the unsigned attributes in the counter signature for a timestamp token.
         /// </summary>
@@ -206,6 +201,5 @@ public static IEnumerable<Timestamp> GetTimestamps(string path)
 
             return timestamps;
         }
-#endif   
     }
 }
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/AuthentiCodeVerifier.cs b/src/SignCheck/Microsoft.SignCheck/Verification/AuthentiCodeVerifier.cs
@@ -27,13 +27,6 @@ public AuthentiCodeVerifier(Log log, Exclusions exclusions, SignatureVerificatio
 
         public override SignatureVerificationResult VerifySignature(string path, string parent, string virtualPath)
         {
-#if NETCOREAPP
-            var svr = SignatureVerificationResult.UnsupportedFileTypeResult(path, parent, virtualPath);
-            string fullPath = svr.FullPath;
-            svr.AddDetail(DetailKeys.File, SignCheckResources.DetailSigned, SignCheckResources.NA);
-
-            return svr;
-#else
             SignatureVerificationResult svr = VerifyAuthentiCode(path, parent, virtualPath);
 
             if (FinalizeResult)
@@ -44,10 +37,8 @@ public override SignatureVerificationResult VerifySignature(string path, string
             }
 
             return svr;
-#endif
         }
 
-#if NETFRAMEWORK
         protected SignatureVerificationResult VerifyAuthentiCode(string path, string parent, string virtualPath)
         {
             var svr = new SignatureVerificationResult(path, parent, virtualPath);
@@ -90,6 +81,5 @@ protected SignatureVerificationResult VerifyAuthentiCode(string path, string par
 
             return svr;
         }
-#endif
     }
 }
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/Jar/JarSignatureFile.cs b/src/SignCheck/Microsoft.SignCheck/Verification/Jar/JarSignatureFile.cs
@@ -256,7 +256,6 @@ private bool VerifySignatureRsa()
                 {
                     foreach (CryptographicAttributeObject unsignedAttribute in signerInfo.UnsignedAttributes)
                     {
-#if NETFRAMEWORK
                         if (String.Equals(unsignedAttribute.Oid.Value, WinCrypt.szOID_SIGNATURE_TIMESTAMP_ATTRIBUTE, StringComparison.OrdinalIgnoreCase))
                         {
                             Pkcs9AttributeObject timestampAttribute = new Pkcs9AttributeObject(unsignedAttribute.Values[0]);
@@ -284,9 +283,7 @@ private bool VerifySignatureRsa()
                                 }
                             }
                         }
-#else
                         throw new PlatformNotSupportedException("Timestamp verification is not supported on .NET Core.");
-#endif
                     }
                 }
             }
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/MspVerifier.cs b/src/SignCheck/Microsoft.SignCheck/Verification/MspVerifier.cs
@@ -20,7 +20,6 @@ public override SignatureVerificationResult VerifySignature(string path, string
             // Defer to the base class to check the AuthentiCode signature
             SignatureVerificationResult svr = base.VerifySignature(path, parent, virtualPath);
 
-#if NETFRAMEWORK
             if (VerifyRecursive)
             {
                 StructuredStorage.OpenAndExtractStorages(path, svr.TempPath);
@@ -32,7 +31,6 @@ public override SignatureVerificationResult VerifySignature(string path, string
 
                 DeleteDirectory(svr.TempPath);
             }
-#endif
             return svr;
         }
     }
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/SignatureVerificationManager.cs b/src/SignCheck/Microsoft.SignCheck/Verification/SignatureVerificationManager.cs
@@ -6,7 +6,9 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+# if NETFRAMEWORK
 using Microsoft.SignCheck.Interop.PortableExecutable;
+#endif
 using Microsoft.SignCheck.Logging;
 
 namespace Microsoft.SignCheck.Verification
@@ -86,21 +88,24 @@ public SignatureVerificationManager(Exclusions exclusions, Log log, SignatureVer
             Log = log;
             Options = options;
 
+#if NETFRAMEWORK
             AddFileVerifier(new CabVerifier(log, exclusions, options, ".cab"));
             AddFileVerifier(new PortableExecutableVerifier(log, exclusions, options, ".dll"));
             AddFileVerifier(new ExeVerifier(log, exclusions, options, ".exe"));
             AddFileVerifier(new JarVerifier(log, exclusions, options));
             AddFileVerifier(new AuthentiCodeVerifier(log, exclusions, options, ".js"));
-            AddFileVerifier(new LzmaVerifier(log, exclusions, options));
             AddFileVerifier(new MsiVerifier(log, exclusions, options));
             AddFileVerifier(new MspVerifier(log, exclusions, options));
             AddFileVerifier(new MsuVerifier(log, exclusions, options));
-            AddFileVerifier(new NupkgVerifier(log, exclusions, options));
             AddFileVerifier(new AuthentiCodeVerifier(log, exclusions, options, ".psd1"));
             AddFileVerifier(new AuthentiCodeVerifier(log, exclusions, options, ".psm1"));
             AddFileVerifier(new AuthentiCodeVerifier(log, exclusions, options, ".ps1"));
             AddFileVerifier(new AuthentiCodeVerifier(log, exclusions, options, ".ps1xml"));
             AddFileVerifier(new VsixVerifier(log, exclusions, options));
+#endif
+
+            AddFileVerifier(new LzmaVerifier(log, exclusions, options));
+            AddFileVerifier(new NupkgVerifier(log, exclusions, options));
             AddFileVerifier(new XmlVerifier(log, exclusions, options));
             AddFileVerifier(new ZipVerifier(log, exclusions, options));
         }
@@ -257,7 +262,7 @@ public static FileVerifier GetFileVerifierByHeader(string path)
                         fileVerifier = GetFileVerifierByExtension(".cab");
                     }
                 }
-
+#if NETFRAMEWORK
                 reader.BaseStream.Seek(0, SeekOrigin.Begin);
                 if (stream.Length > 2)
                 {
@@ -276,6 +281,7 @@ public static FileVerifier GetFileVerifierByHeader(string path)
                         }
                     }
                 }
+#endif
             }
 
             return fileVerifier;
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/VsixVerifier.cs b/src/SignCheck/Microsoft.SignCheck/Verification/VsixVerifier.cs
@@ -32,7 +32,6 @@ public override SignatureVerificationResult VerifySignature(string path, string
             return svr;
         }
 
-#if NETFRAMEWORK
         private bool TryGetTimestamp(PackageDigitalSignature packageSignature, out Timestamp timestamp)
         {
             bool isValidTimestampSignature = false;
@@ -119,13 +118,9 @@ private bool TryGetTimestamp(PackageDigitalSignature packageSignature, out Times
 
             return isValidTimestampSignature;
         }
-#endif
 
         private bool IsSigned(string path, SignatureVerificationResult result)
         {
-#if NETCOREAPP
-            return false;
-#else
             PackageDigitalSignature packageSignature = null;
 
             using (var vsixStream = new FileStream(path, FileMode.Open, FileAccess.Read))
@@ -188,7 +183,6 @@ private bool IsSigned(string path, SignatureVerificationResult result)
             }
 
             return true;
-#endif
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Runtime.InteropServices;`
`6`	`6`
`7`		`-#if NETFRAMEWORK`
`8`	`7`	`using Microsoft.VisualStudio.OLE.Interop;`
`9`	`8`
`10`	`9`	`namespace Microsoft.SignCheck.Interop`
`@@ -29,4 +28,3 @@ public static extern int StgCreateDocfile(`
`29`	`28`	`out IStorage ppstgOpen);`
`30`	`29`	`}`
`31`	`30`	`}`
`32`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,8 @@`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Runtime.InteropServices;`
`7`	`7`	`using Microsoft.Deployment.WindowsInstaller;`
`8`		`-`
`9`		`-#if NETFRAMEWORK`
`10`	`8`	`using Microsoft.VisualStudio.OLE.Interop;`
`11`	`9`	`using STATSTG = Microsoft.VisualStudio.OLE.Interop.STATSTG;`
`12`		`-#endif`
`13`	`10`
`14`	`11`	`namespace Microsoft.SignCheck.Interop`
`15`	`12`	`{`
`@@ -23,7 +20,6 @@ public class StructuredStorage`
`23`	`20`
`24`	`21`	`public const int S_OK = 0;`
`25`	`22`
`26`		`-#if NETFRAMEWORK`
`27`	`23`	`/// <summary>`
`28`	`24`	`/// Returns true if the storage represents a patch (MSP)`
`29`	`25`	`/// </summary>`
`@@ -134,7 +130,6 @@ public static void SaveStorage(IStorage rootStorage, string storageDir, string s`
`134`	`130`	`Marshal.ReleaseComObject(stg);`
`135`	`131`	`}`
`136`	`132`	`}`
`137`		`-#endif`
`138`	`133`
`139`	`134`	`public static void SaveStream(Record record, string dir)`
`140`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`		`-#if NETFRAMEWORK`
`5`		`-`
`6`	`4`	`using System;`
`7`	`5`	`using System.Runtime.InteropServices;`
`8`	`6`	`using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;`
`@@ -317,5 +315,3 @@ public struct CRYPT_TIMESTAMP_INFO`
`317`	`315`	`public IntPtr rgExtension;`
`318`	`316`	`}`
`319`	`317`	`}`
`320`		`-`
`321`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`		`-#if NETFRAMEWORK`
`5`	`4`	`using System;`
`6`	`5`	`using System.Runtime.InteropServices;`
`7`	`6`
`@@ -16,4 +15,3 @@ public static class WinTrust {`
`16`	`15`	`public static extern uint WinVerifyTrust(IntPtr hWnd, IntPtr pgActionID, IntPtr pWinTrustData);`
`17`	`16`	`}`
`18`	`17`	`}`
`19`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public static class AuthentiCode`
`19`	`19`	`{`
`20`	`20`	`public static uint IsSigned(string path)`
`21`	`21`	`{`
`22`		`-#if NETFRAMEWORK`
`23`	`22`	`WinTrustFileInfo fileInfo = new WinTrustFileInfo()`
`24`	`23`	`{`
`25`	`24`	`cbStruct = (uint)Marshal.SizeOf(typeof(WinTrustFileInfo)),`
`@@ -58,12 +57,8 @@ public static uint IsSigned(string path)`
`58`	`57`	`Marshal.FreeHGlobal(pData);`
`59`	`58`
`60`	`59`	`return result;`
`61`		`-#else`
`62`		`- throw new PlatformNotSupportedException();`
`63`		`-#endif`
`64`	`60`	`}`
`65`	`61`
`66`		`-#if NETFRAMEWORK`
`67`	`62`	`/// <summary>`
`68`	`63`	`/// Searches the unsigned attributes in the counter signature for a timestamp token.`
`69`	`64`	`/// </summary>`
`@@ -206,6 +201,5 @@ public static IEnumerable<Timestamp> GetTimestamps(string path)`
`206`	`201`
`207`	`202`	`return timestamps;`
`208`	`203`	`}`
`209`		`-#endif`
`210`	`204`	`}`
`211`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,6 @@ public AuthentiCodeVerifier(Log log, Exclusions exclusions, SignatureVerificatio`
`27`	`27`
`28`	`28`	`public override SignatureVerificationResult VerifySignature(string path, string parent, string virtualPath)`
`29`	`29`	`{`
`30`		`-#if NETCOREAPP`
`31`		`- var svr = SignatureVerificationResult.UnsupportedFileTypeResult(path, parent, virtualPath);`
`32`		`- string fullPath = svr.FullPath;`
`33`		`- svr.AddDetail(DetailKeys.File, SignCheckResources.DetailSigned, SignCheckResources.NA);`
`34`		`-`
`35`		`- return svr;`
`36`		`-#else`
`37`	`30`	`SignatureVerificationResult svr = VerifyAuthentiCode(path, parent, virtualPath);`
`38`	`31`
`39`	`32`	`if (FinalizeResult)`
`@@ -44,10 +37,8 @@ public override SignatureVerificationResult VerifySignature(string path, string`
`44`	`37`	`}`
`45`	`38`
`46`	`39`	`return svr;`
`47`		`-#endif`
`48`	`40`	`}`
`49`	`41`
`50`		`-#if NETFRAMEWORK`
`51`	`42`	`protected SignatureVerificationResult VerifyAuthentiCode(string path, string parent, string virtualPath)`
`52`	`43`	`{`
`53`	`44`	`var svr = new SignatureVerificationResult(path, parent, virtualPath);`
`@@ -90,6 +81,5 @@ protected SignatureVerificationResult VerifyAuthentiCode(string path, string par`
`90`	`81`
`91`	`82`	`return svr;`
`92`	`83`	`}`
`93`		`-#endif`
`94`	`84`	`}`
`95`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,6 @@ private bool VerifySignatureRsa()`
`256`	`256`	`{`
`257`	`257`	`foreach (CryptographicAttributeObject unsignedAttribute in signerInfo.UnsignedAttributes)`
`258`	`258`	`{`
`259`		`-#if NETFRAMEWORK`
`260`	`259`	`if (String.Equals(unsignedAttribute.Oid.Value, WinCrypt.szOID_SIGNATURE_TIMESTAMP_ATTRIBUTE, StringComparison.OrdinalIgnoreCase))`
`261`	`260`	`{`
`262`	`261`	`Pkcs9AttributeObject timestampAttribute = new Pkcs9AttributeObject(unsignedAttribute.Values[0]);`
`@@ -284,9 +283,7 @@ private bool VerifySignatureRsa()`
`284`	`283`	`}`
`285`	`284`	`}`
`286`	`285`	`}`
`287`		`-#else`
`288`	`286`	`throw new PlatformNotSupportedException("Timestamp verification is not supported on .NET Core.");`
`289`		`-#endif`
`290`	`287`	`}`
`291`	`288`	`}`
`292`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ public override SignatureVerificationResult VerifySignature(string path, string`
`20`	`20`	`// Defer to the base class to check the AuthentiCode signature`
`21`	`21`	`SignatureVerificationResult svr = base.VerifySignature(path, parent, virtualPath);`
`22`	`22`
`23`		`-#if NETFRAMEWORK`
`24`	`23`	`if (VerifyRecursive)`
`25`	`24`	`{`
`26`	`25`	`StructuredStorage.OpenAndExtractStorages(path, svr.TempPath);`
`@@ -32,7 +31,6 @@ public override SignatureVerificationResult VerifySignature(string path, string`
`32`	`31`
`33`	`32`	`DeleteDirectory(svr.TempPath);`
`34`	`33`	`}`
`35`		`-#endif`
`36`	`34`	`return svr;`
`37`	`35`	`}`
`38`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public override SignatureVerificationResult VerifySignature(string path, string`
`32`	`32`	`return svr;`
`33`	`33`	`}`
`34`	`34`
`35`		`-#if NETFRAMEWORK`
`36`	`35`	`private bool TryGetTimestamp(PackageDigitalSignature packageSignature, out Timestamp timestamp)`
`37`	`36`	`{`
`38`	`37`	`bool isValidTimestampSignature = false;`
`@@ -119,13 +118,9 @@ private bool TryGetTimestamp(PackageDigitalSignature packageSignature, out Times`
`119`	`118`
`120`	`119`	`return isValidTimestampSignature;`
`121`	`120`	`}`
`122`		`-#endif`
`123`	`121`
`124`	`122`	`private bool IsSigned(string path, SignatureVerificationResult result)`
`125`	`123`	`{`
`126`		`-#if NETCOREAPP`
`127`		`- return false;`
`128`		`-#else`
`129`	`124`	`PackageDigitalSignature packageSignature = null;`
`130`	`125`
`131`	`126`	`using (var vsixStream = new FileStream(path, FileMode.Open, FileAccess.Read))`
`@@ -188,7 +183,6 @@ private bool IsSigned(string path, SignatureVerificationResult result)`
`188`	`183`	`}`
`189`	`184`
`190`	`185`	`return true;`
`191`		`-#endif`
`192`	`186`	`}`
`193`	`187`	`}`
`194`	`188`	`}`