diff --git a/src/Common/Commands.Common.Authentication.Test/Commands.Common.Authentication.Test.csproj b/src/Common/Commands.Common.Authentication.Test/Commands.Common.Authentication.Test.csproj index 763ebd8ca5d5..bd29d9593b1f 100644 --- a/src/Common/Commands.Common.Authentication.Test/Commands.Common.Authentication.Test.csproj +++ b/src/Common/Commands.Common.Authentication.Test/Commands.Common.Authentication.Test.csproj @@ -84,7 +84,7 @@ True - ..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll + ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/Common/Commands.Common.Authentication.Test/packages.config b/src/Common/Commands.Common.Authentication.Test/packages.config index 6933da5a807e..42e529595fb1 100644 --- a/src/Common/Commands.Common.Authentication.Test/packages.config +++ b/src/Common/Commands.Common.Authentication.Test/packages.config @@ -12,7 +12,7 @@ - + diff --git a/src/Common/Commands.Common/TestMockSupport.cs b/src/Common/Commands.Common/TestMockSupport.cs index 6e2a38c518a9..f805acfe35f3 100644 --- a/src/Common/Commands.Common/TestMockSupport.cs +++ b/src/Common/Commands.Common/TestMockSupport.cs @@ -29,6 +29,10 @@ public static void Delay(int milliSeconds) { System.Threading.Thread.Sleep(milliSeconds); } + else + { + System.Threading.Thread.Yield(); + } } public static void Delay(TimeSpan duration) @@ -37,6 +41,10 @@ public static void Delay(TimeSpan duration) { System.Threading.Thread.Sleep(duration); } + else + { + System.Threading.Thread.Yield(); + } } } } diff --git a/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj b/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj index 496ed4aefcf6..baac20f06cec 100644 --- a/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj +++ b/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj @@ -107,9 +107,9 @@ False ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/Automation/Commands.Automation.Test/packages.config b/src/ResourceManager/Automation/Commands.Automation.Test/packages.config index 47669e1eb6e2..5bacf249b68a 100644 --- a/src/ResourceManager/Automation/Commands.Automation.Test/packages.config +++ b/src/ResourceManager/Automation/Commands.Automation.Test/packages.config @@ -14,7 +14,7 @@ - + diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj index c544dc9f90e4..061d92086ad1 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj @@ -128,7 +128,7 @@ ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config b/src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config index cb061576d145..12de06b1b786 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config @@ -23,7 +23,7 @@ - + diff --git a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Commands.AzureStackAdmin.Test.csproj b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Commands.AzureStackAdmin.Test.csproj index 7f0b67f3b5b6..e3292fe3d654 100644 --- a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Commands.AzureStackAdmin.Test.csproj +++ b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Commands.AzureStackAdmin.Test.csproj @@ -116,9 +116,9 @@ False ..\..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/Commands.AzureStackAdmin.Test.Common.csproj b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/Commands.AzureStackAdmin.Test.Common.csproj index 6eea4e76debf..11e375f946a7 100644 --- a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/Commands.AzureStackAdmin.Test.Common.csproj +++ b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/Commands.AzureStackAdmin.Test.Common.csproj @@ -98,9 +98,9 @@ False ..\..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - + False - ..\..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/packages.config b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/packages.config index aef7658d8cca..76c475ed3c3d 100644 --- a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/packages.config +++ b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/packages.config @@ -15,7 +15,7 @@ - + diff --git a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/packages.config b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/packages.config index 464862b29fbe..ed145a19db1f 100644 --- a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/packages.config +++ b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/packages.config @@ -16,7 +16,7 @@ - + diff --git a/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/Commands.AzureStackStorage.Test.csproj b/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/Commands.AzureStackStorage.Test.csproj index 23bb9830fc39..153e6ab00306 100644 --- a/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/Commands.AzureStackStorage.Test.csproj +++ b/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/Commands.AzureStackStorage.Test.csproj @@ -107,9 +107,9 @@ False ..\..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/packages.config b/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/packages.config index 45521fde5af0..ff450e8e28d4 100644 --- a/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/packages.config +++ b/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/packages.config @@ -17,7 +17,7 @@ - + diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj index dfdde9b1e583..82b05ab2499a 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj +++ b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj @@ -117,9 +117,9 @@ False ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/packages.config b/src/ResourceManager/Compute/Commands.Compute.Test/packages.config index 1d00343fd1e0..b4bab5e1391e 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/packages.config +++ b/src/ResourceManager/Compute/Commands.Compute.Test/packages.config @@ -19,7 +19,7 @@ - + diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj index 4da333ebb84d..37565d16d5c8 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj @@ -131,9 +131,9 @@ ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config index 5faf69fbf99b..38d8a0a85a94 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config @@ -23,7 +23,7 @@ - + diff --git a/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj b/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj index 077bf5570a42..5471db1ff3dd 100644 --- a/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj +++ b/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj @@ -130,9 +130,9 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/packages.config b/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/packages.config index 1fa7fdc5239b..78d2481d1af4 100644 --- a/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/packages.config +++ b/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/packages.config @@ -21,7 +21,7 @@ - + diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.csproj b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.csproj index 5b00c40f8847..c511996a2355 100644 --- a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.csproj +++ b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.csproj @@ -125,9 +125,9 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/packages.config b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/packages.config index 8f74492da226..2041d7d5efaf 100644 --- a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/packages.config +++ b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/packages.config @@ -20,7 +20,7 @@ - + diff --git a/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj b/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj index dd609ef5ed14..f7fdb1d4823f 100644 --- a/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj +++ b/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj @@ -98,9 +98,9 @@ False ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/Dns/Commands.Dns.Test/packages.config b/src/ResourceManager/Dns/Commands.Dns.Test/packages.config index 701a14c7ec0a..96591fdf18dd 100644 --- a/src/ResourceManager/Dns/Commands.Dns.Test/packages.config +++ b/src/ResourceManager/Dns/Commands.Dns.Test/packages.config @@ -14,7 +14,7 @@ - + diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj index 243ab2aa9312..05fb22cf208b 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj +++ b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj @@ -124,9 +124,9 @@ ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config index 946cf72e0886..468535ba808d 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config +++ b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config @@ -23,7 +23,7 @@ - + diff --git a/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj b/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj index 2aba9868db10..9f47d1a75330 100644 --- a/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj +++ b/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj @@ -113,9 +113,9 @@ ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/Insights/Commands.Insights.Test/packages.config b/src/ResourceManager/Insights/Commands.Insights.Test/packages.config index d2653ce3cdbb..cc18a79ef3b4 100644 --- a/src/ResourceManager/Insights/Commands.Insights.Test/packages.config +++ b/src/ResourceManager/Insights/Commands.Insights.Test/packages.config @@ -19,7 +19,7 @@ - + diff --git a/src/ResourceManager/Intune/Commands.Intune.Test/Commands.Intune.Test.csproj b/src/ResourceManager/Intune/Commands.Intune.Test/Commands.Intune.Test.csproj index 5a638d8f5d99..52891b1f5bf6 100644 --- a/src/ResourceManager/Intune/Commands.Intune.Test/Commands.Intune.Test.csproj +++ b/src/ResourceManager/Intune/Commands.Intune.Test/Commands.Intune.Test.csproj @@ -110,7 +110,7 @@ True - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/Intune/Commands.Intune.Test/packages.config b/src/ResourceManager/Intune/Commands.Intune.Test/packages.config index e117b1edc58e..629805394b9e 100644 --- a/src/ResourceManager/Intune/Commands.Intune.Test/packages.config +++ b/src/ResourceManager/Intune/Commands.Intune.Test/packages.config @@ -15,7 +15,7 @@ - + diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj index 6241b3a05882..6aa2c7408d38 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj +++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj @@ -120,9 +120,9 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config index 9a3435e8132b..ebc6a0c14820 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config +++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config @@ -18,7 +18,7 @@ - + diff --git a/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj b/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj index c2ba252dcbd8..44316a22da17 100644 --- a/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj +++ b/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj @@ -109,9 +109,9 @@ False ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/Network/Commands.Network.Test/packages.config b/src/ResourceManager/Network/Commands.Network.Test/packages.config index 704a31e28597..94ab413fe2b5 100644 --- a/src/ResourceManager/Network/Commands.Network.Test/packages.config +++ b/src/ResourceManager/Network/Commands.Network.Test/packages.config @@ -18,7 +18,7 @@ - + diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj index b443b4963014..d5b0af765143 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj @@ -103,9 +103,9 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config index c29890a7c258..e97d604c0e5a 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config @@ -17,7 +17,7 @@ - + diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj b/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj index 7196ec437299..849dc7b387ec 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj +++ b/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj @@ -131,8 +131,8 @@ ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - - ..\..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll + + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll True diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/packages.config b/src/ResourceManager/Profile/Commands.Profile.Test/packages.config index 6b55c58b8594..f7dc443f75ad 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/packages.config +++ b/src/ResourceManager/Profile/Commands.Profile.Test/packages.config @@ -21,7 +21,7 @@ - + diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj index 4ff1337f0357..b1986193c23d 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj +++ b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj @@ -127,9 +127,9 @@ ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config index 053c76beb45f..82bdb852c686 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config +++ b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config @@ -21,7 +21,7 @@ - + diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj index 7a470646375b..4ca06b748362 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj +++ b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj @@ -132,9 +132,9 @@ ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config index 406e4002c706..174a84536ef6 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config +++ b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config @@ -22,7 +22,7 @@ - + diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj index 9508dedf0f0d..e4ffdce78fbf 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj +++ b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj @@ -138,9 +138,9 @@ ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/packages.config b/src/ResourceManager/Sql/Commands.Sql.Test/packages.config index d27f535e3e3b..f83a297162e5 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/packages.config +++ b/src/ResourceManager/Sql/Commands.Sql.Test/packages.config @@ -24,7 +24,7 @@ - + diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj index 562d3619dcbe..3a679e18d555 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj @@ -125,9 +125,9 @@ ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config index f310aad16044..e82141916ff4 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config @@ -22,7 +22,7 @@ - + diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config index 74f196adcaea..34899424547c 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config @@ -16,7 +16,7 @@ - + diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj b/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj index ad19d6a18c15..97b9560dda65 100644 --- a/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj +++ b/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj @@ -98,7 +98,7 @@ True - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/packages.config b/src/ResourceManager/Websites/Commands.Websites.Test/packages.config index a75ff05d594c..c72673756034 100644 --- a/src/ResourceManager/Websites/Commands.Websites.Test/packages.config +++ b/src/ResourceManager/Websites/Commands.Websites.Test/packages.config @@ -17,7 +17,7 @@ - + diff --git a/src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj b/src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj index 6bdf6547358f..c527fbf83935 100644 --- a/src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj +++ b/src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj @@ -101,9 +101,9 @@ False ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ServiceManagement/Automation/Commands.Automation.Test/packages.config b/src/ServiceManagement/Automation/Commands.Automation.Test/packages.config index eccff93afc3e..c242ff14f6e8 100644 --- a/src/ServiceManagement/Automation/Commands.Automation.Test/packages.config +++ b/src/ServiceManagement/Automation/Commands.Automation.Test/packages.config @@ -13,7 +13,7 @@ - + diff --git a/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj b/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj index bd055e8557dd..cec9f6ce69da 100644 --- a/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj +++ b/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj @@ -133,9 +133,9 @@ False ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ServiceManagement/Common/Commands.Common.Test/packages.config b/src/ServiceManagement/Common/Commands.Common.Test/packages.config index e0a4eee362dc..0595cacba18b 100644 --- a/src/ServiceManagement/Common/Commands.Common.Test/packages.config +++ b/src/ServiceManagement/Common/Commands.Common.Test/packages.config @@ -21,7 +21,7 @@ - + diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ProfileClient.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ProfileClient.cs index 42067d20c876..ecc7f2571033 100644 --- a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ProfileClient.cs +++ b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ProfileClient.cs @@ -654,7 +654,7 @@ public AzureSubscription SetSubscriptionAsDefault(Guid id, string accountName) { if (subscription.IsPropertySet(AzureSubscription.Property.StorageAccount)) { - ServiceManagementUtilities.ClearCurrentStorageAccount(); + Microsoft.WindowsAzure.Commands.Utilities.Common.GeneralUtilities.ClearCurrentStorageAccount(); } Profile.DefaultSubscription = subscription; diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ServiceManagementUtilities.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ServiceManagementUtilities.cs index 8fb676d80c91..9ab247b13010 100644 --- a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ServiceManagementUtilities.cs +++ b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ServiceManagementUtilities.cs @@ -51,30 +51,5 @@ public static void EnsureDefaultProfileDirectoryExists() AzureSession.DataStore.CreateDirectory(AzureSession.ProfileDirectory); } } - - /// - /// Clear the current storage account from the context - guarantees that only one storage account will be active - /// at a time. - /// - public static void ClearCurrentStorageAccount() - { - //TODO: Move to RM - //var RMProfile = AzureRmProfileProvider.Instance.Profile; - //if (RMProfile != null && RMProfile.Context != null && - // RMProfile.Context.Subscription != null && RMProfile.Context.Subscription.IsPropertySet(AzureSubscription.Property.StorageAccount)) - //{ - // RMProfile.Context.Subscription.SetProperty(AzureSubscription.Property.StorageAccount, null); - //} - - var SMProfile = AzureSMProfileProvider.Instance.Profile; - if (SMProfile != null && SMProfile.Context != null - && SMProfile.Context.Subscription != null && - SMProfile.Context.Subscription.IsPropertySet( - AzureSubscription.Property.StorageAccount)) - { - SMProfile.Context.Subscription.SetProperty( - AzureSubscription.Property.StorageAccount, null); - } - } } } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj index f53b3f89df58..7ef44cf2722e 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj @@ -138,9 +138,9 @@ False ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config index ac0dfd76322a..49198e94b83a 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config @@ -22,7 +22,7 @@ - + diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj index 256558538b2a..a2f0c0c8ebd5 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj @@ -144,7 +144,7 @@ True - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config index a97376b14be6..37715c6aed0e 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config @@ -21,7 +21,7 @@ - + diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj index 225d4fa75645..08854be406ca 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj @@ -101,9 +101,9 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config index a9d5da6e24a2..f5493f3401bd 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config @@ -17,7 +17,7 @@ - + diff --git a/src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj b/src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj index 16dda156f7da..8201cb85b492 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj +++ b/src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj @@ -112,9 +112,9 @@ False ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ServiceManagement/Network/Commands.Network.Test/packages.config b/src/ServiceManagement/Network/Commands.Network.Test/packages.config index 22f85440da76..5e6b01b2d5a9 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/packages.config +++ b/src/ServiceManagement/Network/Commands.Network.Test/packages.config @@ -20,7 +20,7 @@ - + diff --git a/src/ServiceManagement/Profile/Commands.Profile/Subscription/SetAzureSubscription.cs b/src/ServiceManagement/Profile/Commands.Profile/Subscription/SetAzureSubscription.cs index 9c8ba0551dcb..09e76059dcb5 100644 --- a/src/ServiceManagement/Profile/Commands.Profile/Subscription/SetAzureSubscription.cs +++ b/src/ServiceManagement/Profile/Commands.Profile/Subscription/SetAzureSubscription.cs @@ -164,7 +164,7 @@ public override void ExecuteCmdlet() if (Profile.Context != null && Profile.Context.Subscription != null && Profile.Context.Subscription.Id == subscription.Id) { - ServiceManagementUtilities.ClearCurrentStorageAccount(); + GeneralUtilities.ClearCurrentStorageAccount(); } var context = new AzureContext(subscription, ProfileClient.GetAccount(subscription.Account), ProfileClient.GetEnvironmentOrDefault(subscription.Environment)); if (Context != null) diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/Commands.RemoteAppScenarioTest.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/Commands.RemoteAppScenarioTest.csproj index f82d61a91c65..9e9c75489d3e 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/Commands.RemoteAppScenarioTest.csproj +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/Commands.RemoteAppScenarioTest.csproj @@ -85,8 +85,8 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.4\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll - - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj index 2b078724a4d9..fc0326ce7469 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj @@ -149,8 +149,8 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.4\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll - - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/packages.config b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/packages.config index c55828853457..821b102885e2 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/packages.config +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/packages.config @@ -13,7 +13,7 @@ - + diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj b/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj index 7a0efe146584..294a8362e8aa 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj @@ -97,9 +97,9 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/packages.config b/src/ServiceManagement/Services/Commands.Test.Utilities/packages.config index de7bc8b8d387..16655902e3a6 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/packages.config +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/packages.config @@ -14,7 +14,7 @@ - + diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj index a7f7827a8d8b..05cbdecc062c 100644 --- a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj +++ b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj @@ -160,9 +160,9 @@ False ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -385,6 +385,9 @@ + + PreserveNewest + PreserveNewest diff --git a/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureProfileTests.cs b/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureProfileTests.cs index c0f3c0d9d9a2..45f960767fe2 100644 --- a/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureProfileTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureProfileTests.cs @@ -27,7 +27,6 @@ public void TestSelectDefaultProfile() [Fact(Skip = "PSGet Migration: TODO Move to ARM")] [Trait(Category.AcceptanceType, Category.CheckIn)] - [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMakeArmCallWithCreatedProfile() { ProfileTestController.NewARMInstance.RunPSTestWithToken((context, token) => string.Format("Test-NewAzureProfileInARMMode {0} {1} {2}", token, context.Account.Id, context.Subscription.Id)); @@ -35,7 +34,6 @@ public void TestMakeArmCallWithCreatedProfile() [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] - [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMakeRdfeCallWithCreatedProfile() { ProfileTestController.NewRdfeInstance.RunPSTestWithToken((context, token) => string.Format("Test-NewAzureProfileInRDFEMode {0} {1} {2}", token, context.Account.Id, context.Subscription.Id)); diff --git a/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureSubscriptionTests.cs b/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureSubscriptionTests.cs index c461714c25fe..5732aa3fcbf0 100644 --- a/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureSubscriptionTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureSubscriptionTests.cs @@ -17,8 +17,9 @@ using Xunit; using Microsoft.WindowsAzure.Commands.Profile; using Moq; +using Microsoft.Azure.Commands.Test.Profile; -namespace Microsoft.WindowsAzure.Commands.Test.Profile +namespace Microsoft.Azure.Commands.Test.Profile { public class SelectAzureSubscriptionTests @@ -43,5 +44,12 @@ public void CleansDefaultSubscriptionTwice() // Assert that no exception is thrown Assert.True(true); } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void StorageAccountIsNotCleaned() + { + ProfileTestController.NewRdfeInstance.RunPsTest("Test-StorageAccountIsNotCleaned"); + } } } \ No newline at end of file diff --git a/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureSubscriptionTests.ps1 b/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureSubscriptionTests.ps1 new file mode 100644 index 000000000000..e350d6e531b8 --- /dev/null +++ b/src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureSubscriptionTests.ps1 @@ -0,0 +1,27 @@ +# ---------------------------------------------------------------------------------- +# +# Copyright Microsoft Corporation +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ---------------------------------------------------------------------------------- + +<# +.SYNOPSIS +Tests creating new azure profile with access token +#> +function Test-StorageAccountIsNotCleaned +{ + Set-AzureSubscription -SubscriptionId 2c224e7e-3ef5-431d-a57b-e71f4662e3a6 -CurrentStorageAccount teststorage1220 + Select-AzureSubscription -SubscriptionId 2c224e7e-3ef5-431d-a57b-e71f4662e3a6 + $subscription = Get-AzureSubscription -SubscriptionId 2c224e7e-3ef5-431d-a57b-e71f4662e3a6 + $storageContainer = Get-AzureStorageContainer + Assert-NotNull $($subscription.CurrentStorageAccountName) + Assert-NotNull $($storageContainer) +} diff --git a/src/ServiceManagement/Services/Commands.Test/SessionRecords/Microsoft.Azure.Commands.Test.Profile.SelectAzureSubscriptionTests/StorageAccountIsNotCleaned.json b/src/ServiceManagement/Services/Commands.Test/SessionRecords/Microsoft.Azure.Commands.Test.Profile.SelectAzureSubscriptionTests/StorageAccountIsNotCleaned.json new file mode 100644 index 000000000000..6500bd97b2bf --- /dev/null +++ b/src/ServiceManagement/Services/Commands.Test/SessionRecords/Microsoft.Azure.Commands.Test.Profile.SelectAzureSubscriptionTests/StorageAccountIsNotCleaned.json @@ -0,0 +1,90 @@ +{ + "Entries": [ + { + "RequestUri": "/2c224e7e-3ef5-431d-a57b-e71f4662e3a6/services/storageservices/teststorage1220", + "EncodedRequestUri": "LzJjMjI0ZTdlLTNlZjUtNDMxZC1hNTdiLWU3MWY0NjYyZTNhNi9zZXJ2aWNlcy9zdG9yYWdlc2VydmljZXMvdGVzdHN0b3JhZ2UxMjIw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2014-10-01" + ], + "User-Agent": [ + "Microsoft.WindowsAzure.Management.Storage.StorageManagementClient/5.0.0.0" + ] + }, + "ResponseBody": "\r\n https://management.core.windows.net/2c224e7e-3ef5-431d-a57b-e71f4662e3a6/services/storageservices/teststorage1220\r\n teststorage1220\r\n \r\n \r\n West US\r\n \r\n Created\r\n \r\n https://teststorage1220.blob.core.windows.net/\r\n https://teststorage1220.queue.core.windows.net/\r\n https://teststorage1220.table.core.windows.net/\r\n https://teststorage1220.file.core.windows.net/\r\n \r\n West US\r\n Available\r\n \r\n \r\n 2014-07-09T19:35:26Z\r\n \r\n Standard_LRS\r\n \r\n \r\n \r\n ResourceGroup\r\n Default-Storage-WestUS\r\n \r\n \r\n ResourceLocation\r\n West US\r\n \r\n \r\n \r\n PersistentVMRole\r\n \r\n", + "ResponseHeaders": { + "Content-Length": [ + "1293" + ], + "Content-Type": [ + "application/xml; charset=utf-8" + ], + "x-ms-servedbyregion": [ + "ussouth3" + ], + "x-ms-request-id": [ + "3cc3414cd2838856bdfbece82a8a9ee5" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Mon, 07 Mar 2016 22:17:48 GMT" + ], + "Server": [ + "1.0.6198.323", + "(rd_rdfe_stable.160224-0707)", + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/2c224e7e-3ef5-431d-a57b-e71f4662e3a6/services/storageservices/teststorage1220/keys", + "EncodedRequestUri": "LzJjMjI0ZTdlLTNlZjUtNDMxZC1hNTdiLWU3MWY0NjYyZTNhNi9zZXJ2aWNlcy9zdG9yYWdlc2VydmljZXMvdGVzdHN0b3JhZ2UxMjIwL2tleXM=", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2014-10-01" + ], + "User-Agent": [ + "Microsoft.WindowsAzure.Management.Storage.StorageManagementClient/5.0.0.0" + ] + }, + "ResponseBody": "\r\n https://management.core.windows.net/2c224e7e-3ef5-431d-a57b-e71f4662e3a6/services/storageservices/teststorage1220\r\n \r\n /hYt36JRM3StLgfEuTa4IOi9yWzKhBKhRY3V3WZjq97Fv/84wToozLuT0aVqioUtreSTBJMD+LXI4g5jI5MGWA==\r\n R1oLky011b/RZa9K6qVWKpnSsLjHMqvupJfg+DsbAZJxi1nN6Toc9ZNUQjMskDxQkdHaXmYY00jVxr86v4QPww==\r\n \r\n", + "ResponseHeaders": { + "Content-Length": [ + "518" + ], + "Content-Type": [ + "application/xml; charset=utf-8" + ], + "x-ms-servedbyregion": [ + "ussouth3" + ], + "x-ms-request-id": [ + "97717179d40c8f788e741e3cbe0e4b55" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Mon, 07 Mar 2016 22:17:48 GMT" + ], + "Server": [ + "1.0.6198.323", + "(rd_rdfe_stable.160224-0707)", + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "2c224e7e-3ef5-431d-a57b-e71f4662e3a6" + } +} \ No newline at end of file diff --git a/src/ServiceManagement/Services/Commands.Test/packages.config b/src/ServiceManagement/Services/Commands.Test/packages.config index d02f7f2ac42b..367d36dd3475 100644 --- a/src/ServiceManagement/Services/Commands.Test/packages.config +++ b/src/ServiceManagement/Services/Commands.Test/packages.config @@ -27,7 +27,7 @@ - + diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj b/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj index b09dcc62e023..d1e6f52cd17c 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj @@ -99,9 +99,9 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.TrafficManager.0.16.0-preview\lib\net40\Microsoft.WindowsAzure.Management.TrafficManager.dll - + False - ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll False diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/packages.config b/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/packages.config index dfa7364aedca..3d6ff2b2bef6 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/packages.config +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/packages.config @@ -17,7 +17,7 @@ - +