diff --git a/src/libraries/Common/src/System/Net/Http/aspnetcore/NetEventSource.Common.cs b/src/libraries/Common/src/System/Net/Http/aspnetcore/NetEventSource.Common.cs index 6905c66e6dbff..8a9440006f7e0 100644 --- a/src/libraries/Common/src/System/Net/Http/aspnetcore/NetEventSource.Common.cs +++ b/src/libraries/Common/src/System/Net/Http/aspnetcore/NetEventSource.Common.cs @@ -14,9 +14,6 @@ using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -#if NET46 -using System.Security; -#endif #pragma warning disable CA1823 // not all IDs are used by all partial providers @@ -40,9 +37,6 @@ namespace System.Net // method that takes an object and optionally provides a string representation of it, in case a particular library wants to customize further. /// Provides logging facilities for System.Net libraries. -#if NET46 - [SecuritySafeCritical] -#endif internal sealed partial class NetEventSource : EventSource { /// The single event source instance to use for all logging. diff --git a/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs b/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs index 96090ceeeac24..2a275a58055b3 100644 --- a/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs +++ b/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs @@ -13,9 +13,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -#if NET46 -using System.Security; -#endif #pragma warning disable CA1823 // not all IDs are used by all partial providers @@ -39,9 +36,6 @@ namespace System.Net // method that takes an object and optionally provides a string representation of it, in case a particular library wants to customize further. /// Provides logging facilities for System.Net libraries. -#if NET46 - [SecuritySafeCritical] -#endif internal sealed partial class NetEventSource : EventSource { #if !ES_BUILD_STANDALONE diff --git a/src/libraries/Common/src/System/SR.cs b/src/libraries/Common/src/System/SR.cs index 25894922254a6..5d8d88b0d6d8c 100644 --- a/src/libraries/Common/src/System/SR.cs +++ b/src/libraries/Common/src/System/SR.cs @@ -8,20 +8,13 @@ namespace System { internal static partial class SR { -#if !NET45 // AppContext is not supported on < .NET Framework 4.5 private static readonly bool s_usingResourceKeys = AppContext.TryGetSwitch("System.Resources.UseSystemResourceKeys", out bool usingResourceKeys) ? usingResourceKeys : false; -#endif // This method is used to decide if we need to append the exception message parameters to the message when calling SR.Format. // by default it returns the value of System.Resources.UseSystemResourceKeys AppContext switch or false if not specified. // Native code generators can replace the value this returns based on user input at the time of native code generation. // The Linker is also capable of replacing the value of this method when the application is being trimmed. - private static bool UsingResourceKeys() => -#if !NET45 // AppContext is not supported on < .NET Framework 4.5 - s_usingResourceKeys; -#else - false; -#endif + private static bool UsingResourceKeys() => s_usingResourceKeys; internal static string GetResourceString(string resourceKey) { diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index e9cd76e9b1959..cc5a02e38691d 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -27,7 +27,7 @@ - net45;net451;net452;net46;net461;net462;net47;net471;net472 + net461;net462;net47;net471;net472 $(AdditionalBuildTargetFrameworks);netstandard2.0 diff --git a/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj b/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj index 0a6dbf5df446c..2ef483eed7239 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj @@ -4,9 +4,9 @@ netcoreapp3.0;$(AllXamarinFrameworks) - + - + true diff --git a/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj b/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj index e1461f282d9e2..ae52845b2ee9f 100644 --- a/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj +++ b/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj @@ -2,10 +2,10 @@ - uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks) - + true diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj index b85c37851526b..87afcb655063e 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj @@ -2,7 +2,7 @@ - net45;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index db3fc7b0d1015..a323120307be3 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -1,12 +1,12 @@ - netstandard2.0;net45 + netstandard2.0;net461 false enable - $(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS + $(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index 0a453be435ba8..6341ed7cdaff5 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -4,12 +4,11 @@ false $(NoWarn);SA1205 enable - $(NetCoreAppCurrent);net5.0;netstandard2.0;net46;net45 + $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 true - $(DefineConstants);NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT;NO_ARRAY_EMPTY_SUPPORT $(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS;ENABLE_HTTP_HANDLER $(DefineConstants);W3C_DEFAULT_ID_FORMAT @@ -45,8 +44,8 @@ - - + + @@ -61,12 +60,9 @@ Common\System\LocalAppContextSwitches.Common.cs - + - - - diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.Current.net45.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.Current.net45.cs deleted file mode 100644 index 3ee6a7c65440b..0000000000000 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.Current.net45.cs +++ /dev/null @@ -1,64 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System.Runtime.Remoting; -using System.Runtime.Remoting.Messaging; -using System.Security; - -namespace System.Diagnostics -{ - public partial class Activity - { - /// - /// Gets or sets the current operation (Activity) for the current thread. This flows - /// across async calls. - /// - public static Activity Current - { -#if ALLOW_PARTIALLY_TRUSTED_CALLERS - [System.Security.SecuritySafeCriticalAttribute] -#endif - get - { - ObjectHandle activityHandle = (ObjectHandle)CallContext.LogicalGetData(FieldKey); - - // Unwrap the Activity if it was set in the same AppDomain (as FieldKey is AppDomain-specific). - if (activityHandle != null) - { - return (Activity)activityHandle.Unwrap(); - } - return null; - } - -#if ALLOW_PARTIALLY_TRUSTED_CALLERS - [System.Security.SecuritySafeCriticalAttribute] -#endif - set - { - if (ValidateSetCurrent(value)) - { - SetCurrent(value); - } - } - } - -#region private - -#if ALLOW_PARTIALLY_TRUSTED_CALLERS - [System.Security.SecuritySafeCriticalAttribute] -#endif - private static void SetCurrent(Activity activity) - { - // Applications may implicitly or explicitly call other AppDomains - // that do not have DiagnosticSource DLL, therefore may not be able to resolve Activity type stored in the logical call context. - // To avoid it, we wrap Activity with ObjectHandle. - CallContext.LogicalSetData(FieldKey, new ObjectHandle(activity)); - } - - // Slot name depends on the AppDomain Id in order to prevent AppDomains to use the same Activity - // Cross AppDomain calls are considered as 'external' i.e. only Activity Id and Baggage should be propagated and - // new Activity should be started for the RPC calls (incoming and outgoing) - private static readonly string FieldKey = $"{typeof(Activity).FullName}_{AppDomain.CurrentDomain.Id}"; -#endregion //private - } -} diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs index 2c3ee45d30119..e4b5b8c4951ba 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs @@ -219,7 +219,6 @@ public void Message(string? Message) WriteEvent(1, Message); } -#if !NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT /// /// Events from DiagnosticSource can be forwarded to EventSource using this event. /// @@ -232,7 +231,7 @@ private void Event(string SourceName, string EventName, IEnumerable /// This is only used on V4.5 systems that don't have the ability to log KeyValuePairs directly. /// It will eventually go away, but we should always reserve the ID for this. @@ -243,7 +242,6 @@ private void EventJson(string SourceName, string EventName, string ArgmentsJson) WriteEvent(3, SourceName, EventName, ArgmentsJson); } -#if !NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT /// /// Used to mark the beginning of an activity /// @@ -321,7 +319,6 @@ private void RecursiveActivity1Stop(string SourceName, string EventName, IEnumer { WriteEvent(9, SourceName, EventName, Arguments); } -#endif /// /// Fires when a new DiagnosticSource becomes available. @@ -343,11 +340,7 @@ private void NewDiagnosticListener(string SourceName) [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Arguments parameter is trimmer safe")] #endif -#if NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT - [Event(11, Keywords = Keywords.Events)] -#else [Event(11, Keywords = Keywords.Events, ActivityOptions = EventActivityOptions.Recursive)] -#endif private void ActivityStart(string SourceName, string ActivityName, IEnumerable> Arguments) => WriteEvent(11, SourceName, ActivityName, Arguments); @@ -361,65 +354,16 @@ private void ActivityStart(string SourceName, string ActivityName, IEnumerable> Arguments) => WriteEvent(12, SourceName, ActivityName, Arguments); #region private -#if NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT - /// - /// Converts a keyvalue bag to JSON. Only used on V4.5 EventSources. - /// - private static string ToJson(IEnumerable> keyValues) - { - StringBuilder sb = new StringBuilder(); - sb.AppendLine("{"); - bool first = true; - foreach (var keyValue in keyValues) - { - if (!first) - sb.Append(',').AppendLine(); - first = false; - - sb.Append('"').Append(keyValue.Key).Append("\":\""); - - // Write out the value characters, escaping things as needed. - foreach (var c in keyValue.Value) - { - if (char.IsControl(c)) - { - if (c == '\n') - sb.Append("\\n"); - else if (c == '\r') - sb.Append("\\r"); - else - sb.Append("\\u").Append(((int)c).ToString("x").PadLeft(4, '0')); - } - else - { - if (c == '"' || c == '\\') - sb.Append('\\'); - sb.Append(c); - } - } - sb.Append('"'); // Close the string. - } - sb.AppendLine().AppendLine("}"); - return sb.ToString(); - } -#endif - private DiagnosticSourceEventSource() -#if !NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT // This constructor uses EventSourceSettings which is only available on V4.6 and above // Use the EventSourceSettings to turn on support for complex types, if available (v4.6 and above). : base(EventSourceSettings.EtwSelfDescribingEventFormat) -#endif { } @@ -672,7 +616,6 @@ public FilterAndTransform(string filterAndPayloadSpec, int startIdx, int endIdx, Action>>? writeEvent = null; if (activityName != null && activityName.Contains("Activity")) { -#if !NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT writeEvent = activityName switch { nameof(Activity1Start) => _eventSource.Activity1Start, @@ -683,7 +626,6 @@ public FilterAndTransform(string filterAndPayloadSpec, int startIdx, int endIdx, nameof(RecursiveActivity1Stop) => _eventSource.RecursiveActivity1Stop, _ => null }; -#endif if (writeEvent == null) _eventSource.Message("DiagnosticSource: Could not find Event to log Activity " + activityName); @@ -691,14 +633,7 @@ public FilterAndTransform(string filterAndPayloadSpec, int startIdx, int endIdx, if (writeEvent == null) { -#if !NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT writeEvent = _eventSource.Event; -#else - writeEvent = delegate (string sourceName, string eventName, IEnumerable> arguments) - { - _eventSource.EventJson(sourceName, eventName, ToJson(arguments)); - }; -#endif } // Set up a subscription that watches for the given Diagnostic Sources and events which will call back diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/Instrument.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/Instrument.cs index 8851f300f1ee8..34a5b044d4acf 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/Instrument.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/Instrument.cs @@ -13,11 +13,7 @@ namespace System.Diagnostics.Metrics #endif public abstract class Instrument { -#if NO_ARRAY_EMPTY_SUPPORT - internal static KeyValuePair[] EmptyTags { get; } = new KeyValuePair[0]; -#else internal static KeyValuePair[] EmptyTags { get; } = Array.Empty>(); -#endif // NO_ARRAY_EMPTY_SUPPORT // The SyncObject is used to synchronize the following operations: // - Instrument.Publish() diff --git a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj index 531c900233a77..7cb832aae46ac 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj @@ -2,14 +2,14 @@ - uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks) - + true - runtimes/win/lib/net45 + runtimes/win/lib/net461 diff --git a/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj b/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj index 6a28430c46830..53da13e6ccb81 100644 --- a/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj +++ b/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj @@ -2,15 +2,15 @@ - uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks) - + true - runtimes/win/lib/net45 + runtimes/win/lib/net461 diff --git a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj index 47efdc89d86fe..280e5cca8709c 100644 --- a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj +++ b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj @@ -2,15 +2,15 @@ - uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks) - + true - runtimes/win/lib/net45 + runtimes/win/lib/net461 diff --git a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj index 79cc61de537d1..6335a71313f60 100644 --- a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj +++ b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj @@ -2,12 +2,12 @@ - net46;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - + \ No newline at end of file diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj index fa560a52611c6..3d0cb8b6ff79f 100644 --- a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net46 + netstandard2.0;net461 enable @@ -8,8 +8,8 @@ - - + + \ No newline at end of file diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.net46.cs b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.net461.cs similarity index 100% rename from src/libraries/System.IO.Packaging/ref/System.IO.Packaging.net46.cs rename to src/libraries/System.IO.Packaging/ref/System.IO.Packaging.net461.cs diff --git a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj index f563b9ebc16c1..1f52d164d2d93 100644 --- a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -1,12 +1,12 @@ true - netstandard2.0;net46 + netstandard2.0;net461 enable - true + true @@ -38,7 +38,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Management/pkg/System.Management.pkgproj b/src/libraries/System.Management/pkg/System.Management.pkgproj index f1ede93884058..b30d827d1ffba 100644 --- a/src/libraries/System.Management/pkg/System.Management.pkgproj +++ b/src/libraries/System.Management/pkg/System.Management.pkgproj @@ -2,14 +2,14 @@ - uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks) - + true - runtimes/win/lib/net45 + runtimes/win/lib/net461 diff --git a/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj b/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj index 6f15c9c669941..29115a97cc5a9 100644 --- a/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj +++ b/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj @@ -2,10 +2,10 @@ - uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks) - + true - + diff --git a/src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj b/src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj index d29b573dd5acf..2698bb77f4f04 100644 --- a/src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj +++ b/src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj @@ -2,15 +2,15 @@ - uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks) + uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks) - + true - runtimes/win/lib/net45 + runtimes/win/lib/net461 diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj index 95b425ded6954..6f18ba2fb8eea 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj @@ -3,7 +3,7 @@ - net45;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj index 3b9a084c85457..50264a40f84c3 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj @@ -3,8 +3,7 @@ true false enable - netstandard2.1;netstandard2.0;net461;net45 - true + netstandard2.1;netstandard2.0;net461 diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj index 7efe0fd535302..1717166026e0e 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj @@ -1,6 +1,6 @@  - $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0;net45 + $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0;net461 true IMPL @@ -14,9 +14,9 @@ System.Runtime netstandard - + mscorlib - #define net45 + #define $(TargetFramework) @@ -24,7 +24,7 @@ + Condition="'$(TargetFramework)' != 'netstandard2.0'" /> - netcoreapp2.0;net45;uap10.0.16299;$(AllXamarinFrameworks) + netcoreapp2.0;net461;uap10.0.16299;$(AllXamarinFrameworks) - + true