From ce47a64870cdc5a5a21227e849f60302bd147de3 Mon Sep 17 00:00:00 2001
From: Bryan Thornbury <brthor@microsoft.com>
Date: Wed, 14 Sep 2016 15:30:11 -0700
Subject: [PATCH] fixup namespaces and keyfile

---
 .../Rules/GivenThatIWantToMigrateConfigurations.cs             | 3 +--
 .../Rules/GivenThatIWantToMigrateProjectDependencies.cs        | 2 +-
 .../Rules/GivenThatIWantToMigratePublishOptions.cs             | 1 -
 .../Transforms/GivenATransformApplicator.cs                    | 2 +-
 .../Transforms/GivenAnAddItemTransform.cs                      | 2 +-
 .../Transforms/GivenAnAddPropertyTransform.cs                  | 2 +-
 .../Transforms/GivenAnIncludeContextTransformation.cs          | 2 +-
 test/Microsoft.DotNet.ProjectJsonMigration.Tests/project.json  | 2 +-
 8 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
index fbd179b5e..a6348beaa 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Build.Construction;
-using Microsoft.DotNet.Migration.Tests;
 using Microsoft.DotNet.ProjectJsonMigration;
 using Microsoft.DotNet.ProjectModel;
 using Microsoft.DotNet.Tools.Test.Utilities;
@@ -13,7 +12,7 @@ using FluentAssertions;
 using Microsoft.DotNet.ProjectJsonMigration.Rules;
 using Microsoft.DotNet.ProjectJsonMigration.Tests;
 
-namespace Microsoft.DotNet.ProjectJsonMigrationMigration.Tests
+namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 {
     public class GivenThatIWantToMigrateConfigurations : TestBase
     {
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs
index 5cd730a76..5b104a964 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs
@@ -12,7 +12,7 @@ using Xunit;
 using FluentAssertions;
 using Microsoft.DotNet.ProjectJsonMigration.Rules;
 
-namespace Microsoft.DotNet.Migration.Tests
+namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 {
     public class GivenThatIWantToMigrateProjectDependencies : TestBase
     {
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePublishOptions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePublishOptions.cs
index 5d7e1d3a0..9ba8c7396 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePublishOptions.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePublishOptions.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using Microsoft.Build.Construction;
-using Microsoft.DotNet.Migration.Tests;
 using Microsoft.DotNet.ProjectModel;
 using Microsoft.DotNet.ProjectModel.Files;
 using Microsoft.DotNet.TestFramework;
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenATransformApplicator.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenATransformApplicator.cs
index b68024f75..3b5966523 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenATransformApplicator.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenATransformApplicator.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using Microsoft.DotNet.ProjectJsonMigration.Models;
 using Microsoft.DotNet.ProjectJsonMigration.Transforms;
 
-namespace Microsoft.DotNet.ProjectJsonMigration.Tests.Transforms
+namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 {
     public class GivenATransformApplicator
     {
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddItemTransform.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddItemTransform.cs
index 86113f10d..b9bf9735a 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddItemTransform.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddItemTransform.cs
@@ -9,7 +9,7 @@ using FluentAssertions;
 using Microsoft.DotNet.ProjectJsonMigration.Models;
 using Microsoft.DotNet.ProjectJsonMigration.Transforms;
 
-namespace Microsoft.DotNet.Migration.Tests
+namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 {
     public class GivenAnAddItemTransform
     {
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddPropertyTransform.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddPropertyTransform.cs
index ac6be55f9..6d29c2fdd 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddPropertyTransform.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddPropertyTransform.cs
@@ -8,7 +8,7 @@ using Xunit;
 using FluentAssertions;
 using Microsoft.DotNet.ProjectJsonMigration.Transforms;
 
-namespace Microsoft.DotNet.Migration.Tests
+namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 {
     public class GivenAnAddPropertyTransform
     {
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnIncludeContextTransformation.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnIncludeContextTransformation.cs
index 454650208..5c69c5f78 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnIncludeContextTransformation.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnIncludeContextTransformation.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.DotNet.ProjectJsonMigration.Transforms;
 
-namespace Microsoft.DotNet.Migration.Tests
+namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 {
     public class GivenAnIncludeContextTransformation
     {
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/project.json b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/project.json
index 7009d4819..9ebefa66c 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/project.json
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/project.json
@@ -2,7 +2,7 @@
   "version": "1.0.0-*",
   "buildOptions": {
     "copyToOutput": ["MSBuild.exe", "MSBuild.exe.config"],
-    "keyFile": "../../tools/Key.snk"
+    "keyFile": "../../tools/test_key.snk",
   },
   "dependencies": {
     "Microsoft.NETCore.App": {