Merge pull request #22 from kenangell/master

Fixed bug in source extraction.
SymbolSource · Aug 24, 2013 · 0a62737 · 0a62737
2 parents c1e49dd + 5d05ded
commit 0a62737
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 35 deletions.
diff --git a/Sources/SymbolSource.Processing.Basic/ManagedSourceExtractor.cs b/Sources/SymbolSource.Processing.Basic/ManagedSourceExtractor.cs
@@ -39,7 +39,7 @@ private static bool IsTemporaryCompilerFile(string sourceFileName)
         {
             //the VB compiler will include temporary files in its pdb files.
             //the source file name will be similar to 17d14f5c-a337-4978-8281-53493378c1071.vb.
-            return !sourceFileName.EndsWith("17d14f5c-a337-4978-8281-53493378c1071.vb", StringComparison.InvariantCultureIgnoreCase);
+            return sourceFileName.EndsWith("17d14f5c-a337-4978-8281-53493378c1071.vb", StringComparison.InvariantCultureIgnoreCase);
         }
     }
 }
diff --git a/Sources/SymbolSource.Server.Basic/MicroKernel.cs b/Sources/SymbolSource.Server.Basic/MicroKernel.cs
@@ -11,11 +11,18 @@
 
 namespace SymbolSource.Server.Basic
 {
-    public class MicroKernel
+    public static class MicroKernel
     {
+        private static IWindsorContainer _container;
+
+        public static IWindsorContainer Container
+        {
+            get { return _container ?? (_container = new WindsorContainer()); }
+        }
+
         public static IKernel Install()
         {
-            var container = new WindsorContainer();
+            var container = Container;
             container.Kernel.Resolver.AddSubResolver(new CollectionResolver(container.Kernel));
             container.Install(new ProcessingBasicInstaller());
 
@@ -51,38 +58,45 @@ public static IKernel Install()
             return container.Kernel;
         }
 
-        private static void RegisterManagers(IWindsorContainer kernel)
+        private static void RegisterManagers(IWindsorContainer container)
         {
-            kernel.Register(
-               Component.For<IGatewayBackendFactory<IWinDbgBackend>, IGatewayBackendFactory<IPackageBackend>>()
-                   .ImplementedBy<BasicBackendFactory>()
-               );
-
-            kernel.Register(
-                Component.For<INuGetGatewayManager>()
-                    .ImplementedBy<NuGetGatewayManager>()                    
-                );
-
-            kernel.Register(
-                Component.For<INuGetGatewayVersionExtractor, IGatewayVersionExtractor>()
-                    .ImplementedBy<NuGetGatewayVersionExtractor>()
-                );
-
-            kernel.Register(
-                Component.For<IOpenWrapGatewayManager>()
-                    .ImplementedBy<OpenWrapGatewayManager>()
-                );
-
-            kernel.Register(
-                Component.For<IBasicBackendConfiguration>()
-                    .ImplementedBy<BasicBackendConfiguration>()
-                );
-
-            kernel.Register(
-                Component.For<IGatewayConfigurationFactory>()
-                    .ImplementedBy<AppSettingsConfigurationFactory>()
-                );
+            container
+
+                .Register(
+                    Component.For<IGatewayBackendFactory<IWinDbgBackend>, IGatewayBackendFactory<IPackageBackend>>()
+                       .ImplementedBy<BasicBackendFactory>()
+                       .OnlyNewServices()
+                   )
+
+                .Register(
+                    Component.For<INuGetGatewayManager>()
+                        .ImplementedBy<NuGetGatewayManager>()
+                        .OnlyNewServices()
+                    )
+
+                .Register(
+                    Component.For<INuGetGatewayVersionExtractor, IGatewayVersionExtractor>()
+                        .ImplementedBy<NuGetGatewayVersionExtractor>()
+                        .OnlyNewServices()
+                    )
+
+                .Register(
+                    Component.For<IOpenWrapGatewayManager>()
+                        .ImplementedBy<OpenWrapGatewayManager>()
+                        .OnlyNewServices()
+                    )
+
+                .Register(
+                    Component.For<IBasicBackendConfiguration>()
+                        .ImplementedBy<BasicBackendConfiguration>()
+                        .OnlyNewServices()
+                    )
+
+                .Register(
+                    Component.For<IGatewayConfigurationFactory>()
+                        .ImplementedBy<AppSettingsConfigurationFactory>()
+                        .OnlyNewServices()
+                    );
         }
     }
-
 }
diff --git a/SymbolSource.Server.Basic.nuspec b/SymbolSource.Server.Basic.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SymbolSource.Server.Basic</id>
-    <version>1.3.2</version>
+    <version>1.3.2.2</version>
     <authors>SymbolSource</authors>
     <owners>SymbolSource</owners>
     <projectUrl>http://www.symbolsource.org/Public/Blog/View/2012-03-13/Releasing_the_community_edition_of_SymbolSource</projectUrl>