Permalink
Browse files

Normalized namespaces

  • Loading branch information...
1 parent f86a592 commit 97a12317f20bddf9b756538b47db748145117d03 @khellang khellang committed Mar 3, 2014
Showing with 29 additions and 67 deletions.
  1. +0 −1 src/ScriptCs.Core/PackageAssemblyResolver.cs
  2. +1 −2 src/ScriptCs.Core/PackageReference.cs
  3. +0 −1 src/ScriptCs.Core/ScriptServices.cs
  4. +3 −3 src/ScriptCs.Hosting/IInitializationServices.cs
  5. +1 −1 src/ScriptCs.Hosting/IModuleLoader.cs
  6. +1 −3 src/ScriptCs.Hosting/IRuntimeServices.cs
  7. +1 −1 src/ScriptCs.Hosting/IScriptServicesBuilder.cs
  8. +1 −6 src/ScriptCs.Hosting/InitializationServices.cs
  9. +4 −4 src/ScriptCs.Hosting/LoggerConfigurator.cs
  10. +1 −5 src/ScriptCs.Hosting/ModuleLoader.cs
  11. +1 −2 src/ScriptCs.Hosting/ObjectSerializer.cs
  12. +0 −2 src/ScriptCs.Hosting/Package/NugetInstallationProvider.cs
  13. +1 −1 src/ScriptCs.Hosting/Package/PackageContainer.cs
  14. +0 −1 src/ScriptCs.Hosting/Package/PackageObject.cs
  15. +1 −3 src/ScriptCs.Hosting/RuntimeServices.cs
  16. +1 −1 src/ScriptCs.Hosting/ScriptConsole.cs
  17. +1 −1 src/ScriptCs.Hosting/ScriptConsoleAppender.cs
  18. +1 −8 src/ScriptCs.Hosting/ScriptServicesBuilder.cs
  19. +1 −3 src/ScriptCs.Hosting/ScriptServicesRegistration.cs
  20. +1 −2 src/ScriptCs.Hosting/ServiceOverrides.cs
  21. +0 −1 src/ScriptCs/Command/InstallCommand.cs
  22. +1 −0 src/ScriptCs/Program.cs
  23. +1 −1 test/ScriptCs.Core.Tests/PackageAssemblyResolverTests.cs
  24. +0 −1 test/ScriptCs.Core.Tests/PackageReferenceTests.cs
  25. +1 −4 test/ScriptCs.Hosting.Tests/PackageInstallerTests.cs
  26. +1 −4 test/ScriptCs.Hosting.Tests/RuntimeServicesTests.cs
  27. +1 −3 test/ScriptCs.Hosting.Tests/ScriptServicesBuilderTests.cs
  28. +1 −0 test/ScriptCs.Tests/ArgumentHandlerTests.cs
  29. +1 −0 test/ScriptCs.Tests/ArgumentParserTests.cs
  30. +1 −0 test/ScriptCs.Tests/ConfigFileParserTests.cs
  31. +0 −2 test/ScriptCs.Tests/InstallCommandTests.cs
@@ -4,7 +4,6 @@
using Common.Logging;
using ScriptCs.Contracts;
using ScriptCs.Exceptions;
-using ScriptCs.Package;
namespace ScriptCs
{
@@ -1,9 +1,8 @@
using System;
using System.Runtime.Versioning;
-
using ScriptCs.Contracts;
-namespace ScriptCs.Package
+namespace ScriptCs
{
public class PackageReference : IPackageReference
{
@@ -1,6 +1,5 @@
using Common.Logging;
using ScriptCs.Contracts;
-using ScriptCs.Package;
namespace ScriptCs
{
@@ -1,7 +1,7 @@
-namespace ScriptCs
-{
- using ScriptCs.Contracts;
+using ScriptCs.Contracts;
+namespace ScriptCs.Hosting
+{
public interface IInitializationServices
{
IAssemblyResolver GetAssemblyResolver();
@@ -1,6 +1,6 @@
using ScriptCs.Contracts;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public interface IModuleLoader
{
@@ -1,6 +1,4 @@
-using Autofac;
-
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public interface IRuntimeServices
{
@@ -1,6 +1,6 @@
using ScriptCs.Contracts;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public interface IScriptServicesBuilder : IServiceOverrides<IScriptServicesBuilder>
{
@@ -1,16 +1,11 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using Autofac;
using Common.Logging;
-
using ScriptCs.Contracts;
using ScriptCs.Hosting.Package;
-using ScriptCs.Package;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public class InitializationServices : ScriptServicesRegistration, IInitializationServices
{
@@ -6,9 +6,9 @@
using log4net.Layout;
using log4net.Repository.Hierarchy;
using ScriptCs.Contracts;
-using ICommonLog = Common.Logging.ILog;
+using ILog = Common.Logging.ILog;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public class LoggerConfigurator : ILoggerConfigurator
{
@@ -18,7 +18,7 @@ public class LoggerConfigurator : ILoggerConfigurator
private readonly LogLevel _logLevel;
- private ICommonLog _logger;
+ private ILog _logger;
public LoggerConfigurator(LogLevel logLevel)
{
@@ -42,7 +42,7 @@ public void Configure(IConsole console)
_logger = new CodeConfigurableLog4NetLogger(logger);
}
- public ICommonLog GetLogger()
+ public ILog GetLogger()
{
return _logger;
}
@@ -2,16 +2,12 @@
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.ComponentModel.Composition.Hosting;
-using System.ComponentModel.Composition.Primitives;
using System.Linq;
using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
using Common.Logging;
-
using ScriptCs.Contracts;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public class ModuleLoader : IModuleLoader
{
@@ -1,8 +1,7 @@
using Newtonsoft.Json;
-
using ScriptCs.Contracts;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public class ObjectSerializer : IObjectSerializer
{
@@ -6,8 +6,6 @@
using NuGet;
using ScriptCs.Contracts;
-using ScriptCs.Package;
-
using IFileSystem = ScriptCs.Contracts.IFileSystem;
namespace ScriptCs.Hosting.Package
@@ -8,7 +8,7 @@
using ScriptCs.Contracts;
using IFileSystem = ScriptCs.Contracts.IFileSystem;
-using PackageReference = ScriptCs.Package.PackageReference;
+using PackageReference = ScriptCs.PackageReference;
namespace ScriptCs.Hosting.Package
{
@@ -5,7 +5,6 @@
using NuGet;
using ScriptCs.Contracts;
-using ScriptCs.Package;
namespace ScriptCs.Hosting.Package
{
@@ -1,16 +1,14 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition.Hosting;
-using System.ComponentModel.Composition.Primitives;
using System.Linq;
-using System.Reflection;
using Autofac;
using Autofac.Integration.Mef;
using Common.Logging;
using ScriptCs.Contracts;
using ScriptCs.Hosting.Package;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public class RuntimeServices : ScriptServicesRegistration, IRuntimeServices
{
@@ -1,7 +1,7 @@
using System;
using ScriptCs.Contracts;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public class ScriptConsole : IConsole
{
@@ -3,7 +3,7 @@
using log4net.Core;
using ScriptCs.Contracts;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public class ScriptConsoleAppender : AppenderSkeleton
{
@@ -1,17 +1,10 @@
using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using Common.Logging;
using ScriptCs.Contracts;
using ScriptCs.Engine.Roslyn;
-using ScriptCs.Hosting;
-using log4net.Core;
-
using LogLevel = ScriptCs.Contracts.LogLevel;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public class ScriptServicesBuilder : ServiceOverrides<IScriptServicesBuilder>, IScriptServicesBuilder
{
@@ -1,11 +1,9 @@
using System;
using System.Collections.Generic;
-
using Autofac;
-
using Common.Logging;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public abstract class ScriptServicesRegistration
{
@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
-
using ScriptCs.Contracts;
-namespace ScriptCs
+namespace ScriptCs.Hosting
{
public abstract class ServiceOverrides<TConfig> : IServiceOverrides<TConfig>
where TConfig : class, IServiceOverrides<TConfig>
@@ -5,7 +5,6 @@
using Common.Logging;
using ScriptCs.Contracts;
-using ScriptCs.Package;
namespace ScriptCs.Command
{
View
@@ -2,6 +2,7 @@
using System.Runtime;
using ScriptCs.Argument;
using ScriptCs.Command;
+using ScriptCs.Hosting;
namespace ScriptCs
{
@@ -10,7 +10,7 @@
using Should;
using Xunit;
using IFileSystem = ScriptCs.Contracts.IFileSystem;
-using PackageReference = ScriptCs.Package.PackageReference;
+using PackageReference = ScriptCs.PackageReference;
namespace ScriptCs.Tests
{
@@ -1,6 +1,5 @@
using System;
using System.Runtime.Versioning;
-using ScriptCs.Package;
using Should;
using Xunit;
@@ -1,16 +1,13 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using Common.Logging;
using Moq;
using NuGet;
using ScriptCs.Contracts;
using ScriptCs.Hosting.Package;
-using Should;
using Xunit;
-using PackageReference = ScriptCs.Package.PackageReference;
-namespace ScriptCs.Tests
+namespace ScriptCs.Hosting.Tests
{
public class PackageInstallerTests
{
@@ -1,16 +1,13 @@
using System;
using System.Collections.Generic;
-
using Autofac;
using Common.Logging;
using Moq;
using ScriptCs.Contracts;
-using ScriptCs.Package;
-
using Should;
using Xunit;
-namespace ScriptCs.Tests
+namespace ScriptCs.Hosting.Tests
{
public class RuntimeServicesTests
{
@@ -2,11 +2,9 @@
using Moq;
using ScriptCs.Contracts;
using Should;
-using ScriptCs.Package;
-
using Xunit;
-namespace ScriptCs.Tests
+namespace ScriptCs.Hosting.Tests
{
public class ScriptServicesBuilderTests
{
@@ -1,6 +1,7 @@
using Moq;
using ScriptCs.Argument;
using ScriptCs.Contracts;
+using ScriptCs.Hosting;
using Should;
using Xunit;
@@ -1,6 +1,7 @@
using Moq;
using ScriptCs.Argument;
using ScriptCs.Contracts;
+using ScriptCs.Hosting;
using Should;
using Xunit;
@@ -1,5 +1,6 @@
using ScriptCs.Argument;
using ScriptCs.Contracts;
+using ScriptCs.Hosting;
using Xunit;
using Should;
@@ -9,8 +9,6 @@
using ScriptCs.Command;
using ScriptCs.Contracts;
-using ScriptCs.Package;
-
using Xunit.Extensions;
namespace ScriptCs.Tests

0 comments on commit 97a1231

Please sign in to comment.