Added multi-targeting for .NET 4.5

- The perviously targeted .NET Standard 1.0 should work almost everywhere. However, on the full .NET Framework, it included a lot of unnecessary packages under the .NET Standard Library, which is less than desirable.
shravan2x · Aug 28, 2017 · 9367a30 · 9367a30
1 parent e157f3b
commit 9367a30
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/Gameloop.Vdf/Gameloop.Vdf.csproj b/Gameloop.Vdf/Gameloop.Vdf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.0</TargetFramework>
+    <TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
     <Description>A high-performance  framework for the Valve Data Format, also called KeyValues.</Description>
     <Copyright>Copyright © Shravan Rajinikanth 2016</Copyright>
     <Company>Gameloop</Company>
@@ -20,19 +20,25 @@
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>NETSTANDARD1_0</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DocumentationFile>bin\Release\netstandard1.0\Gameloop.Vdf.xml</DocumentationFile>
-    <DefineConstants>RELEASE;NETSTANDARD1_0</DefineConstants>
+    <DefineConstants>RELEASE</DefineConstants>
     <NoWarn>1591;1701;1702;1705</NoWarn>
     <Optimize>true</Optimize>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+    <AssemblyTitle>Vdf.NET</AssemblyTitle>
+    <DefineConstants>HAVE_FULL_REFLECTION</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
+    <AssemblyTitle>Vdf.NET .NET Standard 1.0</AssemblyTitle>
+    <DefineConstants>NETSTANDARD1_0;PORTABLE</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
     <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/Gameloop.Vdf/Utilities/ReflectionUtils.cs b/Gameloop.Vdf/Utilities/ReflectionUtils.cs
@@ -25,9 +25,11 @@
 
 using System;
 using System.Linq;
+using System.Reflection;
 
 namespace Gameloop.Vdf.Utilities
 {
+#if PORTABLE
     [Flags]
     internal enum BindingFlags
     {
@@ -52,6 +54,7 @@ internal enum BindingFlags
         OptionalParamBinding = 262144,
         IgnoreReturn = 16777216
     }
+#endif
 
     internal static class ReflectionUtils
     {

diff --git a/Gameloop.Vdf/Utilities/TypeExtensions.cs b/Gameloop.Vdf/Utilities/TypeExtensions.cs
@@ -31,13 +31,21 @@ namespace Gameloop.Vdf.Utilities
 {
     internal static class TypeExtensions
     {
+#if DOTNET || PORTABLE
+#if !DOTNET
         private const BindingFlags DefaultFlags = BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+#endif
+#endif
 
+#if (DOTNET || PORTABLE)
         public static MethodInfo GetBaseDefinition(this MethodInfo method)
         {
             return method.GetRuntimeBaseDefinition();
         }
+#endif
 
+#if (DOTNET || PORTABLE)
+#if !DOTNET
         public static MethodInfo GetMethod(this Type type, string name)
         {
             return type.GetMethod(name, DefaultFlags);
@@ -52,6 +60,8 @@ public static IEnumerable<MethodInfo> GetMethods(this Type type, BindingFlags bi
         {
             return type.GetTypeInfo().DeclaredMethods;
         }
+#endif
+#endif
 
         public static Type BaseType(this Type type)
         {