diff --git a/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj b/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj index 496bd45206a..27777779868 100644 --- a/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj +++ b/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj @@ -50,10 +50,6 @@ false - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True - @@ -66,7 +62,6 @@ - diff --git a/Src/Support/GoogleApis.DotNet4/packages.config b/Src/Support/GoogleApis.DotNet4/packages.config index 981a91a1aa1..e529ecdc607 100644 --- a/Src/Support/GoogleApis.DotNet4/packages.config +++ b/Src/Support/GoogleApis.DotNet4/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Src/Support/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs b/Src/Support/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs index 86190983127..323943e1a42 100644 --- a/Src/Support/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs +++ b/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 } } diff --git a/Src/Support/GoogleApis.Tests/GoogleApis.Tests.csproj b/Src/Support/GoogleApis.Tests/GoogleApis.Tests.csproj index aff000795da..4fc3d878e71 100644 --- a/Src/Support/GoogleApis.Tests/GoogleApis.Tests.csproj +++ b/Src/Support/GoogleApis.Tests/GoogleApis.Tests.csproj @@ -117,6 +117,7 @@ + diff --git a/Src/Support/GoogleApis.DotNet4/Apis/Logging/Log4NetLogger.cs b/Src/Support/GoogleApis.Tests/Logging/Log4NetLogger.cs similarity index 93% rename from Src/Support/GoogleApis.DotNet4/Apis/Logging/Log4NetLogger.cs rename to Src/Support/GoogleApis.Tests/Logging/Log4NetLogger.cs index 12b43c9ff5d..5d41db15b4d 100644 --- a/Src/Support/GoogleApis.DotNet4/Apis/Logging/Log4NetLogger.cs +++ b/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 -{ - /// A logger implementation which makes use of the log4net library. - public sealed class Log4NetLogger : ILogger - { - private readonly ILog log; - - static Log4NetLogger() - { - log4net.Config.XmlConfigurator.Configure(); - } - - private Log4NetLogger(string name) - { - log = LogManager.GetLogger(name); - } - - /// Creates a new default log4net logger. - public Log4NetLogger() : this("google-api-dotnet-client") { } - - /// Creates a new log4net logger and associates it with the specified type. - 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() - { - 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 +{ + /// A logger implementation which makes use of the log4net library. + public sealed class Log4NetLogger : ILogger + { + private readonly ILog log; + + static Log4NetLogger() + { + log4net.Config.XmlConfigurator.Configure(); + } + + private Log4NetLogger(string name) + { + log = LogManager.GetLogger(name); + } + + /// Creates a new default log4net logger. + public Log4NetLogger() : this("google-api-dotnet-client") { } + + /// Creates a new log4net logger and associates it with the specified type. + 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() + { + 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 \ No newline at end of file diff --git a/Src/Support/GoogleApis/Google.Apis.nuspec b/Src/Support/GoogleApis/Google.Apis.nuspec index a2b6e4e7bda..de148015d30 100644 --- a/Src/Support/GoogleApis/Google.Apis.nuspec +++ b/Src/Support/GoogleApis/Google.Apis.nuspec @@ -28,12 +28,6 @@ Google - - -