From 137b6f2c028bfe9a7fdd16ee61743457fe009ec5 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Wed, 27 Jan 2016 14:02:18 -0800 Subject: [PATCH 1/9] Update ASM compute client library to version 12.5.0 --- .../Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj | 2 +- .../Common/Commands.ScenarioTest/packages.config | 2 +- .../Commands.ServiceManagement.PlatformImageRepository.csproj | 2 +- .../packages.config | 2 +- .../Commands.ServiceManagement.Preview.csproj | 2 +- .../Compute/Commands.ServiceManagement.Preview/packages.config | 2 +- .../Commands.ServiceManagement.Test.csproj | 2 +- .../Compute/Commands.ServiceManagement.Test/packages.config | 2 +- .../Commands.ServiceManagement.csproj | 2 +- .../Compute/Commands.ServiceManagement/packages.config | 2 +- .../Commands.ServiceManagement.Network.Test.csproj | 2 +- .../Network/Commands.Network.Test/packages.config | 2 +- .../Commands.Network/Commands.ServiceManagement.Network.csproj | 2 +- src/ServiceManagement/Network/Commands.Network/packages.config | 2 +- .../RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj | 2 +- .../RemoteApp/Commands.RemoteApp/packages.config | 2 +- .../Commands.Test.Utilities/Commands.Test.Utilities.csproj | 2 +- .../Services/Commands.Test.Utilities/packages.config | 2 +- .../Services/Commands.Test/Commands.Test.csproj | 2 +- src/ServiceManagement/Services/Commands.Test/packages.config | 2 +- .../Services/Commands.Utilities/Commands.Utilities.csproj | 2 +- .../Services/Commands.Utilities/packages.config | 2 +- src/ServiceManagement/Services/Commands/Commands.csproj | 2 +- src/ServiceManagement/Services/Commands/packages.config | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj index 87c3c491a5cd..a81d344681a8 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj @@ -120,7 +120,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/packages.config b/src/ServiceManagement/Common/Commands.ScenarioTest/packages.config index ae30f509d6c5..15923f5ea852 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/packages.config +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/packages.config @@ -20,7 +20,7 @@ - + diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj index 2f703b2045dd..1c3060976afb 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj @@ -128,7 +128,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config index 7a5b66132786..3c27aff765cb 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config @@ -19,7 +19,7 @@ - + diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj index 2f31a70f0d23..52b92bf8ddd8 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj @@ -129,7 +129,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config index ea48be48e846..6060297113bd 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config @@ -19,7 +19,7 @@ - + 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 141b1e618355..3d9cb5beb052 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj @@ -129,7 +129,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config index fb69a3d8d910..d352f0160a3c 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config @@ -20,7 +20,7 @@ - + diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj index 0922bd647a0d..d74215b3b4ff 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj @@ -130,7 +130,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/packages.config b/src/ServiceManagement/Compute/Commands.ServiceManagement/packages.config index ea48be48e846..6060297113bd 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/packages.config +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/packages.config @@ -19,7 +19,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 2a030eef7f27..ea5aa913a2e8 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 @@ -106,7 +106,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll diff --git a/src/ServiceManagement/Network/Commands.Network.Test/packages.config b/src/ServiceManagement/Network/Commands.Network.Test/packages.config index fce22eb3e263..c9e27783befb 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/packages.config +++ b/src/ServiceManagement/Network/Commands.Network.Test/packages.config @@ -18,7 +18,7 @@ - + diff --git a/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj b/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj index df9456f6f901..21aa080152b5 100644 --- a/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj +++ b/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj @@ -106,7 +106,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ServiceManagement/Network/Commands.Network/packages.config b/src/ServiceManagement/Network/Commands.Network/packages.config index 63c0f16ec5f1..2fd27aba57b2 100644 --- a/src/ServiceManagement/Network/Commands.Network/packages.config +++ b/src/ServiceManagement/Network/Commands.Network/packages.config @@ -19,7 +19,7 @@ - + diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj index 76a4f07d9e0b..14b36c14f645 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj @@ -115,7 +115,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config index aa9532b54abc..2f821d94a4e7 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config @@ -17,7 +17,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 877a1cfe67cb..7270c16c9aae 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj @@ -96,7 +96,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/packages.config b/src/ServiceManagement/Services/Commands.Test.Utilities/packages.config index f7cd715b9f92..52e42c131f19 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/packages.config +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/packages.config @@ -13,7 +13,7 @@ - + diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj index 16a8500684db..b53b416d2af5 100644 --- a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj +++ b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj @@ -132,7 +132,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.14-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll diff --git a/src/ServiceManagement/Services/Commands.Test/packages.config b/src/ServiceManagement/Services/Commands.Test/packages.config index b8a5bb460f44..0835c6fe37e6 100644 --- a/src/ServiceManagement/Services/Commands.Test/packages.config +++ b/src/ServiceManagement/Services/Commands.Test/packages.config @@ -20,7 +20,7 @@ - + diff --git a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj index 7f6bd9043335..730c027fe565 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj @@ -134,7 +134,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ServiceManagement/Services/Commands.Utilities/packages.config b/src/ServiceManagement/Services/Commands.Utilities/packages.config index 717a55cd4b12..7ec7beaf7faf 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/packages.config +++ b/src/ServiceManagement/Services/Commands.Utilities/packages.config @@ -19,7 +19,7 @@ - + diff --git a/src/ServiceManagement/Services/Commands/Commands.csproj b/src/ServiceManagement/Services/Commands/Commands.csproj index 3b3ae99ea255..1215e32e917a 100644 --- a/src/ServiceManagement/Services/Commands/Commands.csproj +++ b/src/ServiceManagement/Services/Commands/Commands.csproj @@ -125,7 +125,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ServiceManagement/Services/Commands/packages.config b/src/ServiceManagement/Services/Commands/packages.config index 18f66e60b2aa..5dacc473744c 100644 --- a/src/ServiceManagement/Services/Commands/packages.config +++ b/src/ServiceManagement/Services/Commands/packages.config @@ -17,7 +17,7 @@ - + From 8d66b5797749c0a83aab0077d2e936345f398122 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Wed, 27 Jan 2016 21:17:49 -0800 Subject: [PATCH 2/9] Update ASM compute library to 12.5.0 (fix) --- .../Common/Commands.Common.Test/Commands.Common.Test.csproj | 2 +- .../Common/Commands.Common.Test/packages.config | 2 +- .../Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj | 2 +- .../Commands.ServiceManagement.PlatformImageRepository.csproj | 2 +- .../Commands.ServiceManagement.Preview.csproj | 2 +- .../Commands.ServiceManagement.Test.csproj | 2 +- .../Commands.ServiceManagement.csproj | 2 +- .../Commands.ServiceManagement.Network.Test.csproj | 2 +- .../Commands.Network/Commands.ServiceManagement.Network.csproj | 2 +- .../RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj | 2 +- .../Commands.Test.Utilities/Commands.Test.Utilities.csproj | 2 +- .../Services/Commands.Test/Commands.Test.csproj | 2 +- .../Services/Commands.Utilities/Commands.Utilities.csproj | 2 +- src/ServiceManagement/Services/Commands/Commands.csproj | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) 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 21143941163e..1320be72792c 100644 --- a/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj +++ b/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj @@ -127,7 +127,7 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll diff --git a/src/ServiceManagement/Common/Commands.Common.Test/packages.config b/src/ServiceManagement/Common/Commands.Common.Test/packages.config index 5f8147025739..6bf38e990c1c 100644 --- a/src/ServiceManagement/Common/Commands.Common.Test/packages.config +++ b/src/ServiceManagement/Common/Commands.Common.Test/packages.config @@ -20,7 +20,7 @@ - + diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj index a81d344681a8..ad81f675f239 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj @@ -120,7 +120,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj index 1c3060976afb..9a3625aa5a14 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj @@ -128,7 +128,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj index 52b92bf8ddd8..68888015cace 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj @@ -129,7 +129,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll False 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 3d9cb5beb052..79de3cc82f3d 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj @@ -129,7 +129,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj index d74215b3b4ff..3a6a637320b1 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj @@ -130,7 +130,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll False 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 ea5aa913a2e8..4f1f11b0c6ff 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 @@ -106,7 +106,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll diff --git a/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj b/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj index 21aa080152b5..03be2d2e8d5b 100644 --- a/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj +++ b/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj @@ -106,7 +106,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj index 14b36c14f645..48052ba8acde 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj @@ -115,7 +115,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll 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 7270c16c9aae..21b4fa4c1299 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj @@ -96,7 +96,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj index b53b416d2af5..aca067a8dad2 100644 --- a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj +++ b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj @@ -132,7 +132,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.14-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll diff --git a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj index 730c027fe565..47185280b701 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj @@ -134,7 +134,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ServiceManagement/Services/Commands/Commands.csproj b/src/ServiceManagement/Services/Commands/Commands.csproj index 1215e32e917a..82228ec9ede9 100644 --- a/src/ServiceManagement/Services/Commands/Commands.csproj +++ b/src/ServiceManagement/Services/Commands/Commands.csproj @@ -125,7 +125,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net45\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll False From edfc6b4deaf628bde31b640a3a484505e0e5a7dc Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Wed, 27 Jan 2016 21:56:35 -0800 Subject: [PATCH 3/9] New-AzureServiceExtension cmdlet update: it takes ExtensionState to update the state of the extension. --- .../AzureServiceExtensionTests.cs | 25 +++++++++++-- ...ewAzureServiceExtensionConfigCmdletInfo.cs | 11 ++++++ .../ServiceManagementCmdletTestHelper.cs | 8 +++++ .../Common/BaseAzureServiceExtensionCmdlet.cs | 2 ++ .../Common/ExtensionConfigurationInput.cs | 1 + .../Extensions/Common/ExtensionManager.cs | 34 ++++++++++++++++++ .../Common/NewAzureServiceExtensionConfig.cs | 12 +++++++ .../HostedServices/SetAzureDeployment.cs | 8 ++++- .../Model/DeploymentInfoContext.cs | 35 +++++++++++++++++++ 9 files changed, 133 insertions(+), 3 deletions(-) diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs index 30a33f60ad98..fc26ce1d2667 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs @@ -18,6 +18,7 @@ using System.IO; using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; @@ -146,6 +147,7 @@ public void AzureServiceExtensionConfigScenarioTest() DeploymentInfoContext result = vmPowershellCmdlets.GetAzureDeployment(_serviceName, DeploymentSlotType.Production); pass = Utilities.PrintAndCompareDeployment(result, _serviceName, DeploymentName, DeploymentLabel, DeploymentSlotType.Production, null, 2); Console.WriteLine("successfully deployed the package"); + var extId = result.ExtensionConfiguration.AllRoles[0].Id; ExtensionContext resultExtensionContext = vmPowershellCmdlets.GetAzureServiceExtension(_serviceName)[0]; @@ -159,6 +161,27 @@ public void AzureServiceExtensionConfigScenarioTest() VerifyRDP(_serviceName, rdpPath); + ExtensionConfigurationInput extConfig = vmPowershellCmdlets.NewAzureServiceExtensionConfig(extId, "Uninstall"); + + try + { + vmPowershellCmdlets.SetAzureDeploymentConfig(_serviceName, DeploymentSlotType.Production, + _configPath.FullName, extConfig); + Assert.Fail("Succeeded, but extected to fail!"); + } + catch (Exception e) + { + if (e.ToString().Contains("BadRequest") + || ((e.InnerException != null) && (e.InnerException.ToString().Contains("BadRequest")))) + { + Console.WriteLine(e.ToString()); + } + else + { + throw; + } + } + vmPowershellCmdlets.RemoveAzureServiceExtension( serviceName: _serviceName, extensionName: _extensionName, @@ -178,8 +201,6 @@ public void AzureServiceExtensionConfigScenarioTest() Console.WriteLine("Failed to get RDP file as expected"); } - - vmPowershellCmdlets.RemoveAzureDeployment(_serviceName, DeploymentSlotType.Production, true); pass &= Utilities.CheckRemove(vmPowershellCmdlets.GetAzureDeployment, _serviceName, DeploymentSlotType.Production); diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs index a677b63574a3..a3e61140ce1a 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs @@ -55,5 +55,16 @@ public NewAzureServiceExtensionConfigCmdletInfo(string thumbprint, string algori this.cmdletParams.Add(new CmdletParam("ThumbprintAlgorithm", algorithm)); } } + + public NewAzureServiceExtensionConfigCmdletInfo(string extensionId, string extensionStatus, string[] roles) + { + this.cmdletName = Utilities.NewAzureServiceExtensionConfigCmdletName; + this.cmdletParams.Add(new CmdletParam("ExtensionId", extensionId)); + this.cmdletParams.Add(new CmdletParam("ExtensionState", extensionStatus)); + if (roles != null) + { + this.cmdletParams.Add(new CmdletParam("Role", roles)); + } + } } } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs index bd4dac37d312..104126063e00 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs @@ -1319,6 +1319,14 @@ public ExtensionConfigurationInput NewAzureServiceExtensionConfig(string extensi providerNamespace, publicConfig, privateConfig, version)); } + public ExtensionConfigurationInput NewAzureServiceExtensionConfig(string extensionId, string extensionStatus, + string [] roles = null) + { + return + RunPSCmdletAndReturnFirst( + new NewAzureServiceExtensionConfigCmdletInfo(extensionId, extensionStatus, roles)); + } + // Set-AzureServiceExtension public ManagementOperationContext SetAzureServiceExtension(string serviceName, string extensionName, string providerNamespace, string publicConfig, string privateConfig, string[] roles = null, string slot = null, string version = null) diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs index f650aefa8c5c..7eaf07ad2739 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs @@ -39,6 +39,7 @@ public abstract class BaseAzureServiceExtensionCmdlet : ServiceManagementBaseCmd protected const string NewExtensionParameterSetName = "NewExtension"; protected const string NewExtensionUsingThumbprintParameterSetName = "NewExtensionUsingThumbprint"; + protected const string UpdateExtensionStatusParameterSetName = "UpdateExtensionStatusParameterSetName"; protected const string SetExtensionParameterSetName = "SetExtension"; protected const string SetExtensionUsingThumbprintParameterSetName = "SetExtensionUsingThumbprint"; protected const string SetExtensionUsingDiagnosticsConfigurationParameterSetName = "SetExtensionUsingDiagnosticsConfiguration"; @@ -66,6 +67,7 @@ public abstract class BaseAzureServiceExtensionCmdlet : ServiceManagementBaseCmd public virtual string ExtensionName { get; set; } public virtual string Version { get; set; } public virtual string ExtensionId { get; set; } + public virtual string ExtensionState { get; set; } public BaseAzureServiceExtensionCmdlet() : base() diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs index 9271713d190e..de7fcd1c46af 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs @@ -28,5 +28,6 @@ public class ExtensionConfigurationInput public string PrivateConfiguration { get; set; } public ExtensionRoleList Roles { get; set; } public X509Certificate2 X509Certificate { get; set; } + public string State { get; set; } } } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs index e9dc2a059c5f..f4f5c640d425 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs @@ -344,6 +344,40 @@ public ExtensionConfiguration Add(DeploymentGetResponse deployment, DeploymentGe return extConfig; } + public ExtensionConfiguration UpdateExtensionState(ExtensionConfigurationInput input) + { + var extConfig = new ExtensionConfiguration(); + if (input.Roles == null || input.Roles.Count == 1 && input.Roles[0].RoleType == ExtensionRoleType.AllRoles) + { + + extConfig.AllRoles = new List(); + extConfig.AllRoles.Add(new ExtensionConfiguration.Extension + { + Id = input.Id, + State = input.State + }); + } + else + { + extConfig.NamedRoles = new List(); + foreach (var role in input.Roles) + { + var ext = new List(); + ext.Add(new ExtensionConfiguration.Extension + { + Id = input.Id, + State = input.State + }); + extConfig.NamedRoles.Add(new ExtensionConfiguration.NamedRole + { + RoleName = role.RoleName, + Extensions = ext + }); + } + } + return extConfig; + } + public static bool Validate(ExtensionConfigurationInput[] inputs, out string errorConfigInput) { var roleList = (from c in inputs diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs index 03596eea0db5..c8ffd26e1e63 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs @@ -26,9 +26,11 @@ public class NewAzureServiceExtensionConfigCommand : BaseAzureServiceExtensionCm { private const string NetExtensionParameterSetName = NewExtensionParameterSetName; private const string NetExtensionUsingThumbprintParameterSetName = NewExtensionUsingThumbprintParameterSetName; + private const string NetUpdateExtensionStatusParameterSetName = UpdateExtensionStatusParameterSetName; [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.RoleHelpMessage)] [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionUsingThumbprintParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.RoleHelpMessage)] + [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] [ValidateNotNullOrEmpty] public override string[] Role { @@ -109,6 +111,7 @@ public override string Version [Parameter(Position = 8, Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] [Parameter(Position = 8, Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionUsingThumbprintParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] + [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] [ValidateNotNullOrEmpty] public override string ExtensionId { @@ -116,6 +119,14 @@ public override string ExtensionId set; } + [Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] + [ValidateSet("Enable", "Disable", "Uninstall", IgnoreCase = true)] + public override string ExtensionState + { + get; + set; + } + protected override void ValidateParameters() { base.ValidateParameters(); @@ -129,6 +140,7 @@ public void ExecuteCommand() WriteObject(new ExtensionConfigurationInput { Id = ExtensionId, + State = ExtensionState, CertificateThumbprint = CertificateThumbprint, ThumbprintAlgorithm = ThumbprintAlgorithm, ProviderNameSpace = ProviderNamespace, diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs index 33b93a0d6de5..a2413613310d 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs @@ -192,7 +192,13 @@ public void ExecuteCommand() InvokeInOperationContext(() => peerDeployment = func(peerSlottype)); ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName); - extConfig = extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot); + + foreach (var config in ExtensionConfiguration) + { + extConfig = (config.State == null) + ? extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot) + : extensionMgr.UpdateExtensionState(config); + } } // Upgrade Parameter Set diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs index 1cb67fd6b9f8..8c19bb15d98b 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs @@ -180,6 +180,12 @@ public PVM.LoadBalancerList LoadBalancers protected set; } + public PVM.ExtensionConfiguration ExtensionConfiguration + { + get; + protected set; + } + public DeploymentInfoContext(DeploymentGetResponse deployment) { this.Slot = deployment.DeploymentSlot.ToString(); @@ -287,6 +293,35 @@ from b in deployment.LoadBalancers this.InternalLoadBalancerName = this.LoadBalancers == null || !this.LoadBalancers.Any() ? null : this.LoadBalancers.First().Name; } + + // ExtensionConfiguration + if (deployment.ExtensionConfiguration != null) + { + this.ExtensionConfiguration = new PVM.ExtensionConfiguration(); + if (deployment.ExtensionConfiguration.AllRoles != null) + { + this.ExtensionConfiguration.AllRoles = new PVM.AllRoles( + from all in deployment.ExtensionConfiguration.AllRoles + select new PVM.Extension(all.Id, 0, all.State)); + } + + if (deployment.ExtensionConfiguration.NamedRoles != null) + { + this.ExtensionConfiguration.NamedRoles = new PVM.NamedRoles(); + foreach (var role in deployment.ExtensionConfiguration.NamedRoles) + { + var extList = new PVM.ExtensionList( + from ext in role.Extensions + select new PVM.Extension(ext.Id, 0, ext.State)); + + this.ExtensionConfiguration.NamedRoles.Add(new PVM.RoleExtensions + { + RoleName = role.RoleName, + Extensions = extList + }); + } + } + } } public XDocument SerializeRolesConfiguration() From dbff92bf7d6d3b6147da6b05c95dc2ec497f167e Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Wed, 27 Jan 2016 22:03:42 -0800 Subject: [PATCH 4/9] New-AzureServiceExtension cmdlet update: it takes ExtensionState to update the state of the extension. --- .../AzureServiceExtensionTests.cs | 25 +++++++++++-- ...ewAzureServiceExtensionConfigCmdletInfo.cs | 11 ++++++ .../ServiceManagementCmdletTestHelper.cs | 8 +++++ .../Common/BaseAzureServiceExtensionCmdlet.cs | 2 ++ .../Common/ExtensionConfigurationInput.cs | 1 + .../Extensions/Common/ExtensionManager.cs | 34 ++++++++++++++++++ .../ExtensionParameterPropertyHelper.cs | 1 + .../Common/NewAzureServiceExtensionConfig.cs | 12 +++++++ .../HostedServices/SetAzureDeployment.cs | 8 ++++- .../Model/DeploymentInfoContext.cs | 35 +++++++++++++++++++ 10 files changed, 134 insertions(+), 3 deletions(-) diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs index 30a33f60ad98..fc26ce1d2667 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs @@ -18,6 +18,7 @@ using System.IO; using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; @@ -146,6 +147,7 @@ public void AzureServiceExtensionConfigScenarioTest() DeploymentInfoContext result = vmPowershellCmdlets.GetAzureDeployment(_serviceName, DeploymentSlotType.Production); pass = Utilities.PrintAndCompareDeployment(result, _serviceName, DeploymentName, DeploymentLabel, DeploymentSlotType.Production, null, 2); Console.WriteLine("successfully deployed the package"); + var extId = result.ExtensionConfiguration.AllRoles[0].Id; ExtensionContext resultExtensionContext = vmPowershellCmdlets.GetAzureServiceExtension(_serviceName)[0]; @@ -159,6 +161,27 @@ public void AzureServiceExtensionConfigScenarioTest() VerifyRDP(_serviceName, rdpPath); + ExtensionConfigurationInput extConfig = vmPowershellCmdlets.NewAzureServiceExtensionConfig(extId, "Uninstall"); + + try + { + vmPowershellCmdlets.SetAzureDeploymentConfig(_serviceName, DeploymentSlotType.Production, + _configPath.FullName, extConfig); + Assert.Fail("Succeeded, but extected to fail!"); + } + catch (Exception e) + { + if (e.ToString().Contains("BadRequest") + || ((e.InnerException != null) && (e.InnerException.ToString().Contains("BadRequest")))) + { + Console.WriteLine(e.ToString()); + } + else + { + throw; + } + } + vmPowershellCmdlets.RemoveAzureServiceExtension( serviceName: _serviceName, extensionName: _extensionName, @@ -178,8 +201,6 @@ public void AzureServiceExtensionConfigScenarioTest() Console.WriteLine("Failed to get RDP file as expected"); } - - vmPowershellCmdlets.RemoveAzureDeployment(_serviceName, DeploymentSlotType.Production, true); pass &= Utilities.CheckRemove(vmPowershellCmdlets.GetAzureDeployment, _serviceName, DeploymentSlotType.Production); diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs index a677b63574a3..a3e61140ce1a 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs @@ -55,5 +55,16 @@ public NewAzureServiceExtensionConfigCmdletInfo(string thumbprint, string algori this.cmdletParams.Add(new CmdletParam("ThumbprintAlgorithm", algorithm)); } } + + public NewAzureServiceExtensionConfigCmdletInfo(string extensionId, string extensionStatus, string[] roles) + { + this.cmdletName = Utilities.NewAzureServiceExtensionConfigCmdletName; + this.cmdletParams.Add(new CmdletParam("ExtensionId", extensionId)); + this.cmdletParams.Add(new CmdletParam("ExtensionState", extensionStatus)); + if (roles != null) + { + this.cmdletParams.Add(new CmdletParam("Role", roles)); + } + } } } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs index bd4dac37d312..104126063e00 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs @@ -1319,6 +1319,14 @@ public ExtensionConfigurationInput NewAzureServiceExtensionConfig(string extensi providerNamespace, publicConfig, privateConfig, version)); } + public ExtensionConfigurationInput NewAzureServiceExtensionConfig(string extensionId, string extensionStatus, + string [] roles = null) + { + return + RunPSCmdletAndReturnFirst( + new NewAzureServiceExtensionConfigCmdletInfo(extensionId, extensionStatus, roles)); + } + // Set-AzureServiceExtension public ManagementOperationContext SetAzureServiceExtension(string serviceName, string extensionName, string providerNamespace, string publicConfig, string privateConfig, string[] roles = null, string slot = null, string version = null) diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs index f650aefa8c5c..7eaf07ad2739 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs @@ -39,6 +39,7 @@ public abstract class BaseAzureServiceExtensionCmdlet : ServiceManagementBaseCmd protected const string NewExtensionParameterSetName = "NewExtension"; protected const string NewExtensionUsingThumbprintParameterSetName = "NewExtensionUsingThumbprint"; + protected const string UpdateExtensionStatusParameterSetName = "UpdateExtensionStatusParameterSetName"; protected const string SetExtensionParameterSetName = "SetExtension"; protected const string SetExtensionUsingThumbprintParameterSetName = "SetExtensionUsingThumbprint"; protected const string SetExtensionUsingDiagnosticsConfigurationParameterSetName = "SetExtensionUsingDiagnosticsConfiguration"; @@ -66,6 +67,7 @@ public abstract class BaseAzureServiceExtensionCmdlet : ServiceManagementBaseCmd public virtual string ExtensionName { get; set; } public virtual string Version { get; set; } public virtual string ExtensionId { get; set; } + public virtual string ExtensionState { get; set; } public BaseAzureServiceExtensionCmdlet() : base() diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs index 9271713d190e..de7fcd1c46af 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs @@ -28,5 +28,6 @@ public class ExtensionConfigurationInput public string PrivateConfiguration { get; set; } public ExtensionRoleList Roles { get; set; } public X509Certificate2 X509Certificate { get; set; } + public string State { get; set; } } } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs index e9dc2a059c5f..f4f5c640d425 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs @@ -344,6 +344,40 @@ public ExtensionConfiguration Add(DeploymentGetResponse deployment, DeploymentGe return extConfig; } + public ExtensionConfiguration UpdateExtensionState(ExtensionConfigurationInput input) + { + var extConfig = new ExtensionConfiguration(); + if (input.Roles == null || input.Roles.Count == 1 && input.Roles[0].RoleType == ExtensionRoleType.AllRoles) + { + + extConfig.AllRoles = new List(); + extConfig.AllRoles.Add(new ExtensionConfiguration.Extension + { + Id = input.Id, + State = input.State + }); + } + else + { + extConfig.NamedRoles = new List(); + foreach (var role in input.Roles) + { + var ext = new List(); + ext.Add(new ExtensionConfiguration.Extension + { + Id = input.Id, + State = input.State + }); + extConfig.NamedRoles.Add(new ExtensionConfiguration.NamedRole + { + RoleName = role.RoleName, + Extensions = ext + }); + } + } + return extConfig; + } + public static bool Validate(ExtensionConfigurationInput[] inputs, out string errorConfigInput) { var roleList = (from c in inputs diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionParameterPropertyHelper.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionParameterPropertyHelper.cs index f7a0339702d0..269485aaeee7 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionParameterPropertyHelper.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionParameterPropertyHelper.cs @@ -29,5 +29,6 @@ public static class ExtensionParameterPropertyHelper public const string ExtensionNameHelpMessage = "Extension Name"; public const string VersionHelpMessage = "Extension Version"; public const string ExtensionIdHelpMessage = "Extension ID"; + public const string ExtensionStateHelpMessage = "Extension State. It is either Enable, Disable or Uninstall"; } } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs index 03596eea0db5..8ad7414b96bb 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs @@ -26,9 +26,11 @@ public class NewAzureServiceExtensionConfigCommand : BaseAzureServiceExtensionCm { private const string NetExtensionParameterSetName = NewExtensionParameterSetName; private const string NetExtensionUsingThumbprintParameterSetName = NewExtensionUsingThumbprintParameterSetName; + private const string NetUpdateExtensionStatusParameterSetName = UpdateExtensionStatusParameterSetName; [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.RoleHelpMessage)] [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionUsingThumbprintParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.RoleHelpMessage)] + [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] [ValidateNotNullOrEmpty] public override string[] Role { @@ -109,6 +111,7 @@ public override string Version [Parameter(Position = 8, Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] [Parameter(Position = 8, Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionUsingThumbprintParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] + [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)] [ValidateNotNullOrEmpty] public override string ExtensionId { @@ -116,6 +119,14 @@ public override string ExtensionId set; } + [Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionStateHelpMessage)] + [ValidateSet("Enable", "Disable", "Uninstall", IgnoreCase = true)] + public override string ExtensionState + { + get; + set; + } + protected override void ValidateParameters() { base.ValidateParameters(); @@ -129,6 +140,7 @@ public void ExecuteCommand() WriteObject(new ExtensionConfigurationInput { Id = ExtensionId, + State = ExtensionState, CertificateThumbprint = CertificateThumbprint, ThumbprintAlgorithm = ThumbprintAlgorithm, ProviderNameSpace = ProviderNamespace, diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs index 33b93a0d6de5..a2413613310d 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs @@ -192,7 +192,13 @@ public void ExecuteCommand() InvokeInOperationContext(() => peerDeployment = func(peerSlottype)); ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName); - extConfig = extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot); + + foreach (var config in ExtensionConfiguration) + { + extConfig = (config.State == null) + ? extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot) + : extensionMgr.UpdateExtensionState(config); + } } // Upgrade Parameter Set diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs index 1cb67fd6b9f8..8c19bb15d98b 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs @@ -180,6 +180,12 @@ public PVM.LoadBalancerList LoadBalancers protected set; } + public PVM.ExtensionConfiguration ExtensionConfiguration + { + get; + protected set; + } + public DeploymentInfoContext(DeploymentGetResponse deployment) { this.Slot = deployment.DeploymentSlot.ToString(); @@ -287,6 +293,35 @@ from b in deployment.LoadBalancers this.InternalLoadBalancerName = this.LoadBalancers == null || !this.LoadBalancers.Any() ? null : this.LoadBalancers.First().Name; } + + // ExtensionConfiguration + if (deployment.ExtensionConfiguration != null) + { + this.ExtensionConfiguration = new PVM.ExtensionConfiguration(); + if (deployment.ExtensionConfiguration.AllRoles != null) + { + this.ExtensionConfiguration.AllRoles = new PVM.AllRoles( + from all in deployment.ExtensionConfiguration.AllRoles + select new PVM.Extension(all.Id, 0, all.State)); + } + + if (deployment.ExtensionConfiguration.NamedRoles != null) + { + this.ExtensionConfiguration.NamedRoles = new PVM.NamedRoles(); + foreach (var role in deployment.ExtensionConfiguration.NamedRoles) + { + var extList = new PVM.ExtensionList( + from ext in role.Extensions + select new PVM.Extension(ext.Id, 0, ext.State)); + + this.ExtensionConfiguration.NamedRoles.Add(new PVM.RoleExtensions + { + RoleName = role.RoleName, + Extensions = extList + }); + } + } + } } public XDocument SerializeRolesConfiguration() From 10e283b3027ef94276668c8766e4a82388066e6f Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Thu, 28 Jan 2016 14:26:34 -0800 Subject: [PATCH 5/9] Update ASM compute library version to 12.5.0 --- .../Commands.ApiManagement.Test.csproj | 4 ++-- .../ApiManagement/Commands.ApiManagement.Test/packages.config | 2 +- .../Commands.ApiManagement.ServiceManagement.Test.csproj | 4 ++-- .../ApiManagement/Commands.SMAPI.Test/packages.config | 2 +- .../Commands.Profile.Test/Commands.Profile.Test.csproj | 2 +- .../Profile/Commands.Profile.Test/packages.config | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj index 5e6563adb64b..72f0cff7a47c 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj @@ -109,9 +109,9 @@ False ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config index c32aaebf6581..05a392db53b4 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config @@ -18,7 +18,7 @@ - + diff --git a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj index 7f9d5f9391b6..725df5173b4c 100644 --- a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj +++ b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj @@ -109,9 +109,9 @@ False ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - + False - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll False diff --git a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config index 1d7932d647b7..182b8a529d75 100644 --- a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config +++ b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config @@ -19,7 +19,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 b64114529c17..de156b5b3d74 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj +++ b/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj @@ -126,7 +126,7 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/packages.config b/src/ResourceManager/Profile/Commands.Profile.Test/packages.config index c17ed8d2d7e4..7fd51e088a33 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/packages.config +++ b/src/ResourceManager/Profile/Commands.Profile.Test/packages.config @@ -20,7 +20,7 @@ - + From 86481a952bbbada9ad3181c94f6f5f3d7e484b7f Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Thu, 28 Jan 2016 15:40:29 -0800 Subject: [PATCH 6/9] Fix Set-AzureDeployment cmdlet --- .../HostedServices/SetAzureDeployment.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs index a2413613310d..4f94fad9a5a6 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs @@ -193,12 +193,9 @@ public void ExecuteCommand() ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName); - foreach (var config in ExtensionConfiguration) - { - extConfig = (config.State == null) - ? extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot) - : extensionMgr.UpdateExtensionState(config); - } + extConfig = (ExtensionConfiguration[0].State == null) + ? extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot) + : extensionMgr.UpdateExtensionState(ExtensionConfiguration[0]); } // Upgrade Parameter Set From 4371311a7385c578979c3caf91040ffcc1a16203 Mon Sep 17 00:00:00 2001 From: yantang Date: Mon, 1 Feb 2016 11:39:30 -0800 Subject: [PATCH 7/9] Diagnostics extension support blob config which is defined as WadCfgBlob in the configuration file --- .../Common/DiagnosticsHelper.cs | 8 +++++++- .../Properties/Resources.Designer.cs | 6 +++--- .../Properties/Resources.resx | 4 ++-- .../Common/DiagnosticsHelper.cs | 8 +++++++- .../BaseAzureServiceDiagnosticsExtension.cs | 19 +++++++++++++++---- .../Properties/Resources.Designer.cs | 15 ++++++++++++--- .../Properties/Resources.resx | 7 +++++-- 7 files changed, 51 insertions(+), 16 deletions(-) diff --git a/src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs b/src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs index b6343f0268ce..91530f18e349 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs @@ -36,6 +36,7 @@ public static class DiagnosticsHelper private static string XmlNamespace = "http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration"; private static string EncodedXmlCfg = "xmlCfg"; private static string WadCfg = "WadCfg"; + private static string WadCfgBlob = "WadCfgBlob"; private static string StorageAccount = "storageAccount"; private static string Path = "path"; private static string ExpandResourceDirectory = "expandResourceDirectory"; @@ -163,6 +164,7 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s var publicConfig = GetPublicConfigJObjectFromJsonFile(configurationPath); var properties = publicConfig.Properties().Select(p => p.Name); var wadCfgProperty = properties.FirstOrDefault(p => p.Equals(WadCfg, StringComparison.OrdinalIgnoreCase)); + var wadCfgBlobProperty = properties.FirstOrDefault(p => p.Equals(WadCfgBlob, StringComparison.OrdinalIgnoreCase)); var xmlCfgProperty = properties.FirstOrDefault(p => p.Equals(EncodedXmlCfg, StringComparison.OrdinalIgnoreCase)); var hashTable = new Hashtable(); @@ -172,13 +174,17 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s { hashTable.Add(wadCfgProperty, publicConfig[wadCfgProperty]); } + else if (wadCfgBlobProperty != null) + { + hashTable.Add(wadCfgBlobProperty, publicConfig[wadCfgBlobProperty]); + } else if (xmlCfgProperty != null) { hashTable.Add(xmlCfgProperty, publicConfig[xmlCfgProperty]); } else { - throw new ArgumentException(Properties.Resources.DiagnosticsExtensionConfigNoWadCfgOrXmlCfg); + throw new ArgumentException(Properties.Resources.DiagnosticsExtensionIaaSConfigElementNotDefined); } return hashTable; diff --git a/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs b/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs index cfa13e50905c..11206a97fe03 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs @@ -279,11 +279,11 @@ public static string DataDiskNotAssignedForVM { } /// - /// Looks up a localized string similar to WadCfg or xmlCfg is not defined in configuration file.. + /// Looks up a localized string similar to No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file.. /// - public static string DiagnosticsExtensionConfigNoWadCfgOrXmlCfg { + public static string DiagnosticsExtensionIaaSConfigElementNotDefined { get { - return ResourceManager.GetString("DiagnosticsExtensionConfigNoWadCfgOrXmlCfg", resourceCulture); + return ResourceManager.GetString("DiagnosticsExtensionIaaSConfigElementNotDefined", resourceCulture); } } diff --git a/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx b/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx index 75b5a9b2ba5c..08aaacb31df3 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx +++ b/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx @@ -482,8 +482,8 @@ The file needs to be a PowerShell script (.ps1 or .psm1) or a ZIP archive (.zip) Storage account endpoint is not defined or can not be retrieved automatically.. - - WadCfg or xmlCfg is not defined in configuration file. + + No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file. Invalid diagnostics configuration file. It should be in Invalid diagnostics configuration file. It should be in either xml or json format.either xml or json format. diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Common/DiagnosticsHelper.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Common/DiagnosticsHelper.cs index 1904a26a6db7..a12343621b4f 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Common/DiagnosticsHelper.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Common/DiagnosticsHelper.cs @@ -35,6 +35,7 @@ public static class DiagnosticsHelper private static string XmlNamespace = "http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration"; private static string EncodedXmlCfg = "xmlCfg"; private static string WadCfg = "WadCfg"; + private static string WadCfgBlob = "WadCfgBlob"; private static string StorageAccount = "storageAccount"; private static string Path = "path"; private static string ExpandResourceDirectory = "expandResourceDirectory"; @@ -162,6 +163,7 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s var publicConfig = GetPublicConfigJObjectFromJsonFile(configurationPath); var properties = publicConfig.Properties().Select(p => p.Name); var wadCfgProperty = properties.FirstOrDefault(p => p.Equals(WadCfg, StringComparison.OrdinalIgnoreCase)); + var wadCfgBlobProperty = properties.FirstOrDefault(p => p.Equals(WadCfgBlob, StringComparison.OrdinalIgnoreCase)); var xmlCfgProperty = properties.FirstOrDefault(p => p.Equals(EncodedXmlCfg, StringComparison.OrdinalIgnoreCase)); var hashTable = new Hashtable(); @@ -171,13 +173,17 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s { hashTable.Add(wadCfgProperty, publicConfig[wadCfgProperty]); } + else if (wadCfgBlobProperty != null) + { + hashTable.Add(wadCfgBlobProperty, publicConfig[wadCfgBlobProperty]); + } else if (xmlCfgProperty != null) { hashTable.Add(xmlCfgProperty, publicConfig[xmlCfgProperty]); } else { - throw new ArgumentException(Properties.Resources.DiagnosticsExtensionConfigNoWadCfgOrXmlCfg); + throw new ArgumentException(Properties.Resources.DiagnosticsExtensionIaaSConfigElementNotDefined); } return hashTable; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs index 369200f2b54e..cc0251d790f7 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs @@ -123,12 +123,20 @@ protected override void ValidateConfiguration() publicConfigElem.SetAttributeValue("xmlns", XmlNamespace); PublicConfiguration = publicConfigElem.ToString(); - // The element is not meant to be set by the user in the public config. - // Make sure it matches the storage account in the private config. XmlDocument doc = new XmlDocument(); XmlNamespaceManager ns = new XmlNamespaceManager(doc.NameTable); ns.AddNamespace("ns", XmlNamespace); doc.Load(DiagnosticsConfigurationPath); + + // Make sure the configuration element exist + var config = doc.SelectSingleNode("//ns:WadCfg", ns) ?? doc.SelectSingleNode("//ns:WadCfgBlob", ns); + if (config == null) + { + throw new ArgumentException(Resources.DiagnosticsExtensionPaaSConfigElementNotDefined); + } + + // The element is not meant to be set by the user in the public config. + // Make sure it matches the storage account in the private config. var node = doc.SelectSingleNode("//ns:StorageAccount", ns); if(node != null) { @@ -147,9 +155,12 @@ protected override void ValidateConfiguration() { // the StorageAccount is not there. we must set it string storageAccountElem = "\n" + StorageAccountName + "\n"; - // insert it after + + // insert it after or int wadCfgEndIndex = PublicConfiguration.IndexOf(""); - PublicConfiguration = PublicConfiguration.Insert(wadCfgEndIndex + "".Length, storageAccountElem); + int wadCfgBlobEndIndex = PublicConfiguration.IndexOf(""); + int insertIndex = wadCfgEndIndex >= 0 ? wadCfgEndIndex + "".Length : wadCfgBlobEndIndex + "".Length; + PublicConfiguration = PublicConfiguration.Insert(insertIndex, storageAccountElem); } // Make sure the storage account name in PrivateConfig matches. diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs index 02b39bfd7f05..536e4abd29dc 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs @@ -485,11 +485,11 @@ public static string DeprovisioningVM { } /// - /// Looks up a localized string similar to WadCfg or xmlCfg is not defined in configuration file.. + /// Looks up a localized string similar to No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file.. /// - public static string DiagnosticsExtensionConfigNoWadCfgOrXmlCfg { + public static string DiagnosticsExtensionIaaSConfigElementNotDefined { get { - return ResourceManager.GetString("DiagnosticsExtensionConfigNoWadCfgOrXmlCfg", resourceCulture); + return ResourceManager.GetString("DiagnosticsExtensionIaaSConfigElementNotDefined", resourceCulture); } } @@ -565,6 +565,15 @@ public static string DiagnosticsExtensionNullStorageAccountName { } } + /// + /// Looks up a localized string similar to No WadCfg or WadCfgBlob element is defined in the configuration file.. + /// + public static string DiagnosticsExtensionPaaSConfigElementNotDefined { + get { + return ResourceManager.GetString("DiagnosticsExtensionPaaSConfigElementNotDefined", resourceCulture); + } + } + /// /// Looks up a localized string similar to Your xml configuration file doesn't start with the required header <?xml version="1.0" encoding="utf-8"?>. /// diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx index b1b555e22972..2e4a02076fd0 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx @@ -783,10 +783,13 @@ WadCfg start element in the config is not matching the end element. - - WadCfg or xmlCfg is not defined in configuration file. + + No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file. Invalid diagnostics configuration file. It should be in either xml or json format. + + No WadCfg or WadCfgBlob element is defined in the configuration file. + \ No newline at end of file From 94d11f13599e0ddfdd5aa57847360719dac73c8e Mon Sep 17 00:00:00 2001 From: yantang Date: Tue, 2 Feb 2016 16:19:51 -0800 Subject: [PATCH 8/9] Resolve some comments --- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Resources.resx | 2 +- .../BaseAzureServiceDiagnosticsExtension.cs | 31 +++++++++---------- .../Properties/Resources.Designer.cs | 4 +-- .../Properties/Resources.resx | 4 +-- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs b/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs index 11206a97fe03..0c9c67948311 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs @@ -279,7 +279,7 @@ public static string DataDiskNotAssignedForVM { } /// - /// Looks up a localized string similar to No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file.. + /// Looks up a localized string similar to No WadCfg, WadCfgBlob or xmlCfg element defined in the configuration file.. /// public static string DiagnosticsExtensionIaaSConfigElementNotDefined { get { diff --git a/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx b/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx index 08aaacb31df3..2b2bde3d38b9 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx +++ b/src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx @@ -483,7 +483,7 @@ The file needs to be a PowerShell script (.ps1 or .psm1) or a ZIP archive (.zip) Storage account endpoint is not defined or can not be retrieved automatically.. - No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file. + No WadCfg, WadCfgBlob or xmlCfg element defined in the configuration file. Invalid diagnostics configuration file. It should be in Invalid diagnostics configuration file. It should be in either xml or json format.either xml or json format. diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs index cc0251d790f7..b368789d822b 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs @@ -129,38 +129,37 @@ protected override void ValidateConfiguration() doc.Load(DiagnosticsConfigurationPath); // Make sure the configuration element exist - var config = doc.SelectSingleNode("//ns:WadCfg", ns) ?? doc.SelectSingleNode("//ns:WadCfgBlob", ns); - if (config == null) + var configElement = doc.SelectSingleNode("//ns:WadCfg", ns) ?? doc.SelectSingleNode("//ns:WadCfgBlob", ns); + if (configElement == null) { throw new ArgumentException(Resources.DiagnosticsExtensionPaaSConfigElementNotDefined); } // The element is not meant to be set by the user in the public config. // Make sure it matches the storage account in the private config. - var node = doc.SelectSingleNode("//ns:StorageAccount", ns); - if(node != null) + var storageAccountElement = doc.SelectSingleNode("//ns:StorageAccount", ns); + if(storageAccountElement != null) { // The StorageAccount is empty, we must set it - if (string.IsNullOrEmpty(node.InnerText)) + if (string.IsNullOrEmpty(storageAccountElement.InnerText)) { - var insertIndex = PublicConfiguration.IndexOf(""); - PublicConfiguration = PublicConfiguration.Insert(insertIndex, StorageAccountName); + storageAccountElement.InnerText = StorageAccountName; + PublicConfiguration = doc.OuterXml; } - else if (!string.IsNullOrEmpty(node.InnerText) && string.Compare(node.InnerText, StorageAccountName, true) != 0) + else if (!string.IsNullOrEmpty(storageAccountElement.InnerText) && string.Compare(storageAccountElement.InnerText, StorageAccountName, true) != 0) { throw new ArgumentException(Resources.DiagnosticsExtensionNoMatchStorageAccount); } } else { - // the StorageAccount is not there. we must set it - string storageAccountElem = "\n" + StorageAccountName + "\n"; - - // insert it after or - int wadCfgEndIndex = PublicConfiguration.IndexOf(""); - int wadCfgBlobEndIndex = PublicConfiguration.IndexOf(""); - int insertIndex = wadCfgEndIndex >= 0 ? wadCfgEndIndex + "".Length : wadCfgBlobEndIndex + "".Length; - PublicConfiguration = PublicConfiguration.Insert(insertIndex, storageAccountElem); + // The StorageAccount is not there. we must set it + storageAccountElement = doc.CreateElement("StorageAccount", XmlNamespace); + storageAccountElement.InnerText = StorageAccountName; + + // Insert it after or + configElement.ParentNode.AppendChild(storageAccountElement); + PublicConfiguration = doc.OuterXml; } // Make sure the storage account name in PrivateConfig matches. diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs index 536e4abd29dc..bd16e884603c 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs @@ -485,7 +485,7 @@ public static string DeprovisioningVM { } /// - /// Looks up a localized string similar to No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file.. + /// Looks up a localized string similar to No WadCfg, WadCfgBlob or xmlCfg element defined in the configuration file.. /// public static string DiagnosticsExtensionIaaSConfigElementNotDefined { get { @@ -566,7 +566,7 @@ public static string DiagnosticsExtensionNullStorageAccountName { } /// - /// Looks up a localized string similar to No WadCfg or WadCfgBlob element is defined in the configuration file.. + /// Looks up a localized string similar to No WadCfg or WadCfgBlob element defined in the configuration file.. /// public static string DiagnosticsExtensionPaaSConfigElementNotDefined { get { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx index 2e4a02076fd0..a1f9d1f8839c 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx @@ -784,12 +784,12 @@ WadCfg start element in the config is not matching the end element. - No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file. + No WadCfg, WadCfgBlob or xmlCfg element defined in the configuration file. Invalid diagnostics configuration file. It should be in either xml or json format. - No WadCfg or WadCfgBlob element is defined in the configuration file. + No WadCfg or WadCfgBlob element defined in the configuration file. \ No newline at end of file From d4cfce7790e2829d09c2a4a628d5cba0973604bb Mon Sep 17 00:00:00 2001 From: Hovsep Mkrtchyan Date: Thu, 4 Feb 2016 17:06:04 -0800 Subject: [PATCH 9/9] Revert "Merge pull request #1769 from hovsepm/dev" This reverts commit 27b466a7f210c293fb5292cf99dc87c60f39a720, reversing changes made to 096dc3423f51145f55b15f799e1bf4810bc817de. --- setup/azurecmdfiles.wxi | 236 +++++++++++++----- .../Dns/Commands.Dns/Commands.Dns.csproj | 12 + .../Dns/Commands.Dns/packages.config | 4 + .../Commands.Network/Commands.Network.csproj | 26 +- .../Network/Commands.Network/packages.config | 6 + .../Commands.RedisCache.csproj | 16 ++ .../Commands.RedisCache/packages.config | 7 +- .../Sql/Commands.Sql/Commands.Sql.csproj | 24 ++ .../Sql/Commands.Sql/packages.config | 6 + .../Commands.StreamAnalytics.csproj | 24 ++ .../Commands.StreamAnalytics/packages.config | 6 + .../Commands.TrafficManager.csproj | 12 + .../Commands.TrafficManager/packages.config | 4 + 13 files changed, 313 insertions(+), 70 deletions(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 68cadc0d4524..81e2f2938431 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -292,72 +292,69 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + @@ -1125,6 +1122,15 @@ + + + + + + + + + @@ -1155,6 +1161,9 @@ + + + @@ -1544,6 +1553,9 @@ + + + @@ -1553,6 +1565,15 @@ + + + + + + + + + @@ -1583,6 +1604,9 @@ + + + @@ -1595,6 +1619,9 @@ + + + @@ -2229,6 +2256,9 @@ + + + @@ -2241,6 +2271,15 @@ + + + + + + + + + @@ -2265,6 +2304,9 @@ + + + @@ -2280,6 +2322,9 @@ + + + @@ -2458,12 +2503,24 @@ + + + + + + + + + + + + @@ -2485,6 +2542,9 @@ + + + @@ -2494,6 +2554,9 @@ + + + @@ -4748,6 +4811,15 @@ + + + + + + + + + @@ -4799,6 +4871,9 @@ + + + @@ -4900,28 +4975,27 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -5172,6 +5246,9 @@ + + + @@ -5182,6 +5259,7 @@ + @@ -5309,9 +5387,13 @@ + + + + @@ -5322,10 +5404,12 @@ + + @@ -5532,10 +5616,14 @@ + + + + @@ -5544,11 +5632,13 @@ + + @@ -5607,8 +5697,12 @@ + + + + @@ -5616,9 +5710,11 @@ + + @@ -6337,6 +6433,9 @@ + + + @@ -6354,6 +6453,7 @@ + diff --git a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj index 7babc2857b83..2a6225b5e2bf 100644 --- a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj +++ b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj @@ -113,6 +113,15 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll + + ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + + + ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + + + ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -155,6 +164,9 @@ ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll + + ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + diff --git a/src/ResourceManager/Dns/Commands.Dns/packages.config b/src/ResourceManager/Dns/Commands.Dns/packages.config index a6b8bf3b894b..50800a64b0e9 100644 --- a/src/ResourceManager/Dns/Commands.Dns/packages.config +++ b/src/ResourceManager/Dns/Commands.Dns/packages.config @@ -10,9 +10,13 @@ + + + + \ No newline at end of file diff --git a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj index 37bcac8738dd..c4fe3e8d7089 100644 --- a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj +++ b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj @@ -68,6 +68,10 @@ False ..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.9.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll + + ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll + True + False ..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll @@ -76,7 +80,19 @@ ..\..\..\packages\Microsoft.Azure.Management.Network.3.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll True - + + False + ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + + + False + ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + + + False + ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -108,6 +124,10 @@ False ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + + False + ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + False ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -126,6 +146,10 @@ + + False + ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + diff --git a/src/ResourceManager/Network/Commands.Network/packages.config b/src/ResourceManager/Network/Commands.Network/packages.config index afa8b7ef7305..ebfd14bf2d62 100644 --- a/src/ResourceManager/Network/Commands.Network/packages.config +++ b/src/ResourceManager/Network/Commands.Network/packages.config @@ -7,16 +7,22 @@ + + + + + + \ No newline at end of file diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj index 6e9dbce421b2..03d35a51a510 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj +++ b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj @@ -71,6 +71,18 @@ False ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll + + ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + True + + + ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + True + + + ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + True + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -128,6 +140,10 @@ + + ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + True + diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config b/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config index b96ca34e96e9..0d6be3f88d9e 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config +++ b/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config @@ -11,10 +11,15 @@ + + + - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj index 9faa5c8cc15e..57beb11eb95a 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj +++ b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj @@ -278,6 +278,10 @@ False ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll + + ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll + True + False ..\..\..\packages\Microsoft.Azure.Management.Sql.0.43.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll @@ -290,6 +294,18 @@ False ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll + + False + ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + + + False + ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + + + False + ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -317,6 +333,10 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll + + False + ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + False ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -339,6 +359,10 @@ ..\..\..\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 + diff --git a/src/ResourceManager/Sql/Commands.Sql/packages.config b/src/ResourceManager/Sql/Commands.Sql/packages.config index cfdb792972a0..e8cb4e3a1926 100644 --- a/src/ResourceManager/Sql/Commands.Sql/packages.config +++ b/src/ResourceManager/Sql/Commands.Sql/packages.config @@ -4,12 +4,16 @@ + + + + @@ -17,4 +21,6 @@ + + diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj index 24c2036515c6..10bdca9a79ee 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj @@ -61,6 +61,10 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll + + ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll + True + False ..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.1.7.3\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll @@ -69,6 +73,18 @@ False ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll + + False + ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + + + False + ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + + + False + ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -88,6 +104,10 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll + + False + ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + False ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -105,6 +125,10 @@ ..\..\..\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 + diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config index d1a78d360d8b..9df41525bf19 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config @@ -4,15 +4,21 @@ + + + + + + \ No newline at end of file diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj index cec634ca02f2..f9defd8bf7b8 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj @@ -62,6 +62,15 @@ False ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll + + ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + + + ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + + + ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -114,6 +123,9 @@ ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll + + ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/packages.config b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/packages.config index 271578ddb10c..4d2752df101a 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/packages.config +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/packages.config @@ -8,6 +8,9 @@ + + + @@ -15,4 +18,5 @@ + \ No newline at end of file