icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-01-11 19:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix Preprocessors and NetStandard package references

Browse Source
This commit is contained in:
Drew Tingen
2022-07-11 14:48:10 -04:00
parent fa65a9de65
commit d2856c1983
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ICD.Common.Utils/AnsiUtils.cs
View File

@@ -70,7 +70,7 @@ namespace ICD.Common.Utils
/// </summary> /// </summary>
public static IDictionary<string, string> PuttyColors { get { return s_PuttyColors; } } public static IDictionary<string, string> PuttyColors { get { return s_PuttyColors; } }
#if !SIMPLSHARP #if NETSTANDARD
/// <summary> /// <summary>
/// Enables ANSI color in the console. /// Enables ANSI color in the console.
/// </summary> /// </summary>

2
ICD.Common.Utils/Extensions/RegistryExtensions.cs
View File

@@ -1,4 +1,4 @@
#if !SIMPLSHARP #if NETSTANDARD
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICD.Common.Properties; using ICD.Common.Properties;

14
ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj
View File

@@ -38,13 +38,13 @@
<PackageReference Condition="'$(TargetFramework)' == 'net472'" Include="Newtonsoft.Json" Version="13.0.1" Aliases="RealNewtonsoft" /> <PackageReference Condition="'$(TargetFramework)' == 'net472'" Include="Newtonsoft.Json" Version="13.0.1" Aliases="RealNewtonsoft" />
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Microsoft.Data.SQLite" Version="5.0.4" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Microsoft.Data.SQLite" Version="5.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="Pastel" Version="2.1.0" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Pastel" Version="2.1.0" />
<PackageReference Include="System.Management" Version="5.0.0" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Management" Version="5.0.0" />
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Security.Principal.Windows" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="CultureInfo.sqlite"> <None Update="CultureInfo.sqlite">

4
ICD.Common.Utils/ReflectionUtils.cs
View File

@@ -11,9 +11,11 @@ using Crestron.SimplSharp.Reflection;
using Activator = Crestron.SimplSharp.Reflection.Activator; using Activator = Crestron.SimplSharp.Reflection.Activator;
#else #else
using System.Reflection; using System.Reflection;
using Activator = System.Activator;
#endif
#if NETSTANDARD
using Microsoft.Extensions.DependencyModel; using Microsoft.Extensions.DependencyModel;
using System.Runtime.Loader; using System.Runtime.Loader;
using Activator = System.Activator;
#endif #endif
namespace ICD.Common.Utils namespace ICD.Common.Utils