log4net dependency

Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj

@@ -50,10 +50,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net" />
@@ -66,7 +62,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Apis\Logging\Log4NetLogger.cs" />
     <Compile Include="Apis\Util\Store\FileDataStore.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\CommonAssemblyInfo.cs">

Src/Support/GoogleApis.DotNet4/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.3" targetFramework="net45" />
+
 </packages>

Src/Support/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs

@@ -61,7 +61,7 @@ private void SetUp(bool useLogger)
             if (useLogger)
             {
 #if !NETSTANDARD
-                ApplicationContext.RegisterLogger(new Google.Apis.Logging.Log4NetLogger());
+                ApplicationContext.RegisterLogger(new Google.Apis.Tests.Logging.Log4NetLogger());
 #endif
             }
         }

Src/Support/GoogleApis.Tests/GoogleApis.Tests.csproj

@@ -117,6 +117,7 @@
     <Compile Include="Apis\Utils\RepeatableTest.cs" />
     <Compile Include="ApplicationContextTests.cs" />
     <Compile Include="Json\JsonExplicitNullTest.cs" />
+    <Compile Include="Logging\Log4NetLogger.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\CommonAssemblyInfo.cs">

Src/Support/GoogleApis.DotNet4/Apis/Logging/Log4NetLogger.cs → Src/Support/GoogleApis.Tests/Logging/Log4NetLogger.cs

@@ -1,87 +1,87 @@
-/*
-Copyright 2011 Google Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-using System;
-using System.Reflection;
-
-using log4net;
-
-using Google.Apis.Util;
-
-namespace Google.Apis.Logging
-{
-    /// <summary>A logger implementation which makes use of the log4net library.</summary>
-    public sealed class Log4NetLogger : ILogger
-    {
-        private readonly ILog log;
-
-        static Log4NetLogger()
-        {
-            log4net.Config.XmlConfigurator.Configure();
-        }
-
-        private Log4NetLogger(string name)
-        {
-            log = LogManager.GetLogger(name);
-        }
-
-        /// <summary>Creates a new default log4net logger.</summary>
-        public Log4NetLogger() : this("google-api-dotnet-client") { }
-
-        /// <summary>Creates a new log4net logger and associates it with the specified type.</summary>
-        public Log4NetLogger(Type t) : this(t.FullName) { }
-
-        public bool IsDebugEnabled
-        {
-            get { return log.IsDebugEnabled; }
-        }
-
-        public ILogger ForType(Type type)
-        {
-            return new Log4NetLogger(type);
-        }
-
-        public ILogger ForType<T>()
-        {
-            return new Log4NetLogger(typeof(T));
-        }
-
-        public void Info(string message, params object[] formatArgs)
-        {
-            log.Info(string.Format(message, formatArgs));
-        }
-
-        public void Warning(string message, params object[] formatArgs)
-        {
-            log.Warn(string.Format(message, formatArgs));
-        }
-
-        public void Debug(string message, params object[] formatArgs)
-        {
-            log.Debug(string.Format(message, formatArgs));
-        }
-
-        public void Error(Exception exception, string message, params object[] formatArgs)
-        {
-            log.Error(string.Format(message, formatArgs), exception);
-        }
-
-        public void Error(string message, params object[] formatArgs)
-        {
-            log.Error(string.Format(message, formatArgs));
-        }
-    }
-}
+/*
+Copyright 2011 Google Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#if !NETSTANDARD
+
+using System;
+using Google.Apis.Logging;
+using log4net;
+
+namespace Google.Apis.Tests.Logging
+{
+    /// <summary>A logger implementation which makes use of the log4net library.</summary>
+    public sealed class Log4NetLogger : ILogger
+    {
+        private readonly ILog log;
+
+        static Log4NetLogger()
+        {
+            log4net.Config.XmlConfigurator.Configure();
+        }
+
+        private Log4NetLogger(string name)
+        {
+            log = LogManager.GetLogger(name);
+        }
+
+        /// <summary>Creates a new default log4net logger.</summary>
+        public Log4NetLogger() : this("google-api-dotnet-client") { }
+
+        /// <summary>Creates a new log4net logger and associates it with the specified type.</summary>
+        public Log4NetLogger(Type t) : this(t.FullName) { }
+
+        public bool IsDebugEnabled
+        {
+            get { return log.IsDebugEnabled; }
+        }
+
+        public ILogger ForType(Type type)
+        {
+            return new Log4NetLogger(type);
+        }
+
+        public ILogger ForType<T>()
+        {
+            return new Log4NetLogger(typeof(T));
+        }
+
+        public void Info(string message, params object[] formatArgs)
+        {
+            log.Info(string.Format(message, formatArgs));
+        }
+
+        public void Warning(string message, params object[] formatArgs)
+        {
+            log.Warn(string.Format(message, formatArgs));
+        }
+
+        public void Debug(string message, params object[] formatArgs)
+        {
+            log.Debug(string.Format(message, formatArgs));
+        }
+
+        public void Error(Exception exception, string message, params object[] formatArgs)
+        {
+            log.Error(string.Format(message, formatArgs), exception);
+        }
+
+        public void Error(string message, params object[] formatArgs)
+        {
+            log.Error(string.Format(message, formatArgs));
+        }
+    }
+}
+#endif

Src/Support/GoogleApis/Google.Apis.nuspec

@@ -28,12 +28,6 @@
         <tags>Google</tags>
       <dependencies>
         <group targetFramework="net45">
-          <!--
-            log4net is required by the Net45 version of
-            Google.Apis.PlatformServices.
-          -->
-          <dependency id="log4net" version="2.0.3" />
-
           <dependency id="Google.Apis.Core" version="$version$" />
           <dependency id="Zlib.Portable.Signed" version="1.11.0" />
         </group>