From 0e0019b4fe4e4134ab4197868f1adf5c66004ea2 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Thu, 6 Apr 2017 16:00:03 -0700
Subject: [PATCH] Removed code supplying runtime identifier to deployers

---
 test/MusicStore.E2ETests/NtlmAuthentationTest.cs   | 5 -----
 test/MusicStore.E2ETests/OpenIdConnectTests.cs     | 8 ++------
 test/MusicStore.E2ETests/PublishAndRunTests.cs     | 5 -----
 test/MusicStore.E2ETests/SmokeTests.cs             | 5 -----
 test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs | 8 --------
 5 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
index 481cc28409..4301396e2e 100644
--- a/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
+++ b/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
@@ -52,11 +52,6 @@ namespace E2ETests
                     }
                 };
 
-                if (applicationType == ApplicationType.Standalone)
-                {
-                    deploymentParameters.AdditionalPublishParameters = " -r " + RuntimeEnvironment.GetRuntimeIdentifier();
-                }
-
                 // Override the connection strings using environment based configuration
                 deploymentParameters.EnvironmentVariables
                     .Add(new KeyValuePair<string, string>(
diff --git a/test/MusicStore.E2ETests/OpenIdConnectTests.cs b/test/MusicStore.E2ETests/OpenIdConnectTests.cs
index f892ca973a..f6dade8322 100644
--- a/test/MusicStore.E2ETests/OpenIdConnectTests.cs
+++ b/test/MusicStore.E2ETests/OpenIdConnectTests.cs
@@ -74,14 +74,10 @@ namespace E2ETests
                     UserAdditionalCleanup = parameters =>
                     {
                         DbUtils.DropDatabase(musicStoreDbName, logger);
-                    }
+                    },
+                    AdditionalPublishParameters = " /p:PublishForTesting=true"
                 };
 
-
-                deploymentParameters.AdditionalPublishParameters =
-                    (applicationType == ApplicationType.Standalone ? $" -r {RuntimeEnvironment.GetRuntimeIdentifier()}" : "")
-                    + " /p:PublishForTesting=true";
-
                 // Override the connection strings using environment based configuration
                 deploymentParameters.EnvironmentVariables
                     .Add(new KeyValuePair<string, string>(
diff --git a/test/MusicStore.E2ETests/PublishAndRunTests.cs b/test/MusicStore.E2ETests/PublishAndRunTests.cs
index 3fe2fc9d40..661b45f6da 100644
--- a/test/MusicStore.E2ETests/PublishAndRunTests.cs
+++ b/test/MusicStore.E2ETests/PublishAndRunTests.cs
@@ -145,11 +145,6 @@ namespace E2ETests
                     }
                 };
 
-                if (applicationType == ApplicationType.Standalone)
-                {
-                    deploymentParameters.AdditionalPublishParameters = "-r " + RuntimeEnvironment.GetRuntimeIdentifier();
-                }
-
                 // Override the connection strings using environment based configuration
                 deploymentParameters.EnvironmentVariables
                     .Add(new KeyValuePair<string, string>(
diff --git a/test/MusicStore.E2ETests/SmokeTests.cs b/test/MusicStore.E2ETests/SmokeTests.cs
index 6961efc9fd..c58fcdea4a 100644
--- a/test/MusicStore.E2ETests/SmokeTests.cs
+++ b/test/MusicStore.E2ETests/SmokeTests.cs
@@ -172,11 +172,6 @@ namespace E2ETests
                     }
                 };
 
-                if (applicationType == ApplicationType.Standalone)
-                {
-                    deploymentParameters.AdditionalPublishParameters = " -r " + RuntimeEnvironment.GetRuntimeIdentifier();
-                }
-
                 // Override the connection strings using environment based configuration
                 deploymentParameters.EnvironmentVariables
                     .Add(new KeyValuePair<string, string>(
diff --git a/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs b/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
index 0b60795edd..29b05d6555 100644
--- a/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
+++ b/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
@@ -254,14 +254,6 @@ namespace E2ETests
                     ApplicationType = applicationType
                 };
 
-                if (applicationType == ApplicationType.Standalone)
-                {
-                    // Unable to use the RuntimeEnvironment.GetRuntimeIdentifier API here as NanoServer which is
-                    // part of Windows Server 2016 has a RID of 'win10-x64' where as the CI servers currently
-                    // run on Windows Server 2012 or less, which have different RIDs.
-                    deploymentParameters.AdditionalPublishParameters = "-r win10-x64";
-                }
-
                 deploymentParameters.EnvironmentVariables.Add(
                     new KeyValuePair<string, string>("ASPNETCORE_ENVIRONMENT", "SocialTesting"));