diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index ddf37ca..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,32 +0,0 @@ -image: Visual Studio 2017 -configuration: Release -platform: Any CPU - -install: - - ps: $env:build_version = (Select-Xml -Path ".\package.props" -XPath "/Project/PropertyGroup/Version" | Select-Object -ExpandProperty Node).InnerText - - ps: Update-AppveyorBuild -Version "$env:build_version.$env:APPVEYOR_BUILD_NUMBER" - -dotnet_csproj: - patch: false - -before_build: -- cmd: dotnet restore - -build: - project: package.sln - parallel: true - verbosity: minimal - -after_build: -- choco install opencover.portable -- choco install codecov - -test_script: -- OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --framework net47 --verbosity q" - -after_test: -- codecov -f "results.xml" - -artifacts: -- path: '**\Unity.*.nupkg' - name: 'Unity' diff --git a/src/AddInterfaceElement.cs b/src/AddInterfaceElement.cs index 020f15a..ea201d1 100644 --- a/src/AddInterfaceElement.cs +++ b/src/AddInterfaceElement.cs @@ -1,10 +1,10 @@ -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using System; using System.Collections.Generic; using System.Configuration; using System.Xml; using Unity; +using Unity.Configuration.Abstractions; using Unity.Injection; using Unity.Interception.ContainerIntegration; @@ -43,8 +43,6 @@ public override string Key /// calling this method, so deriving classes only need to write the element content, not /// the start or end tags. /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] public override void SerializeContent(XmlWriter writer) { (writer ?? throw new ArgumentNullException(nameof(writer))).WriteAttributeString(TypeNamePropertyName, this.TypeName); diff --git a/src/CallHandlerElementCollection.cs b/src/CallHandlerElementCollection.cs index 3f95186..88ee593 100644 --- a/src/CallHandlerElementCollection.cs +++ b/src/CallHandlerElementCollection.cs @@ -1,8 +1,7 @@ - - +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using System.Configuration; using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using Unity.Configuration.Abstractions; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration { diff --git a/src/InterceptionBehaviorElement.cs b/src/InterceptionBehaviorElement.cs index bb24342..176203b 100644 --- a/src/InterceptionBehaviorElement.cs +++ b/src/InterceptionBehaviorElement.cs @@ -1,11 +1,11 @@ -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using System; using System.Collections.Generic; using System.Configuration; using System.Globalization; using System.Xml; using Unity; +using Unity.Configuration.Abstractions; using Unity.Injection; using Unity.Interception.Configuration.Properties; using Unity.Interception.ContainerIntegration; @@ -93,8 +93,6 @@ public override string Key /// calling this method, so deriving classes only need to write the element content, not /// the start or end tags. /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] public override void SerializeContent(XmlWriter writer) { (writer ?? throw new ArgumentNullException(nameof(writer))).WriteAttributeIfNotEmpty(NamePropertyName, this.Name); diff --git a/src/InterceptionConfigurationExtension.Desktop.cs b/src/InterceptionConfigurationExtension.Desktop.cs index 41476c4..b09ac62 100644 --- a/src/InterceptionConfigurationExtension.Desktop.cs +++ b/src/InterceptionConfigurationExtension.Desktop.cs @@ -1,4 +1,4 @@ -using Microsoft.Practices.Unity.Configuration; +using Unity.Configuration.Abstractions; using Unity.Interception; using Unity.Interception.InterceptionBehaviors; using Unity.Interception.Interceptors.InstanceInterceptors.InterfaceInterception; diff --git a/src/InterceptionConfigurationExtension.cs b/src/InterceptionConfigurationExtension.cs index 7a346f5..1c9fdb6 100644 --- a/src/InterceptionConfigurationExtension.cs +++ b/src/InterceptionConfigurationExtension.cs @@ -1,6 +1,4 @@ - - -using Microsoft.Practices.Unity.Configuration; +using Unity.Configuration.Abstractions; using Unity.Interception; using Unity.Interception.InterceptionBehaviors; using Unity.Interception.Interceptors.InstanceInterceptors.InterfaceInterception; diff --git a/src/InterceptionElement.cs b/src/InterceptionElement.cs index f476e99..ee8aa09 100644 --- a/src/InterceptionElement.cs +++ b/src/InterceptionElement.cs @@ -1,11 +1,8 @@ - - +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using System.Configuration; using System.Xml; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using Unity; -using Unity.Interception.Utilities; +using Unity.Configuration.Abstractions; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration { @@ -81,7 +78,10 @@ public override void SerializeContent(XmlWriter writer) /// Container to configure. protected override void ConfigureContainer(IUnityContainer container) { - this.Policies.ForEach(policy => policy.ConfigureContainer(container)); + foreach (var policy in Policies) + { + policy.ConfigureContainer(container); + } } } } diff --git a/src/InterceptorElement.cs b/src/InterceptorElement.cs index 6a383f4..b5d71a6 100644 --- a/src/InterceptorElement.cs +++ b/src/InterceptorElement.cs @@ -1,5 +1,4 @@ -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using System; using System.Collections.Generic; using System.Configuration; @@ -7,6 +6,7 @@ using System.Threading; using System.Xml; using Unity; +using Unity.Configuration.Abstractions; using Unity.Injection; using Unity.Interception.Configuration.Properties; using Unity.Interception.ContainerIntegration; @@ -82,8 +82,6 @@ public override string Key /// calling this method, so deriving classes only need to write the element content, not /// the start or end tags. /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] public override void SerializeContent(XmlWriter writer) { (writer ?? throw new ArgumentNullException(nameof(writer))).WriteAttributeString(TypeNamePropertyName, this.TypeName); diff --git a/src/InterceptorRegistrationElement.cs b/src/InterceptorRegistrationElement.cs index 1ef8c97..c69dd6f 100644 --- a/src/InterceptorRegistrationElement.cs +++ b/src/InterceptorRegistrationElement.cs @@ -1,10 +1,9 @@ - - -using System; +using System; using System.Configuration; using System.Xml; using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using Unity; +using Unity.Configuration.Abstractions; using Unity.Interception.Interceptors; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration @@ -44,8 +43,6 @@ internal abstract string ElementName /// calling this method, so deriving classes only need to write the element content, not /// the start or end tags. /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] public override void SerializeContent(System.Xml.XmlWriter writer) { (writer ?? throw new ArgumentNullException(nameof(writer))).WriteAttributeString(TypeNamePropertyName, this.TypeName); diff --git a/src/InterceptorRegistrationElementCollection.cs b/src/InterceptorRegistrationElementCollection.cs index 3970092..8fdfecb 100644 --- a/src/InterceptorRegistrationElementCollection.cs +++ b/src/InterceptorRegistrationElementCollection.cs @@ -1,8 +1,6 @@ - - -using System; +using System; using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using Unity.Configuration.Abstractions; using Unity.Interception.Configuration.Properties; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration diff --git a/src/InterceptorsElement.cs b/src/InterceptorsElement.cs index f3beab2..352c446 100644 --- a/src/InterceptorsElement.cs +++ b/src/InterceptorsElement.cs @@ -1,14 +1,8 @@ - - -using System; -using System.Collections.Generic; +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using System.Configuration; -using System.Linq; -using System.Text; using System.Xml; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using Unity; +using Unity.Configuration.Abstractions; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration { diff --git a/src/InterceptorsInterceptorElement.cs b/src/InterceptorsInterceptorElement.cs index 0e1bc23..5ced33f 100644 --- a/src/InterceptorsInterceptorElement.cs +++ b/src/InterceptorsInterceptorElement.cs @@ -1,12 +1,11 @@ - - +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using System; using System.ComponentModel; using System.Configuration; using System.Globalization; using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using Unity; +using Unity.Configuration.Abstractions; using Unity.Interception.Configuration.Properties; using Unity.Interception.Interceptors; @@ -77,8 +76,6 @@ public string TypeConverterTypeName /// calling this method, so deriving classes only need to write the element content, not /// the start or end tags. /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] public override void SerializeContent(XmlWriter writer) { (writer ?? throw new ArgumentNullException(nameof(writer))).WriteAttributeString(TypeNamePropertyName, this.TypeName); diff --git a/src/InterceptorsInterceptorElementCollection.cs b/src/InterceptorsInterceptorElementCollection.cs index 127b436..b491435 100644 --- a/src/InterceptorsInterceptorElementCollection.cs +++ b/src/InterceptorsInterceptorElementCollection.cs @@ -1,7 +1,5 @@ - - -using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using System.Configuration; +using Unity.Configuration.Abstractions; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration { diff --git a/src/MatchingRuleElementCollection.cs b/src/MatchingRuleElementCollection.cs index 078c49e..76d9db9 100644 --- a/src/MatchingRuleElementCollection.cs +++ b/src/MatchingRuleElementCollection.cs @@ -1,7 +1,6 @@ - - +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using Unity.Configuration.Abstractions; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration { diff --git a/src/PolicyChildElement.cs b/src/PolicyChildElement.cs index 0518145..4ed5fc7 100644 --- a/src/PolicyChildElement.cs +++ b/src/PolicyChildElement.cs @@ -1,11 +1,10 @@ - - -using System; +using System; using System.Configuration; using System.Globalization; using System.Xml; using Microsoft.Practices.Unity.Configuration; using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using Unity.Configuration.Abstractions; using Unity.Interception.Configuration.Properties; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration @@ -120,8 +119,6 @@ protected override void DeserializeElement(XmlReader reader, bool serializeColle /// calling this method, so deriving classes only need to write the element content, not /// the start or end tags. /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] public override void SerializeContent(XmlWriter writer) { (writer ?? throw new ArgumentNullException(nameof(writer))).WriteAttributeString(NamePropertyName, this.Name); diff --git a/src/PolicyElement.cs b/src/PolicyElement.cs index 3d5ec6d..a9077ba 100644 --- a/src/PolicyElement.cs +++ b/src/PolicyElement.cs @@ -1,8 +1,9 @@ -using System; +using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using System; using System.Configuration; using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; using Unity; +using Unity.Configuration.Abstractions; using Unity.Interception; using Unity.Interception.ContainerIntegration; @@ -87,8 +88,6 @@ protected override bool OnDeserializeUnrecognizedElement(string elementName, Xml /// calling this method, so deriving classes only need to write the element content, not /// the start or end tags. /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] public override void SerializeContent(XmlWriter writer) { (writer ?? throw new ArgumentNullException(nameof(writer))).WriteAttributeString(NamePropertyName, this.Name); diff --git a/src/PolicyElementCollection.cs b/src/PolicyElementCollection.cs index 7a0c807..6eb994f 100644 --- a/src/PolicyElementCollection.cs +++ b/src/PolicyElementCollection.cs @@ -1,7 +1,5 @@ - - -using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; +using System.Configuration; +using Unity.Configuration.Abstractions; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration { diff --git a/src/PolicyInjectionElement.cs b/src/PolicyInjectionElement.cs index 49ce00e..e6ffab6 100644 --- a/src/PolicyInjectionElement.cs +++ b/src/PolicyInjectionElement.cs @@ -1,7 +1,7 @@ -using Microsoft.Practices.Unity.Configuration; -using System; +using System; using System.Collections.Generic; using Unity; +using Unity.Configuration.Abstractions; using Unity.Injection; using Unity.Interception.PolicyInjection; diff --git a/src/Properties/Resources.Designer.cs b/src/Properties/Resources.Designer.cs index a7096e5..e510271 100644 --- a/src/Properties/Resources.Designer.cs +++ b/src/Properties/Resources.Designer.cs @@ -28,7 +28,6 @@ internal class Resources { private static global::System.Globalization.CultureInfo resourceCulture; - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } diff --git a/tests/TestSupport/MockContainerExtension.cs b/tests/TestSupport/MockContainerExtension.cs index cc18a24..fec840e 100644 --- a/tests/TestSupport/MockContainerExtension.cs +++ b/tests/TestSupport/MockContainerExtension.cs @@ -13,7 +13,7 @@ public bool InitializeWasCalled get { return this.initializeWasCalled; } } - public new ExtensionContext Context + public new IExtensionContext Context { get { return base.Context; } } diff --git a/tests/Interception.Configuration.Tests.csproj b/tests/Unity.Interception.Configuration.Tests.csproj similarity index 100% rename from tests/Interception.Configuration.Tests.csproj rename to tests/Unity.Interception.Configuration.Tests.csproj diff --git a/tests/When_LoadingSectionThatAddsInterceptionExtensions.cs b/tests/When_LoadingSectionThatAddsInterceptionExtensions.cs index 707fdb7..ef0ea19 100644 --- a/tests/When_LoadingSectionThatAddsInterceptionExtensions.cs +++ b/tests/When_LoadingSectionThatAddsInterceptionExtensions.cs @@ -4,6 +4,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.ConfigFiles; using Microsoft.Practices.Unity.TestSupport.Configuration; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity.Configuration; namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests {