diff --git a/Mono.Cecil.nuspec b/Mono.Cecil.nuspec index 6432e14ab..94af3c364 100644 --- a/Mono.Cecil.nuspec +++ b/Mono.Cecil.nuspec @@ -16,7 +16,7 @@ - + @@ -31,6 +31,6 @@ - + diff --git a/Mono.Cecil.props b/Mono.Cecil.props index bc3bd30cb..88c89efd8 100644 --- a/Mono.Cecil.props +++ b/Mono.Cecil.props @@ -49,7 +49,7 @@ netcoreapp2.0 - netstandard1.3 + netstandard2.0 diff --git a/Mono.Cecil/AssemblyWriter.cs b/Mono.Cecil/AssemblyWriter.cs index 84d819fc3..43dd169c7 100644 --- a/Mono.Cecil/AssemblyWriter.cs +++ b/Mono.Cecil/AssemblyWriter.cs @@ -103,12 +103,10 @@ static void Write (ModuleDefinition module, Disposable stream, WriterPar if (symbol_writer_provider == null && parameters.WriteSymbols) symbol_writer_provider = new DefaultSymbolWriterProvider (); -#if !NET_CORE if (parameters.StrongNameKeyPair != null && name != null) { name.PublicKey = parameters.StrongNameKeyPair.PublicKey; module.Attributes |= ModuleAttributes.StrongNameSigned; } -#endif using (var symbol_writer = GetSymbolWriter (module, fq_name, symbol_writer_provider, parameters)) { var metadata = new MetadataBuilder (module, fq_name, timestamp, symbol_writer_provider, symbol_writer); @@ -118,10 +116,8 @@ static void Write (ModuleDefinition module, Disposable stream, WriterPar stream.value.SetLength (0); writer.WriteImage (); -#if !NET_CORE if (parameters.StrongNameKeyPair != null) CryptoService.StrongName (stream.value, writer, parameters.StrongNameKeyPair); -#endif } } diff --git a/Mono.Cecil/BaseAssemblyResolver.cs b/Mono.Cecil/BaseAssemblyResolver.cs index 97eb4cc20..f0fce6d43 100644 --- a/Mono.Cecil/BaseAssemblyResolver.cs +++ b/Mono.Cecil/BaseAssemblyResolver.cs @@ -76,9 +76,8 @@ public abstract class BaseAssemblyResolver : IAssemblyResolver { // Maps file names of available trusted platform assemblies to their full paths. // Internal for testing. internal static readonly Lazy> TrustedPlatformAssemblies = new Lazy> (CreateTrustedPlatformAssemblyMap); -#else - Collection gac_paths; #endif + Collection gac_paths; public void AddSearchDirectory (string directory) { @@ -137,7 +136,7 @@ public virtual AssemblyDefinition Resolve (AssemblyNameReference name, ReaderPar assembly = SearchTrustedPlatformAssemblies (name, parameters); if (assembly != null) return assembly; -#else +#endif var framework_dir = Path.GetDirectoryName (typeof (object).Module.FullyQualifiedName); var framework_dirs = on_mono ? new [] { framework_dir, Path.Combine (framework_dir, "Facades") } @@ -162,7 +161,6 @@ public virtual AssemblyDefinition Resolve (AssemblyNameReference name, ReaderPar assembly = SearchDirectory (name, framework_dirs, parameters); if (assembly != null) return assembly; -#endif if (ResolveFailure != null) { assembly = ResolveFailure (this, name); if (assembly != null) @@ -234,7 +232,6 @@ static bool IsZero (Version version) return version.Major == 0 && version.Minor == 0 && version.Build == 0 && version.Revision == 0; } -#if !NET_CORE AssemblyDefinition GetCorlib (AssemblyNameReference reference, ReaderParameters parameters) { var version = reference.Version; @@ -380,7 +377,7 @@ AssemblyDefinition GetAssemblyInNetGac (AssemblyNameReference reference, ReaderP return null; } -#endif + static string GetAssemblyFile (AssemblyNameReference reference, string prefix, string gac) { var gac_folder = new StringBuilder () diff --git a/Mono.Cecil/ModuleDefinition.cs b/Mono.Cecil/ModuleDefinition.cs index 0960f29b3..a8e7bc114 100644 --- a/Mono.Cecil/ModuleDefinition.cs +++ b/Mono.Cecil/ModuleDefinition.cs @@ -211,9 +211,7 @@ public sealed class WriterParameters { Stream symbol_stream; ISymbolWriterProvider symbol_writer_provider; bool write_symbols; -#if !NET_CORE SR.StrongNameKeyPair key_pair; -#endif public uint? Timestamp { get { return timestamp; } @@ -235,12 +233,10 @@ public bool WriteSymbols { set { write_symbols = value; } } -#if !NET_CORE public SR.StrongNameKeyPair StrongNameKeyPair { get { return key_pair; } set { key_pair = value; } } -#endif } #endif diff --git a/Mono.Security.Cryptography/CryptoConvert.cs b/Mono.Security.Cryptography/CryptoConvert.cs index 51f4ca135..7d1d73ce2 100644 --- a/Mono.Security.Cryptography/CryptoConvert.cs +++ b/Mono.Security.Cryptography/CryptoConvert.cs @@ -29,8 +29,6 @@ #if !READ_ONLY -#if !NET_CORE - using System; using System.Security.Cryptography; @@ -248,6 +246,3 @@ static public RSA FromCapiKeyBlob (byte[] blob, int offset) } #endif - -#endif - diff --git a/Mono.Security.Cryptography/CryptoService.cs b/Mono.Security.Cryptography/CryptoService.cs index 840276d29..c6d0a0236 100644 --- a/Mono.Security.Cryptography/CryptoService.cs +++ b/Mono.Security.Cryptography/CryptoService.cs @@ -10,8 +10,6 @@ #if !READ_ONLY -#if !NET_CORE - using System; using System.IO; using System.Reflection; @@ -154,5 +152,3 @@ static bool TryGetKeyContainer (ISerializable key_pair, out byte [] key, out str } #endif - -#endif