Fixed #32 by addressing conditional compilation. Upgraded NuGet packa…

…ges.
lextudio · Apr 1, 2017 · de7ac2a · de7ac2a
1 parent a48b86e
commit de7ac2a
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 54 deletions.
diff --git a/.nuget/Lextm.SharpSnmpLib.nuspec b/.nuget/Lextm.SharpSnmpLib.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
-    <version>9.0.8</version>
+    <version>9.1.0</version>
     <authors>Malcolm Crowe,Lex Li,and other contributors.</authors>
     <owners>Lex Li</owners>
     <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
@@ -21,9 +21,6 @@
     <tags>snmp</tags>
     <dependencies>
       <group targetFramework="net45" />
-      <group targetFramework="Xamarin.iOS10" />
-      <group targetFramework="Monoandroid" />
-      <group targetFramework="portable-net45+netcore45+MonoAndroid1+MonoTouch1" />
       <group targetFramework="netstandard1.3">
         <dependency id="NETStandard.Library" version="1.6.1" />
         <dependency id="System.ComponentModel.TypeConverter" version="4.3.0" />
@@ -38,16 +35,6 @@
     <file src="..\bin\SharpSnmpLib.Full.xml" target="lib\net45\SharpSnmpLib.Full.xml" />
     <file src="..\bin\SharpSnmpLib.Portable.dll" target="lib\net45\SharpSnmpLib.Portable.dll" />
     <file src="..\bin\SharpSnmpLib.Portable.xml" target="lib\net45\SharpSnmpLib.Portable.xml" />
-    <file src="..\bin\SharpSnmpLib.Portable.dll" target="lib\Xamarin.iOS10\SharpSnmpLib.Portable.dll" />
-    <file src="..\bin\SharpSnmpLib.Portable.xml" target="lib\Xamarin.iOS10\SharpSnmpLib.Portable.xml" />
-    <file src="..\bin\SharpSnmpLib.iOS.dll" target="lib\Xamarin.iOS10\SharpSnmpLib.iOS.dll" />
-    <file src="..\bin\SharpSnmpLib.Full.xml" target="lib\Xamarin.iOS10\SharpSnmpLib.iOS.xml" />
-    <file src="..\bin\SharpSnmpLib.Portable.dll" target="lib\Monoandroid\SharpSnmpLib.Portable.dll" />
-    <file src="..\bin\SharpSnmpLib.Android.dll" target="lib\Monoandroid\SharpSnmpLib.Android.dll" />
-    <file src="..\bin\SharpSnmpLib.Full.xml" target="lib\Monoandroid\SharpSnmpLib.Android.xml" />
-    <file src="..\bin\SharpSnmpLib.Portable.xml" target="lib\Monoandroid\SharpSnmpLib.Portable.xml" />
-    <file src="..\bin\SharpSnmpLib.Portable.dll" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\SharpSnmpLib.Portable.dll" />
-    <file src="..\bin\SharpSnmpLib.Portable.xml" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\SharpSnmpLib.Portable.xml" />
     <file src="..\bin\SharpSnmpLib.NetStandard.dll" target="lib\netstandard1.3\SharpSnmpLib.NetStandard.dll" />
     <file src="..\bin\SharpSnmpLib.NetStandard.xml" target="lib\netstandard1.3\SharpSnmpLib.NetStandard.xml" />
   </files>

diff --git a/SharpSnmpLib/Microsoft.VersionNumber.targets b/SharpSnmpLib/Microsoft.VersionNumber.targets
@@ -9,26 +9,26 @@
     <!-- Properties for controlling the Assembly Version -->
     <PropertyGroup>
         <AssemblyMajorVersion>9</AssemblyMajorVersion>
-        <AssemblyMinorVersion>0</AssemblyMinorVersion>
+        <AssemblyMinorVersion>1</AssemblyMinorVersion>
         <AssemblyBuildNumber>
         </AssemblyBuildNumber>
         <AssemblyRevision>
         </AssemblyRevision>
         <AssemblyBuildNumberType>DateString</AssemblyBuildNumberType>
-        <AssemblyBuildNumberFormat>04MMdd</AssemblyBuildNumberFormat>
+        <AssemblyBuildNumberFormat>00MMdd</AssemblyBuildNumberFormat>
         <AssemblyRevisionType>AutoIncrement</AssemblyRevisionType>
         <AssemblyRevisionFormat>00</AssemblyRevisionFormat>
     </PropertyGroup>
     <!-- Properties for controlling the Assembly File Version -->
     <PropertyGroup>
         <AssemblyFileMajorVersion>9</AssemblyFileMajorVersion>
-        <AssemblyFileMinorVersion>0</AssemblyFileMinorVersion>
+        <AssemblyFileMinorVersion>1</AssemblyFileMinorVersion>
         <AssemblyFileBuildNumber>
         </AssemblyFileBuildNumber>
         <AssemblyFileRevision>
         </AssemblyFileRevision>
         <AssemblyFileBuildNumberType>DateString</AssemblyFileBuildNumberType>
-        <AssemblyFileBuildNumberFormat>04MMdd</AssemblyFileBuildNumberFormat>
+        <AssemblyFileBuildNumberFormat>00MMdd</AssemblyFileBuildNumberFormat>
         <AssemblyFileRevisionType>AutoIncrement</AssemblyFileRevisionType>
         <AssemblyFileRevisionFormat>00</AssemblyFileRevisionFormat>
     </PropertyGroup>

diff --git a/SharpSnmpLib/Pipeline/HandlerMapping.cs b/SharpSnmpLib/Pipeline/HandlerMapping.cs
@@ -111,16 +111,26 @@ public HandlerMapping(string version, string command, string type, string assemb
 
         private static IMessageHandler CreateMessageHandler(string assemblyName, string type)
         {
+
+#if NETSTANDARD
             foreach (var assembly in from assembly in TypeResolver.GetAssemblies()
-                                          let name = assembly.GetName().Name
-                                          where string.Compare(name, assemblyName, StringComparison.OrdinalIgnoreCase) == 0
-                                          select assembly)
+                                     let name = assembly.GetName().Name
+                                     where string.Compare(name, assemblyName, StringComparison.OrdinalIgnoreCase) == 0
+                                     select assembly)
             {
                 return (IMessageHandler)Activator.CreateInstance(assembly.GetType(type));
             }
-#if NETSTANDARD
+
             return (IMessageHandler)Activator.CreateInstance(TypeResolver.Load(assemblyName, type));
 #else
+            foreach (var assembly in from assembly in AppDomain.CurrentDomain.GetAssemblies()
+                                let name = assembly.GetName().Name
+                                where string.Compare(name, assemblyName, StringComparison.OrdinalIgnoreCase) == 0
+                                select assembly)
+            {
+                return (IMessageHandler)Activator.CreateInstance(assembly.GetType(type));
+            }
+
             return (IMessageHandler)Activator.CreateInstance(AppDomain.CurrentDomain.Load(assemblyName).GetType(type));
 #endif
         }

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -57,27 +57,32 @@
       <HintPath>..\packages\JetBrains.dotMemoryUnit.2.3.20160517.113140\lib\dotMemory.Unit.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.7.1.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.7.1\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
-    <Reference Include="xunit.abstractions">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.execution.dotnet, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\netstandard1.1\xunit.execution.dotnet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -213,7 +218,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -2,12 +2,43 @@
 <packages>
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
   <package id="JetBrains.dotMemoryUnit" version="2.3.20160517.113140" targetFramework="net45" />
-  <package id="Moq" version="4.5.30" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
+  <package id="Moq" version="4.7.1" targetFramework="net45" />
+  <package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net45" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net45" />
+  <package id="System.IO" version="4.3.0" targetFramework="net45" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net45" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.3.1" targetFramework="net45" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net45" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net45" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
+  <package id="xunit" version="2.2.0" targetFramework="net45" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net45" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net45" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net45" developmentDependency="true" />
 </packages>
diff --git a/debug.bat b/debug.bat
@@ -12,7 +12,7 @@ rmdir /S /Q bin
 mkdir bin
 rmdir /S /Q SharpSnmpLib\obj
 rmdir /S /Q Tests\obj
-.nuget\nuget.exe restore SharpSnmpLib.sln
+.nuget\nuget.exe restore SharpSnmpLib.Classic.sln
 call "%MSBuildExe%" SharpSnmpLib.Classic.sln /t:clean /p:Configuration=Debug /p:OutputPath=..\bin\
 call "%MSBuildExe%" SharpSnmpLib.Classic.sln /t:build /p:Configuration=Debug /p:OutputPath=..\bin\
 call dotnet restore SharpSnmpLib.NetStandard.sln

diff --git a/lib/SharedAssemblyInfo.cs b/lib/SharedAssemblyInfo.cs
@@ -7,5 +7,5 @@
 // You can specify all the values or you can use the default the Revision and
 // Build Numbers by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.0.040308.00")]
-[assembly: AssemblyFileVersion("9.0.040308.00")]
+[assembly: AssemblyVersion("9.1.000401.01")]
+[assembly: AssemblyFileVersion("9.1.000401.01")]
diff --git a/lib/SharedAssemblyInfo.vb b/lib/SharedAssemblyInfo.vb
@@ -7,5 +7,5 @@ Imports System.Reflection
 ' You can specify all values by your own or you can build default build and revision
 ' numbers with the '*' character (the default):
 
-<Assembly: AssemblyVersion("9.0.040308.00")> 
-<Assembly: AssemblyFileVersion("9.0.040308.00")> 
+<Assembly: AssemblyVersion("9.1.000401.01")> 
+<Assembly: AssemblyFileVersion("9.1.000401.01")> 
diff --git a/snmpd/packages.config b/snmpd/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ActionListWinForms" version="1.3.0.0" targetFramework="net40" />
-  <package id="log4net" version="2.0.7" targetFramework="net45" />
+  <package id="log4net" version="2.0.8" targetFramework="net45" />
 </packages>
diff --git a/snmpd/snmpd.csproj b/snmpd/snmpd.csproj
@@ -99,8 +99,8 @@
     <None Include="Resources\network-server.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Office2007Renderer">
       <HintPath>..\lib\Office2007Renderer.dll</HintPath>