Fixes wrong unregistration of events in COM add-in and update binarie…

…s to a more stable version
OpenWrap · Sep 14, 2011 · 0486a79 · 0486a79
1 parent daa6bab
commit 0486a79
Show file tree

Hide file tree

Showing 31 changed files with 37 additions and 59 deletions.
diff --git a/demo/src/OpenWrap.Demo/OpenWrap.Demo_mm_cache.bin b/demo/src/OpenWrap.Demo/OpenWrap.Demo_mm_cache.bin
diff --git a/src/OpenWrap.Commands/Wrap/BuildWrapCommand.cs b/src/OpenWrap.Commands/Wrap/BuildWrapCommand.cs
@@ -104,7 +104,8 @@ IEnumerable<ICommandOutput> Build()
             var packageFilePath = destinationPath.GetFile(
                 PackageNameUtility.PackageFileName(packageName, generatedVersion.ToString()));
 
-            var packageContent = GeneratePackageContent(_buildResults).Concat(
+            var packageContent = GeneratePackageContent(_buildResults)
+                                 .Concat(
                                     GenerateVersionFile(generatedVersion),
                                     GenerateDescriptorFile(packageDescriptorForEmbedding)
                                  ).ToList();

diff --git a/src/OpenWrap.VisualStudio.SolutionAddIn/OpenWrapVisualStudioAddIn.cs b/src/OpenWrap.VisualStudio.SolutionAddIn/OpenWrapVisualStudioAddIn.cs
@@ -95,13 +95,10 @@ public void OnStartupComplete(ref Array custom)
         {
         }
 
-        static ResolveEventHandler HandleSelfLoad()
+        static Assembly HandleSelfLoad(object src, ResolveEventArgs ev)
         {
-            return (src, ev) =>
-            {
                 var currentAssembly = typeof(AddInAppDomainManager).Assembly;
                 return (new AssemblyName(ev.Name).Name == currentAssembly.GetName().Name) ? currentAssembly : null;
-            };
         }
 
         string GetRootLocation(string fullName)
@@ -137,9 +134,9 @@ void LoadAppDomain()
 
                 // replace that with the location in the codebase we just registered, ensuring the correct version is loaded
                 var location = Type.GetTypeFromProgID(_progId).Assembly.Location;
-                AppDomain.CurrentDomain.AssemblyResolve += HandleSelfLoad();
+                AppDomain.CurrentDomain.AssemblyResolve += HandleSelfLoad;
                 _appDomainManager = (IDisposable)_appDomain.CreateInstanceFromAndUnwrap(location, typeof(AddInAppDomainManager).FullName);
-                AppDomain.CurrentDomain.AssemblyResolve -= HandleSelfLoad();
+                AppDomain.CurrentDomain.AssemblyResolve -= HandleSelfLoad;
                 _appDomain.DomainUnload += HandleAppDomainChange;
             }
             catch (Exception e)

diff --git a/src/OpenWrap/Commands/Cli/ShellRunner.cs b/src/OpenWrap/Commands/Cli/ShellRunner.cs
@@ -1,26 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Mono.Cecil;
 using OpenFileSystem.IO;
 using OpenFileSystem.IO.FileSystems.Local;
-using OpenRasta.Client;
 using OpenWrap.Commands.Cli.Locators;
-using OpenWrap.PackageManagement;
-using OpenWrap.PackageManagement.AssemblyResolvers;
-using OpenWrap.PackageManagement.DependencyResolvers;
-using OpenWrap.PackageManagement.Deployers;
-using OpenWrap.PackageManagement.Exporters;
-using OpenWrap.PackageManagement.Exporters.Assemblies;
-using OpenWrap.PackageManagement.Exporters.Commands;
-using OpenWrap.Repositories;
-using OpenWrap.Repositories.FileSystem;
-using OpenWrap.Repositories.Http;
-using OpenWrap.Repositories.NuFeed;
 using OpenWrap.Runtime;
 using OpenWrap.Services;
-using OpenWrap.Tasks;
 
 namespace OpenWrap.Commands.Cli
 {
@@ -39,20 +23,20 @@ public static int Main(string[] args)
         public static int Main(IDictionary<string, object> env)
         {
             var serviceRegistry = new ServiceRegistry().Override<IEnvironment>(() =>
-                {
-                    var cdenv = new CurrentDirectoryEnvironment(LocalFileSystem.Instance.GetDirectory(env.CurrentDirectory()));
-                    if (env.SysPath() != null)
-                        cdenv.SystemRepositoryDirectory = LocalFileSystem.Instance.GetDirectory(new Path(env.SysPath()).Combine("wraps"));
-                    return cdenv;
-                });
+            {
+                var cdenv = new CurrentDirectoryEnvironment(LocalFileSystem.Instance.GetDirectory(env.CurrentDirectory()));
+                if (env.SysPath() != null)
+                    cdenv.SystemRepositoryDirectory = LocalFileSystem.Instance.GetDirectory(new Path(env.SysPath()).Combine("wraps"));
+                return cdenv;
+            });
             var formatterType = env.Formatter();
-            if(formatterType != null)
+            if (formatterType != null)
             {
-                serviceRegistry.Override<ICommandOutputFormatter>(() => (ICommandOutputFormatter)Activator.CreateInstance(Type.GetType(formatterType)));
+                serviceRegistry.Override(() => (ICommandOutputFormatter)Activator.CreateInstance(Type.GetType(formatterType)));
             }
             serviceRegistry.Initialize();
 
-            return new ConsoleCommandExecutor(ServiceLocator.GetService<IEnumerable<ICommandLocator>>(),  ServiceLocator.GetService<IEventHub>(),ServiceLocator.GetService<ICommandOutputFormatter>())
+            return new ConsoleCommandExecutor(ServiceLocator.GetService<IEnumerable<ICommandLocator>>(), ServiceLocator.GetService<IEventHub>(), ServiceLocator.GetService<ICommandOutputFormatter>())
                 .Execute(env.CommandLine(), env.ShellArgs());
         }
 #pragma warning restore 28

diff --git a/src/OpenWrap/Repositories/DirectoryExtensions.cs b/src/OpenWrap/Repositories/DirectoryExtensions.cs
@@ -7,13 +7,7 @@ public static class DirectoryExtensions
     {
         public static IDirectory FindProjectRepositoryDirectory(this IDirectory root)
         {
-            // TODO: Review if we should not *only* take the wraps folder where the .wrapdesc is
-            return root == null
-                           ? null
-                           : root.AncestorsAndSelf()
-                                     .SelectMany(x => x.Directories("wraps"))
-                                     .Where(x => x != null)
-                                     .FirstOrDefault();
+            return root == null ? null : root.GetDirectory("wraps");
         }
     }
 }
diff --git a/src/OpenWrap/Runtime/CurrentDirectoryEnvironment.cs b/src/OpenWrap/Runtime/CurrentDirectoryEnvironment.cs
@@ -50,16 +50,20 @@ public IPackageRepository ProjectRepository
         {
             get
             {
-                TryInitializeProject(); return _projectRepository; 
+                if (_projectRepository == null)
+                    TryInitializeProject();
+
+                return _projectRepository;
             }
+            set { _projectRepository = value; }
         }
-
+        
         public IPackageRepository SystemRepository { get; private set; }
         public IDirectory SystemRepositoryDirectory { get; set; }
 
         public void Initialize()
         {
-            
+
             FileSystem = LocalFileSystem.Instance;
             SystemRepositoryDirectory = SystemRepositoryDirectory ?? FileSystem.GetDirectory(DefaultInstallationPaths.SystemRepositoryDirectory);
 
@@ -69,16 +73,16 @@ public void Initialize()
 
             SystemRepository = new FolderRepository(SystemRepositoryDirectory)
             {
-                    Name = "System repository"
+                Name = "System repository"
             };
 
             ConfigurationDirectory = FileSystem.GetDirectory(DefaultInstallationPaths.ConfigurationDirectory);
 
 
             ExecutionEnvironment = new ExecutionEnvironment
             {
-                    Platform = IntPtr.Size == 4 ? "x86" : "x64",
-                    Profile = Environment.Version.Major >= 4 ? "net40" : "net35"
+                Platform = IntPtr.Size == 4 ? "x86" : "x64",
+                Profile = Environment.Version.Major >= 4 ? "net40" : "net35"
             };
         }
 
@@ -96,19 +100,16 @@ void TryInitializeProjectRepository()
         {
             if (Descriptor.UseProjectRepository)
             {
-                var projectRepositoryDirectory = DescriptorFile.Parent.FindProjectRepositoryDirectory();
+                var projectRepositoryDirectory = DescriptorFile.Parent.FindProjectRepositoryDirectory().MustExist();
 
 
-                if (projectRepositoryDirectory != null)
+                var repositoryOptions = FolderRepositoryOptions.AnchoringEnabled;
+                if (Descriptor.UseSymLinks)
+                    repositoryOptions |= FolderRepositoryOptions.UseSymLinks;
+                _projectRepository = new FolderRepository(projectRepositoryDirectory, repositoryOptions)
                 {
-                    var repositoryOptions = FolderRepositoryOptions.AnchoringEnabled;
-                    if (Descriptor.UseSymLinks)
-                        repositoryOptions |= FolderRepositoryOptions.UseSymLinks;
-                    _projectRepository = new FolderRepository(projectRepositoryDirectory, repositoryOptions)
-                    {
-                            Name = "Project repository"
-                    };
-                }
+                    Name = "Project repository"
+                };
             }
         }
     }

diff --git a/src/OpenWrap/Services/ServiceRegistry.cs b/src/OpenWrap/Services/ServiceRegistry.cs
@@ -93,6 +93,7 @@ public ServiceRegistry()
                                                    Get<IPackageManager>().CommandExports(Get<IEnvironment>())
                                                        .SelectMany(x => x)
                                                        .Select(x => x.Descriptor)));
+
             Register(() => new RuntimeAssemblyResolver());
             Register<IPackageDescriptorMonitor>(() => new PackageDescriptorMonitor());
             Register<ICommandOutputFormatter>(() => new ConsoleCommandOutputFormatter());

diff --git a/wraps/openwrap/bin-net35/OpenWrap.VisualStudio.Shared.dll b/wraps/openwrap/bin-net35/OpenWrap.VisualStudio.Shared.dll
diff --git a/wraps/openwrap/bin-net35/OpenWrap.VisualStudio.Shared.pdb b/wraps/openwrap/bin-net35/OpenWrap.VisualStudio.Shared.pdb
diff --git a/wraps/openwrap/bin-net35/OpenWrap.VisualStudio.SolutionAddIn.dll b/wraps/openwrap/bin-net35/OpenWrap.VisualStudio.SolutionAddIn.dll
diff --git a/wraps/openwrap/bin-net35/OpenWrap.VisualStudio.SolutionAddIn.pdb b/wraps/openwrap/bin-net35/OpenWrap.VisualStudio.SolutionAddIn.pdb
diff --git a/wraps/openwrap/bin-net35/OpenWrap.dll b/wraps/openwrap/bin-net35/OpenWrap.dll
diff --git a/wraps/openwrap/bin-net35/OpenWrap.pdb b/wraps/openwrap/bin-net35/OpenWrap.pdb
diff --git a/wraps/openwrap/build/OpenWrap.Build.Bootstrap.dll b/wraps/openwrap/build/OpenWrap.Build.Bootstrap.dll
diff --git a/wraps/openwrap/build/OpenWrap.Build.Bootstrap.pdb b/wraps/openwrap/build/OpenWrap.Build.Bootstrap.pdb
diff --git a/wraps/openwrap/build/OpenWrap.Build.Tasks.dll b/wraps/openwrap/build/OpenWrap.Build.Tasks.dll
diff --git a/wraps/openwrap/build/OpenWrap.Build.Tasks.pdb b/wraps/openwrap/build/OpenWrap.Build.Tasks.pdb
diff --git a/wraps/openwrap/commands/OpenWrap.Commands.dll b/wraps/openwrap/commands/OpenWrap.Commands.dll
diff --git a/wraps/openwrap/commands/OpenWrap.Commands.pdb b/wraps/openwrap/commands/OpenWrap.Commands.pdb
diff --git a/wraps/openwrap/openwrap.wrapdesc b/wraps/openwrap/openwrap.wrapdesc
@@ -1,12 +1,12 @@
-depends: sharpziplib
+depends: sharpziplib = 0.86
 depends: openfilesystem
 depends: openwrap content
 anchored: true
 build: msbuild; profile=net35; project=src\OpenWrap\OpenWrap.csproj; project=src\OpenWrap.VisualStudio.Shared\OpenWrap.VisualStudio.Shared.csproj; project=src\OpenWrap.Build.Tasks\OpenWrap.Build.Tasks.csproj; project=src\OpenWrap.Commands\OpenWrap.Commands.csproj; project=src\OpenWrap.VisualStudio.SolutionPlugins\OpenWrap.SolutionPlugins.VisualStudio.csproj
 name: openwrap
 depends: tdnet-framework
 use-symlinks: true
-depends: Mono.Cecil
+depends: Mono.Cecil = 0.9.4
 directory-structure: src\*{scope: Tests=tests}*\**
 directory-structure: src\{scope: Tests.VisualStudio=tests}\**
-version: 2.0.0.81011175
+version: 2.0.0.81138879
diff --git a/wraps/openwrap/solution/OpenWrap.Resharper.450.dll b/wraps/openwrap/solution/OpenWrap.Resharper.450.dll
diff --git a/wraps/openwrap/solution/OpenWrap.Resharper.450.pdb b/wraps/openwrap/solution/OpenWrap.Resharper.450.pdb
diff --git a/wraps/openwrap/solution/OpenWrap.Resharper.500.dll b/wraps/openwrap/solution/OpenWrap.Resharper.500.dll
diff --git a/wraps/openwrap/solution/OpenWrap.Resharper.500.pdb b/wraps/openwrap/solution/OpenWrap.Resharper.500.pdb
diff --git a/wraps/openwrap/solution/OpenWrap.Resharper.510.dll b/wraps/openwrap/solution/OpenWrap.Resharper.510.dll
diff --git a/wraps/openwrap/solution/OpenWrap.Resharper.510.pdb b/wraps/openwrap/solution/OpenWrap.Resharper.510.pdb
diff --git a/wraps/openwrap/solution/OpenWrap.Resharper.600.dll b/wraps/openwrap/solution/OpenWrap.Resharper.600.dll
diff --git a/wraps/openwrap/solution/OpenWrap.Resharper.600.pdb b/wraps/openwrap/solution/OpenWrap.Resharper.600.pdb
diff --git a/wraps/openwrap/solution/OpenWrap.SolutionPlugins.VisualStudio.dll b/wraps/openwrap/solution/OpenWrap.SolutionPlugins.VisualStudio.dll
diff --git a/wraps/openwrap/solution/OpenWrap.SolutionPlugins.VisualStudio.pdb b/wraps/openwrap/solution/OpenWrap.SolutionPlugins.VisualStudio.pdb
diff --git a/wraps/openwrap/version b/wraps/openwrap/version
@@ -1 +1 @@
-2.0.0.81011175
+2.0.0.81138879