Merge pull request #252 from martincostello/Move-Usings

martincostello · web-flow · commit 93e950763285 · 2021-06-23T11:18:32.000+01:00
Move usings
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -27,39 +27,4 @@
       </AssemblyAttribute>
     </ItemGroup>
   </Target>
-  <!--
-    Workaround bug in generation of _LocalTopLevelSourceRoot file path.
-    See https://github.com/coverlet-coverage/coverlet/pull/863.
-  -->
-  <Target Name="ReferencedPathMaps" BeforeTargets="CoreCompile" DependsOnTargets="ResolveProjectReferences" >
-    <MSBuild Projects="@(AnnotatedProjects->'%(FullPath)')"
-             Targets="CoverletGetPathMap"
-             Properties="TargetFramework=%(AnnotatedProjects.NearestTargetFramework)"
-             SkipNonexistentTargets="true">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="_LocalTopLevelSourceRoot" />
-    </MSBuild>
-    <ItemGroup>
-      <_byProject Include="@(_LocalTopLevelSourceRoot->'%(MSBuildSourceProjectFile)')" OriginalPath="%(Identity)" />
-      <_mapping Include="@(_byProject->'%(Identity)|%(OriginalPath)=%(MappedPath)')" />
-    </ItemGroup>
-    <PropertyGroup>
-      <_sourceRootMappingFilePath>$([System.IO.Path]::Combine('$(OutputPath)', 'CoverletSourceRootsMapping'))</_sourceRootMappingFilePath>
-    </PropertyGroup>
-    <WriteLinesToFile File="$(_sourceRootMappingFilePath)" Lines="@(_mapping)"
-                      Overwrite="true" Encoding="Unicode"
-                      Condition="'@(_mapping)'!=''"
-                      WriteOnlyWhenDifferent="true" />
-    <ItemGroup>
-      <FileWrites Include="$(_sourceRootMappingFilePath)" Condition="'@(_mapping)'!=''" />
-    </ItemGroup>
-  </Target>
-  <Target Name="CoverletGetPathMap"
-          DependsOnTargets="InitializeSourceRootMappedPaths"
-          Returns="@(_LocalTopLevelSourceRoot)"
-          Condition="'$(DeterministicSourcePaths)' == 'true'">
-    <ItemGroup>
-      <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
-    </ItemGroup>
-  </Target>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -19,7 +19,7 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
+    <PackageReference Include="coverlet.msbuild" PrivateAssets="All" Condition=" '$(IsTestProject)' == 'true' " />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="ReportGenerator" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
diff --git a/src/MartinCostello.BrowserStack.Automate/AutomatePlanStatus.cs b/src/MartinCostello.BrowserStack.Automate/AutomatePlanStatus.cs
@@ -1,10 +1,10 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing the current status of a <c>BrowserStack</c> Automate plan.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/Browser.cs b/src/MartinCostello.BrowserStack.Automate/Browser.cs
@@ -1,10 +1,10 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing a browser.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateClient.cs b/src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateClient.cs
@@ -1,20 +1,20 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http;
-    using System.Net.Http.Headers;
-    using System.Text;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing a client for the <c>BrowserStack</c> Automate REST API.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateClientExtensions.cs b/src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateClientExtensions.cs
@@ -1,13 +1,13 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using System;
-    using System.ComponentModel;
-    using System.Threading;
-    using System.Threading.Tasks;
-
     /// <summary>
     /// A class containing extension methods for the <see cref="BrowserStackAutomateClient"/> class. This class cannot be inherited.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateError.cs b/src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateError.cs
@@ -1,10 +1,10 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing a BrowserStack Automate error.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateException.cs b/src/MartinCostello.BrowserStack.Automate/BrowserStackAutomateException.cs
@@ -1,13 +1,13 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
-namespace MartinCostello.BrowserStack.Automate
-{
-    using System;
+using System;
 #if NET451
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 #endif
 
+namespace MartinCostello.BrowserStack.Automate
+{
     /// <summary>
     /// Represents an error from the BrowserStack Automate API.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/Build.cs b/src/MartinCostello.BrowserStack.Automate/Build.cs
@@ -1,10 +1,10 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing a build.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/BuildDetail.cs b/src/MartinCostello.BrowserStack.Automate/BuildDetail.cs
@@ -1,12 +1,12 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using System;
-    using System.Collections.Generic;
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing detail about a build.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/Project.cs b/src/MartinCostello.BrowserStack.Automate/Project.cs
@@ -1,11 +1,11 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System;
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using System;
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing a project.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/ProjectDetail.cs b/src/MartinCostello.BrowserStack.Automate/ProjectDetail.cs
@@ -1,11 +1,11 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using System.Collections.Generic;
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing detailed information about a project.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/ProjectDetailItem.cs b/src/MartinCostello.BrowserStack.Automate/ProjectDetailItem.cs
@@ -1,10 +1,10 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing a project detail item.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/RecycleAccessKeyResult.cs b/src/MartinCostello.BrowserStack.Automate/RecycleAccessKeyResult.cs
@@ -1,10 +1,10 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing the result of recycling the access key.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/Session.cs b/src/MartinCostello.BrowserStack.Automate/Session.cs
@@ -1,10 +1,10 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing a session.
     /// </summary>
diff --git a/src/MartinCostello.BrowserStack.Automate/SessionDetail.cs b/src/MartinCostello.BrowserStack.Automate/SessionDetail.cs
@@ -1,10 +1,10 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using Newtonsoft.Json;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using Newtonsoft.Json;
-
     /// <summary>
     /// A class representing detail about a session.
     /// </summary>
diff --git a/stylecop.json b/stylecop.json
@@ -37,7 +37,7 @@
         "readonly"
       ],
       "systemUsingDirectivesFirst": true,
-      "usingDirectivesPlacement": "insideNamespace"
+      "usingDirectivesPlacement": "outsideNamespace"
     },
     "readabilityRules": {
     },
diff --git a/tests/MartinCostello.BrowserStack.Automate.Tests/BrowserStackAutomateClientExtensionsTests.cs b/tests/MartinCostello.BrowserStack.Automate.Tests/BrowserStackAutomateClientExtensionsTests.cs
@@ -1,12 +1,12 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System;
+using FluentAssertions;
+using Xunit;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using System;
-    using FluentAssertions;
-    using Xunit;
-
     /// <summary>
     /// A class containing tests for the <see cref="BrowserStackAutomateClientExtensions"/> class.
     /// </summary>
diff --git a/tests/MartinCostello.BrowserStack.Automate.Tests/BrowserStackAutomateClientTests.cs b/tests/MartinCostello.BrowserStack.Automate.Tests/BrowserStackAutomateClientTests.cs
@@ -1,20 +1,20 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using Polly;
+using Polly.CircuitBreaker;
+using Xunit;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http;
-    using System.Threading.Tasks;
-    using FluentAssertions;
-    using Microsoft.Extensions.DependencyInjection;
-    using Polly;
-    using Polly.CircuitBreaker;
-    using Xunit;
-
     /// <summary>
     /// A class containing tests for the <see cref="BrowserStackAutomateClient"/> class.
     /// </summary>
diff --git a/tests/MartinCostello.BrowserStack.Automate.Tests/RequiresServiceCredentialsFactAttribute.cs b/tests/MartinCostello.BrowserStack.Automate.Tests/RequiresServiceCredentialsFactAttribute.cs
@@ -1,11 +1,11 @@
 ﻿// Copyright (c) Martin Costello, 2015. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
+using System;
+using Xunit;
+
 namespace MartinCostello.BrowserStack.Automate
 {
-    using System;
-    using Xunit;
-
     /// <summary>
     /// A test that requires service credentials to be configured as environment variables. This class cannot be inherited.
     /// </summary>
