Skip to content

Commit

Permalink
Changed namespace of FileSystemMirroring project
Browse files Browse the repository at this point in the history
This is required to prevent MEF composition errors when RTVS is also loaded.
  • Loading branch information
Boddlnagg committed Oct 19, 2016
1 parent 18ed078 commit a41e41a
Show file tree
Hide file tree
Showing 53 changed files with 78 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Collections.Immutable;
using System.IO;
using System.Linq;
using Microsoft.VisualStudio.ProjectSystem;
#if VS14
using Microsoft.VisualStudio.ProjectSystem.Designers;
using Microsoft.VisualStudio.ProjectSystem.Utilities.Designers;
Expand All @@ -13,7 +14,7 @@
using Microsoft.VisualStudio.ProjectSystem;
#endif

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring {
namespace VisualRust.ProjectSystem.FileSystemMirroring {
public static class ProjectTreeExtensions {
public static bool IsProjectSelected(this IImmutableSet<IProjectTree> nodes) {
return nodes != null && nodes.Count == 1 && nodes.First().Root == nodes.First();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.IO;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public interface IMsBuildFileSystemFilter {
bool IsFileAllowed(string relativePath, FileAttributes attributes);
bool IsDirectoryAllowed(string relativePath, FileAttributes attributes);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public sealed partial class MsBuildFileSystemWatcher {
private class AttributesChanged : IFileSystemChange {
private readonly MsBuildFileSystemWatcherEntries _entries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
using System.Collections.Generic;
using Microsoft.Common.Core;
using Microsoft.Common.Core.IO;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Utilities;
using VisualRust.ProjectSystem.FileSystemMirroring.Utilities;
#if VS14
using Microsoft.VisualStudio.ProjectSystem.Utilities;
#endif
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public sealed partial class MsBuildFileSystemWatcher {
private class DirectoryCreated : IFileSystemChange {
private readonly MsBuildFileSystemWatcherEntries _entries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#endif
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public sealed partial class MsBuildFileSystemWatcher {
private class DirectoryDeleted : IFileSystemChange {
private readonly MsBuildFileSystemWatcherEntries _entries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

using Microsoft.Common.Core;
using Microsoft.Common.Core.IO;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Utilities;
using VisualRust.ProjectSystem.FileSystemMirroring.Utilities;
#if VS14
using Microsoft.VisualStudio.ProjectSystem.Utilities;
#endif
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public sealed partial class MsBuildFileSystemWatcher {
private class DirectoryRenamed : IFileSystemChange {
private readonly MsBuildFileSystemWatcherEntries _entries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using Microsoft.Common.Core.IO;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Utilities;
using VisualRust.ProjectSystem.FileSystemMirroring.Utilities;
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public sealed partial class MsBuildFileSystemWatcher {
private class FileCreated : IFileSystemChange {
private readonly MsBuildFileSystemWatcherEntries _entries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using Microsoft.Common.Core;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Utilities;
using VisualRust.ProjectSystem.FileSystemMirroring.Utilities;
#if VS14
using Microsoft.VisualStudio.ProjectSystem.Utilities;
#endif
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public sealed partial class MsBuildFileSystemWatcher {
private class FileDeleted : IFileSystemChange {
private readonly MsBuildFileSystemWatcherEntries _entries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

using Microsoft.Common.Core;
using Microsoft.Common.Core.IO;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Utilities;
using VisualRust.ProjectSystem.FileSystemMirroring.Utilities;
#if VS14
using Microsoft.VisualStudio.ProjectSystem.Utilities;
#endif
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public sealed partial class MsBuildFileSystemWatcher {
private class FileRenamed : IFileSystemChange {
private readonly MsBuildFileSystemWatcherEntries _entries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@
using Microsoft.Common.Core;
using Microsoft.Common.Core.IO;
using Microsoft.Common.Core.Logging;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Logging;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Utilities;
using Microsoft;
using VisualRust.ProjectSystem.FileSystemMirroring.Logging;
using VisualRust.ProjectSystem.FileSystemMirroring.Utilities;

#if VS14
using Microsoft.VisualStudio.ProjectSystem.Utilities;
#endif
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public sealed partial class MsBuildFileSystemWatcher : IDisposable {
private readonly string _directory;
private readonly string _filter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#if VS14
using Microsoft.VisualStudio.ProjectSystem.Utilities;
#endif
using static Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO.MsBuildFileSystemWatcherEntries.EntryState;
using static Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO.MsBuildFileSystemWatcherEntries.EntryType;
using static VisualRust.ProjectSystem.FileSystemMirroring.IO.MsBuildFileSystemWatcherEntries.EntryState;
using static VisualRust.ProjectSystem.FileSystemMirroring.IO.MsBuildFileSystemWatcherEntries.EntryType;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO {
namespace VisualRust.ProjectSystem.FileSystemMirroring.IO {
public class MsBuildFileSystemWatcherEntries {
private readonly Dictionary<string, Entry> _entries = new Dictionary<string, Entry>(StringComparer.OrdinalIgnoreCase);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Runtime.InteropServices;
using System.Text;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Interop {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Interop {
internal static class NativeMethods {
public const int MAX_PATH = 260;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.Build.Construction;
using Microsoft.Common.Core.Logging;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Logging {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Logging {
internal static class FileSystemMirroringProjectLoggingExtensions {
public static void ApplyProjectChangesStarted(this IActionLog log) {
log.WriteLineAsync(LogVerbosity.Normal, MessageCategory.General, "Starting applying changes to file-mirroring project");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using System.Collections.Generic;
using System.Text;
using Microsoft.Common.Core.Logging;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO;
using VisualRust.ProjectSystem.FileSystemMirroring.IO;
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Logging {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Logging {
internal static class MsBuildFileSystemWatcherLoggingExtensions {
public static void WatcherStarting(this IActionLog log) {
log.WriteLineAsync(LogVerbosity.Normal, MessageCategory.General, "MsBuildFileSystemWatcher starting");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
public class XDefaultValueProperty : XProperty {
public XDefaultValueProperty(string name, string defaultValue)
: base(name, Invariant($"'$({name})' == ''"), defaultValue) { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Xml.Linq;
using static Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;
using static VisualRust.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
public class XImport : XElement {
public XImport(string project) : base(MsBuildNamespace + "Import", Attr("Project", project)) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
public class XImportExisting : XImport {

public XImportExisting(string project) : base(project, Invariant($"Exists('{project}')")) { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Text;
using System.Xml.Linq;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
public class XProjDocument : XDocument {
public XProjDocument()
: base(new XDeclaration("1.0", "utf-8", null)) { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Xml.Linq;
using static Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;
using static VisualRust.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
public class XProjElement : XElement {
public XProjElement(string name) : base(MsBuildNamespace + name) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Linq;
using System.Xml.Linq;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
internal class XProjHelpers {
public static XNamespace MsBuildNamespace = "http://schemas.microsoft.com/developer/msbuild/2003";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Xml.Linq;
using static Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;
using static VisualRust.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
public class XProject : XElement {
public XProject() : base(MsBuildNamespace + "Project") { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Xml.Linq;
using static Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;
using static VisualRust.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
public class XProperty : XElement {
public XProperty(string name) : base(MsBuildNamespace + name) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Xml.Linq;
using static Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;
using static VisualRust.ProjectSystem.FileSystemMirroring.MsBuild.XProjHelpers;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild {
namespace VisualRust.ProjectSystem.FileSystemMirroring.MsBuild {
public class XPropertyGroup : XElement {
public XPropertyGroup(params object[] elements) : base(MsBuildNamespace + "PropertyGroup", elements) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System;
using Microsoft.VisualStudio.Shell;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Package.Registration {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Package.Registration {
public sealed class DeveloperActivityAttribute : RegistrationAttribute {
private readonly string _projectType;
private readonly int _templateSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using Microsoft.VisualStudio.Shell;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Package.Registration {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Package.Registration {
public sealed class ProvideCpsProjectFactoryAttribute : RegistrationAttribute {
public string ProjectTypeGuid { get; }
public string LanguageVsTemplate { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System;
using Microsoft.VisualStudio.Shell;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Package.Registration {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Package.Registration {
public sealed class ProvideProjectFileGeneratorAttribute : RegistrationAttribute {
public Type GeneratorType { get; }
public string FileNames { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Linq;
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Package.Registration {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Package.Registration {
public sealed partial class RegistrationAttributeBuilder {
public class RegKey {
public string Key { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Generic;
using Microsoft.VisualStudio.Shell;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Package.Registration {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Package.Registration {
public sealed partial class RegistrationAttributeBuilder {
private readonly List<RegKey> _keys = new List<RegKey>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
using Microsoft.Common.Core;
using Microsoft.Common.Core.Logging;
using Microsoft.VisualStudio.ProjectSystem;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.IO;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Logging;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild;
using VisualRust.ProjectSystem.FileSystemMirroring.IO;
using VisualRust.ProjectSystem.FileSystemMirroring.Logging;
using VisualRust.ProjectSystem.FileSystemMirroring.MsBuild;
#if VS14
using Microsoft.VisualStudio.ProjectSystem.Utilities;
#endif

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Project {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Project {
public class FileSystemMirroringProject : IFileSystemMirroringProjectTemporaryItems {
private readonly static XProjDocument EmptyProject;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
using System.Linq;
using System.Xml.Linq;
using Microsoft.Common.Core;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.MsBuild;
using Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Shell;
using VisualRust.ProjectSystem.FileSystemMirroring.MsBuild;
using VisualRust.ProjectSystem.FileSystemMirroring.Shell;
using static System.FormattableString;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Project {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Project {
public abstract class FileSystemMirroringProjectFileGenerator : IVsProjectGenerator {
private readonly Guid _projectType;
private readonly string _projectUiSubcaption;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#endif
using ItemData = System.Tuple<string, string, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>>;

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Project {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Project {
public abstract class FileSystemMirroringProjectSourceItemProviderExtensionBase
: IProjectSourceItemProviderExtension, IProjectFolderItemProviderExtension {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.IO;
using Microsoft.VisualStudio.ProjectSystem;
#if VS14
using Microsoft.VisualStudio.ProjectSystem.Utilities;
#endif

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Project {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Project {
public static class FileSystemMirroringProjectUtilities {
public static string GetProjectDirectory(this UnconfiguredProject unconfiguredProject) {
return PathHelper.EnsureTrailingSlash(Path.GetDirectoryName(unconfiguredProject.FullPath));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

namespace Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Project {
namespace VisualRust.ProjectSystem.FileSystemMirroring.Project {
/// <summary>
/// Allows creation of nested items in the project. Exported via MEF.
/// </summary>
Expand Down
Loading

0 comments on commit a41e41a

Please sign in to comment.