Merge pull request #192 from AArnott/analyzerFixes

Analyzer fixes

src/Microsoft.VisualStudio.Composition.Analyzers/AssemblyInfo.cs

@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Resources;
+
+[assembly: NeutralResourcesLanguage("en-US")]

src/Microsoft.VisualStudio.Composition.Analyzers/Utils.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition.Analyzers
 {

src/Microsoft.VisualStudio.Composition.Analyzers/VSMEF001PropertyMustHaveSetter.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition.Analyzers
 {

src/Microsoft.VisualStudio.Composition.AppHost/CreateComposition.cs

@@ -1,10 +1,14 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // Elements of this file taken from:
 // https://github.com/dotnet/buildtools/blob/647d79ca86350646be4b87b889221d9a1de9b710/src/common/AssemblyResolver.cs#L31-L107
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file https://github.com/dotnet/buildtools/blob/master/LICENSE for more information.
 
+#pragma warning disable CA1819 // Properties should not return arrays
+#pragma warning disable CA1001 // Types that own disposable fields should be disposable
+
 namespace Microsoft.VisualStudio.Composition.AppHost
 {
     using System;
@@ -62,17 +66,17 @@ public CreateComposition()
         /// <summary>Gets a token that is canceled when MSBuild is requesting that we abort.</summary>
         public CancellationToken CancellationToken => this.cts.Token;
 
-        public ITaskItem[] CatalogAssemblies { get; set; } = new ITaskItem[0];
+        public ITaskItem[] CatalogAssemblies { get; set; } = Array.Empty<ITaskItem>();
 
         /// <summary>
         /// Gets or sets the paths to assemblies that may be loaded as part of MEF discovery (because they are referenced by an assembly in the <see cref="CatalogAssemblies"/>.)
         /// </summary>
-        public ITaskItem[] ReferenceAssemblies { get; set; } = new ITaskItem[0];
+        public ITaskItem[] ReferenceAssemblies { get; set; } = Array.Empty<ITaskItem>();
 
         /// <summary>
         /// Gets or sets a list of paths to directories to search for MEF catalog assemblies.
         /// </summary>
-        public ITaskItem[] CatalogAssemblySearchPath { get; set; } = new ITaskItem[0];
+        public ITaskItem[] CatalogAssemblySearchPath { get; set; } = Array.Empty<ITaskItem>();
 
         /// <summary>
         /// Gets or sets a list of codes to suppress warnings for.

src/Microsoft.VisualStudio.Composition.AppHost/CreateContainerFactoryBootstrapFile.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition.AppHost
 {

src/Microsoft.VisualStudio.Composition.AppHost/ExceptionHelpers.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition.AppHost
 {

src/Microsoft.VisualStudio.Composition.Configuration/TypeForwarders.cs

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using System.Runtime.CompilerServices;
 using Microsoft.VisualStudio.Composition;
 

src/Microsoft.VisualStudio.Composition.NetFxAttributes/TypeForwarders.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.ComponentModel.Composition;
 using System.Runtime.CompilerServices;

src/Microsoft.VisualStudio.Composition/ArrayRental`1.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/AttributeServices.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ByValueEquality+AssemblyNameComparer.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ByValueEquality+BufferComparer.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ByValueEquality.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/CollectionServices.cs

@@ -1,4 +1,5 @@
-// This file originated from System.ComponentModel.Composition.dll
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ComposableCatalog.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ComposablePartDefinition.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ComposedPart.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {
@@ -181,13 +182,14 @@ private static string GetDiagnosticLocation(ImportDefinitionBinding import)
         {
             Requires.NotNull(import, nameof(import));
 
+            var memberName = import.ImportingParameter is object ? ("ctor(" + import.ImportingParameter.Name + ")") :
+                             import.ImportingMemberRef is object ? import.ImportingMemberRef.Name :
+                             "(unknown)";
             return string.Format(
                 CultureInfo.CurrentCulture,
                 "{0}.{1}",
                 import.ComposablePartType.FullName,
-                import.ImportingParameter is object ? ("ctor(" + import.ImportingParameter.Name + ")") :
-                import.ImportingMemberRef is object ? import.ImportingMemberRef.Name :
-                "(unknown)");
+                memberName);
         }
 
         private static string? GetDiagnosticLocation(ExportDefinitionBinding export)

src/Microsoft.VisualStudio.Composition/ComposedPartDiagnostic.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/CompositionConfiguration.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/CompositionConstants.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/CompositionFailedException.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/CompressedUInt.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Configuration/AttributedPartDiscovery.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Configuration/AttributedPartDiscoveryV1.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Configuration/CachedCatalog.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Configuration/CachedComposition.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Configuration/ExportMetadataViewInterfaceEmitProxy.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Configuration/MetadataViewGenerator.cs

@@ -1,4 +1,7 @@
-/********************************************************
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+/********************************************************
 *                                                        *
 *   © Copyright (C) Microsoft. All rights reserved.      *
 *                                                        *

src/Microsoft.VisualStudio.Composition/Configuration/MetadataViewImplProxy.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Configuration/NetFxAdapters.cs

@@ -1,4 +1,7 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#pragma warning disable CA2208 // Instantiate argument exceptions correctly
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Configuration/SerializationContextBase.cs

@@ -1,4 +1,7 @@
-#if DEBUG
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if DEBUG
 ////#define TRACESTATS
 ////#define TRACESERIALIZATION
 #endif

src/Microsoft.VisualStudio.Composition/ContractNameServices.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/CreationPolicy.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/DelegateServices.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/DelegatingExportProvider.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Dgml.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/DiscoveredParts.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/DiscoveryProgress.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/DisposableWithAction.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/Export.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ExportDefinition.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ExportDefinitionBinding.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ExportFactory.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ExportMetadataValueImportConstraint.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ExportProvider+NonSharedExport.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {

src/Microsoft.VisualStudio.Composition/ExportProvider+NonSharedLazy`2.cs

@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.Composition
 {