Add System.Security.Principal.Windows nuget package instead of condit…

…ional .NET Standard code
song8356000 · May 18, 2019 · 465ec84 · 465ec84
1 parent 4b686a5
commit 465ec84
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/Nancy.Hosting.Self/Nancy.Hosting.Self.csproj b/src/Nancy.Hosting.Self/Nancy.Hosting.Self.csproj
@@ -4,4 +4,9 @@
     <PackageTags>$(PackageTags);Host</PackageTags>
     <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Security.Principal.Windows">
+      <Version>4.3.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/src/Nancy.Hosting.Self/NancyHost.cs b/src/Nancy.Hosting.Self/NancyHost.cs
@@ -218,11 +218,7 @@ private string GetUser()
         {
             return !string.IsNullOrWhiteSpace(this.configuration.UrlReservations.User)
                 ? this.configuration.UrlReservations.User
-#if CORE
-                : string.Empty;
-#else
                 : WindowsIdentity.GetCurrent().Name;
-#endif
         }
 
         /// <summary>

diff --git a/src/Nancy.Hosting.Self/UrlReservations.cs b/src/Nancy.Hosting.Self/UrlReservations.cs
@@ -1,20 +1,18 @@
 namespace Nancy.Hosting.Self
 {
     using System;
-#if !CORE
     using System.Security.Principal;
-#endif
 
     /// <summary>
     /// Configuration for automatic url reservation creation
     /// </summary>
     public class UrlReservations
     {
         private const string EveryoneAccountName = "Everyone";
-#if !CORE
+
         private static readonly IdentityReference EveryoneReference =
             new SecurityIdentifier(WellKnownSidType.WorldSid, null);
-#endif
+
         public UrlReservations()
         {
             this.CreateAutomatically = false;
@@ -39,13 +37,11 @@ private static string GetEveryoneAccountName()
             try
             {
 
-#if !CORE
                 var account = EveryoneReference.Translate(typeof(NTAccount)) as NTAccount;
                 if (account != null)
                 {
                     return account.Value;
                 }
-#endif
                 return EveryoneAccountName;
             }
             catch (Exception)