diff --git a/Core/BkwdComp/ExcludeFromCodeCoverageAttribute.PreNet40.cs b/Core/BkwdComp/ExcludeFromCodeCoverageAttribute.PreNet40.cs index cb79fabd..8153d779 100644 --- a/Core/BkwdComp/ExcludeFromCodeCoverageAttribute.PreNet40.cs +++ b/Core/BkwdComp/ExcludeFromCodeCoverageAttribute.PreNet40.cs @@ -1,4 +1,4 @@ -#if (NET20 || NET35) +#if (NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1) namespace System.Diagnostics.CodeAnalysis { /// Compensates for missing attribute in .NET 2.0 diff --git a/Core/Vanara.Core.csproj b/Core/Vanara.Core.csproj index 099b6f6d..fc097949 100644 --- a/Core/Vanara.Core.csproj +++ b/Core/Vanara.Core.csproj @@ -10,7 +10,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp2.0;netcoreapp2.1 Vanara.Core $(AssemblyName) Vanara diff --git a/PInvoke/BITS/Vanara.PInvoke.BITS.csproj b/PInvoke/BITS/Vanara.PInvoke.BITS.csproj index 613a2331..c0c8855f 100644 --- a/PInvoke/BITS/Vanara.PInvoke.BITS.csproj +++ b/PInvoke/BITS/Vanara.PInvoke.BITS.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.BITS $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/Cryptography/Vanara.PInvoke.Cryptography.csproj b/PInvoke/Cryptography/Vanara.PInvoke.Cryptography.csproj index aaa56214..0f6d4b2f 100644 --- a/PInvoke/Cryptography/Vanara.PInvoke.Cryptography.csproj +++ b/PInvoke/Cryptography/Vanara.PInvoke.Cryptography.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.Cryptography $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/IpHlpApi/Vanara.PInvoke.IpHlpApi.csproj b/PInvoke/IpHlpApi/Vanara.PInvoke.IpHlpApi.csproj index 531e523c..0483994a 100644 --- a/PInvoke/IpHlpApi/Vanara.PInvoke.IpHlpApi.csproj +++ b/PInvoke/IpHlpApi/Vanara.PInvoke.IpHlpApi.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.IpHlpApi $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/Kernel32/Vanara.PInvoke.Kernel32.csproj b/PInvoke/Kernel32/Vanara.PInvoke.Kernel32.csproj index 887d70f2..775013b6 100644 --- a/PInvoke/Kernel32/Vanara.PInvoke.Kernel32.csproj +++ b/PInvoke/Kernel32/Vanara.PInvoke.Kernel32.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.Kernel32 $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/Mpr/Vanara.PInvoke.Mpr.csproj b/PInvoke/Mpr/Vanara.PInvoke.Mpr.csproj index 94bf88e9..c717d037 100644 --- a/PInvoke/Mpr/Vanara.PInvoke.Mpr.csproj +++ b/PInvoke/Mpr/Vanara.PInvoke.Mpr.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.Mpr $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/NTDSApi/Vanara.PInvoke.NTDSApi.csproj b/PInvoke/NTDSApi/Vanara.PInvoke.NTDSApi.csproj index 549ecd20..79c13af2 100644 --- a/PInvoke/NTDSApi/Vanara.PInvoke.NTDSApi.csproj +++ b/PInvoke/NTDSApi/Vanara.PInvoke.NTDSApi.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.NTDSApi $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/NTDll/Vanara.PInvoke.NTDll.csproj b/PInvoke/NTDll/Vanara.PInvoke.NTDll.csproj index 2c63c6e9..8dd9a588 100644 --- a/PInvoke/NTDll/Vanara.PInvoke.NTDll.csproj +++ b/PInvoke/NTDll/Vanara.PInvoke.NTDll.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.NtDll $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/NetApi32/Vanara.PInvoke.NetApi32.csproj b/PInvoke/NetApi32/Vanara.PInvoke.NetApi32.csproj index 376e41db..ae54afe0 100644 --- a/PInvoke/NetApi32/Vanara.PInvoke.NetApi32.csproj +++ b/PInvoke/NetApi32/Vanara.PInvoke.NetApi32.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.NetApi32 $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/NetListMgr/NetListMgr.cs b/PInvoke/NetListMgr/NetListMgr.cs index 595cc24d..af9d62d2 100644 --- a/PInvoke/NetListMgr/NetListMgr.cs +++ b/PInvoke/NetListMgr/NetListMgr.cs @@ -177,7 +177,7 @@ namespace Vanara.PInvoke.NetListMgr public interface IEnumNetworkConnections : IEnumerable { [DispId(-4)] -#if !NETSTANDARD2_0 +#if (NET20 || NET35 || NET40 || NET45) [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalType = "", MarshalTypeRef = typeof(System.Runtime.InteropServices.CustomMarshalers.EnumeratorToEnumVariantMarshaler), MarshalCookie = "")] new IEnumerator GetEnumerator(); #else @@ -214,7 +214,7 @@ namespace Vanara.PInvoke.NetListMgr public interface IEnumNetworks : IEnumerable { [DispId(-4)] -#if !NETSTANDARD2_0 +#if (NET20 || NET35 || NET40 || NET45) [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalType = "", MarshalTypeRef = typeof(System.Runtime.InteropServices.CustomMarshalers.EnumeratorToEnumVariantMarshaler), MarshalCookie = "")] new IEnumerator GetEnumerator(); #else diff --git a/PInvoke/NetListMgr/Vanara.PInvoke.NetListMgr.csproj b/PInvoke/NetListMgr/Vanara.PInvoke.NetListMgr.csproj index 8e38f663..3a375543 100644 --- a/PInvoke/NetListMgr/Vanara.PInvoke.NetListMgr.csproj +++ b/PInvoke/NetListMgr/Vanara.PInvoke.NetListMgr.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.NetListMgr $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/Ole/Vanara.PInvoke.Ole.csproj b/PInvoke/Ole/Vanara.PInvoke.Ole.csproj index f2c17e95..57eb318d 100644 --- a/PInvoke/Ole/Vanara.PInvoke.Ole.csproj +++ b/PInvoke/Ole/Vanara.PInvoke.Ole.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.Ole $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/Security/Vanara.PInvoke.Security.csproj b/PInvoke/Security/Vanara.PInvoke.Security.csproj index 4714dc19..91987c11 100644 --- a/PInvoke/Security/Vanara.PInvoke.Security.csproj +++ b/PInvoke/Security/Vanara.PInvoke.Security.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.Security $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/Shared/Vanara.PInvoke.Shared.csproj b/PInvoke/Shared/Vanara.PInvoke.Shared.csproj index 4b1275c0..2de2269b 100644 --- a/PInvoke/Shared/Vanara.PInvoke.Shared.csproj +++ b/PInvoke/Shared/Vanara.PInvoke.Shared.csproj @@ -12,8 +12,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.Shared $(AssemblyName) Vanara.PInvoke @@ -73,4 +72,14 @@ ACCESS_MASK, DrawTextFlags, FacilityCode, FacilityCode, FileFlagsAndAttributes, 4.5.0 + + + 4.5.0 + + + + + 4.5.0 + + \ No newline at end of file diff --git a/PInvoke/ShlwApi/Vanara.PInvoke.ShlwApi.csproj b/PInvoke/ShlwApi/Vanara.PInvoke.ShlwApi.csproj index d9d107cd..51e8ea07 100644 --- a/PInvoke/ShlwApi/Vanara.PInvoke.ShlwApi.csproj +++ b/PInvoke/ShlwApi/Vanara.PInvoke.ShlwApi.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.ShlwApi $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/TaskSchd/Vanara.PInvoke.TaskSchd.csproj b/PInvoke/TaskSchd/Vanara.PInvoke.TaskSchd.csproj index ab571d26..3bea3036 100644 --- a/PInvoke/TaskSchd/Vanara.PInvoke.TaskSchd.csproj +++ b/PInvoke/TaskSchd/Vanara.PInvoke.TaskSchd.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.TaskSchd $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/User32/Vanara.PInvoke.User32.csproj b/PInvoke/User32/Vanara.PInvoke.User32.csproj index ab90b64a..a25a93b1 100644 --- a/PInvoke/User32/Vanara.PInvoke.User32.csproj +++ b/PInvoke/User32/Vanara.PInvoke.User32.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.User32 $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/VirtDisk/Vanara.PInvoke.VirtDisk.csproj b/PInvoke/VirtDisk/Vanara.PInvoke.VirtDisk.csproj index 7e70a8a6..8c5692a6 100644 --- a/PInvoke/VirtDisk/Vanara.PInvoke.VirtDisk.csproj +++ b/PInvoke/VirtDisk/Vanara.PInvoke.VirtDisk.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.VirtDisk $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/WinINet/Vanara.PInvoke.WinINet.csproj b/PInvoke/WinINet/Vanara.PInvoke.WinINet.csproj index c8e3a7f3..ab4269d1 100644 --- a/PInvoke/WinINet/Vanara.PInvoke.WinINet.csproj +++ b/PInvoke/WinINet/Vanara.PInvoke.WinINet.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.WinINet $(AssemblyName) Vanara.PInvoke diff --git a/PInvoke/Ws2_32/Vanara.PInvoke.Ws2_32.csproj b/PInvoke/Ws2_32/Vanara.PInvoke.Ws2_32.csproj index 039b7d05..09a4c1a6 100644 --- a/PInvoke/Ws2_32/Vanara.PInvoke.Ws2_32.csproj +++ b/PInvoke/Ws2_32/Vanara.PInvoke.Ws2_32.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.PInvoke.Ws2_32 $(AssemblyName) Vanara.PInvoke diff --git a/Security/ActiveDirectoryExtension.cs b/Security/ActiveDirectoryExtension.cs index 6479fc15..667119b4 100644 --- a/Security/ActiveDirectoryExtension.cs +++ b/Security/ActiveDirectoryExtension.cs @@ -1,4 +1,4 @@ -#if !(NETSTANDARD2_0) +#if (NET20 || NET35 || NET40 || NET45) using System; using System.Linq; using System.DirectoryServices.ActiveDirectory; diff --git a/Security/Principal/WindowsImpersonatedIdentity.cs b/Security/Principal/WindowsImpersonatedIdentity.cs index abc5f74f..144950b8 100644 --- a/Security/Principal/WindowsImpersonatedIdentity.cs +++ b/Security/Principal/WindowsImpersonatedIdentity.cs @@ -1,4 +1,4 @@ -#if !(NETSTANDARD2_0) +#if (NET20 || NET35 || NET40 || NET45) using System; using System.ComponentModel; using System.Security.Principal; diff --git a/Security/Vanara.Security.csproj b/Security/Vanara.Security.csproj index fdadcac6..2ae9ec0c 100644 --- a/Security/Vanara.Security.csproj +++ b/Security/Vanara.Security.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.Security $(AssemblyName) false diff --git a/System/Extensions/ProcessExtension.cs b/System/Extensions/ProcessExtension.cs index 367d9ee6..77b6b84b 100644 --- a/System/Extensions/ProcessExtension.cs +++ b/System/Extensions/ProcessExtension.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -#if !(NETSTANDARD2_0) +#if (NET20 || NET35 || NET40 || NET45) using System.Management; #endif using System.Runtime.InteropServices; @@ -42,7 +42,7 @@ namespace Vanara.Extensions } } -#if !(NET20 || NETSTANDARD2_0) +#if (NET35 || NET40 || NET45) /// Gets the child processes. /// The process. /// if set to true include descendants of child processes as well. @@ -101,7 +101,7 @@ namespace Vanara.Extensions } } -#if !(NETSTANDARD2_0) +#if (NET20 || NET35 || NET40 || NET45) /// /// Gets the parent process. /// diff --git a/System/Extensions/ServiceControllerExtension.cs b/System/Extensions/ServiceControllerExtension.cs index 0b0118c2..1a4bf00b 100644 --- a/System/Extensions/ServiceControllerExtension.cs +++ b/System/Extensions/ServiceControllerExtension.cs @@ -1,4 +1,4 @@ -#if !NETSTANDARD2_0 +#if (NET20 || NET35 || NET40 || NET45) using System.ComponentModel; using System.Runtime.InteropServices; using System.ServiceProcess; diff --git a/System/Registry/RegistryEventMonitor.cs b/System/Registry/RegistryEventMonitor.cs index 81a7dc23..adc52aa8 100644 --- a/System/Registry/RegistryEventMonitor.cs +++ b/System/Registry/RegistryEventMonitor.cs @@ -311,7 +311,7 @@ namespace Vanara.Registry case "HKEY_CURRENT_CONFIG": hive = RegistryHive.CurrentConfig; break; -#if !NETSTANDARD2_0 +#if (NET20 || NET35 || NET40 || NET45) case "HKEY_DYN_DATA": hive = RegistryHive.DynData; break; diff --git a/System/Vanara.SystemServices.csproj b/System/Vanara.SystemServices.csproj index 3b9cdf76..b1111047 100644 --- a/System/Vanara.SystemServices.csproj +++ b/System/Vanara.SystemServices.csproj @@ -5,7 +5,7 @@ Copyright © 2017-2018 $(AssemblyName) 2.1.0 - net20;net35;net40;net45;netstandard2.0 + net20;net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1 Vanara.SystemServices $(AssemblyName) false @@ -63,6 +63,12 @@ BackgroundCopyACLFlags, BackgroundCopyCost, BackgroundCopyErrorContext, Backgrou + + + + + +