From 5505ab94c4d19ef9e6e6339b2bcd2f668e61e154 Mon Sep 17 00:00:00 2001 From: Shefali Date: Tue, 25 Aug 2015 13:31:34 -0700 Subject: [PATCH 1/3] updating references to hdi nuget --- .../Commands.HDInsight/HDInsight.csproj | 48 +++++++++---------- .../Commands.HDInsight/packages.config | 14 +++--- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj b/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj index 7627df4c323d..8e564c431416 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj @@ -71,25 +71,22 @@ False ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll - - False - ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + + ..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll - - False - ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + + ..\..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll - - False - ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + + ..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll - + False - ..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.Hadoop.Client.dll + ..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.Hadoop.Client.dll - + False - ..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll + ..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll @@ -124,25 +121,25 @@ False ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll - + False - ..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll - + False - ..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll + ..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll - + False - ..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll + ..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll - + False - ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + ..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll False @@ -163,9 +160,8 @@ ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll - - False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + + ..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config b/src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config index 25633f0fa4da..d70c540f8ae4 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config @@ -9,18 +9,18 @@ - - - - + + + + - + - - + + From 85ef6b5145fffa643a106f2baa4074d7d67efcc9 Mon Sep 17 00:00:00 2001 From: Shefali Date: Tue, 25 Aug 2015 14:01:58 -0700 Subject: [PATCH 2/3] updating test refs --- setup/azurecmdfiles.wxi | 96 +++++++++++++++++++ .../Commands.HDInsight.Test.csproj | 59 ++++++------ .../Commands.HDInsight.Test/packages.config | 14 +-- 3 files changed, 135 insertions(+), 34 deletions(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 1343534e150d..1b36ee163dae 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -578,6 +578,15 @@ + + + + + + + + + @@ -623,6 +632,9 @@ + + + @@ -1187,6 +1199,15 @@ + + + + + + + + + @@ -1223,6 +1244,9 @@ + + + @@ -1326,6 +1350,15 @@ + + + + + + + + + @@ -1353,6 +1386,9 @@ + + + @@ -1421,6 +1457,15 @@ + + + + + + + + + @@ -1469,6 +1514,9 @@ + + + @@ -3227,6 +3275,15 @@ + + + + + + + + + @@ -3344,6 +3401,9 @@ + + + @@ -4682,6 +4742,15 @@ + + + + + + + + + @@ -4733,6 +4802,9 @@ + + + @@ -4919,6 +4991,9 @@ + + + @@ -4934,6 +5009,7 @@ + @@ -5110,6 +5186,9 @@ + + + @@ -5122,6 +5201,7 @@ + @@ -5155,6 +5235,9 @@ + + + @@ -5164,6 +5247,7 @@ + @@ -5186,6 +5270,9 @@ + + + @@ -5202,6 +5289,7 @@ + @@ -5774,6 +5862,9 @@ + + + @@ -5813,6 +5904,7 @@ + @@ -6233,6 +6325,9 @@ + + + @@ -6250,6 +6345,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 565f4f9786a5..e60bb7edd892 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj @@ -43,7 +43,8 @@ false - + + False ..\..\..\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll @@ -67,23 +68,22 @@ ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5687.28567-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll True - - False - ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + + ..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll - - False - ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + + ..\..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll - - False - ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + + ..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll - - ..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.Hadoop.Client.dll + + False + ..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.Hadoop.Client.dll - - ..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll + + False + ..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll False @@ -118,20 +118,25 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - - ..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll + + False + ..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll - - ..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll + + False + ..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll - - ..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll + + False + ..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll - - ..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll + + False + ..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll - - ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + + False + ..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll ..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll @@ -156,9 +161,8 @@ - - False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + + ..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll @@ -259,6 +263,7 @@ + Designer diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config index c64f9f9af1c8..00a87cb382ed 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config @@ -10,21 +10,21 @@ - - - - + + + + - + - - + + From c8aff29ce9f278b9e3bc17f3124900e06e89a435 Mon Sep 17 00:00:00 2001 From: Shefali Date: Tue, 25 Aug 2015 14:16:54 -0700 Subject: [PATCH 3/3] remove app.config --- .../Commands.HDInsight.Test/Commands.HDInsight.Test.csproj | 1 - 1 file changed, 1 deletion(-) 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 e60bb7edd892..61a94fdf2e85 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj @@ -263,7 +263,6 @@ - Designer