From d3d6a46ef6d42519dbad4d3e111494642638c9fd Mon Sep 17 00:00:00 2001 From: MiYanni Date: Wed, 21 Feb 2018 17:23:18 -0800 Subject: [PATCH 1/5] Major cleanup of dependencies for many projects. Removed uses of WindowsAzure.Storage from several projects that were not using it. Fixed many solutions to now build properly on a clean local repo (independent of any other solution being built). --- setup/azurecmdfiles.wxi | 148 ++---------------- ....Common.Authentication.Abstractions.csproj | 7 - .../Commands.Common.Authentication.csproj | 7 - .../Commands.Common.Authorization.csproj | 21 --- .../Commands.Common.Graph.RBAC.csproj | 27 ---- .../packages.config | 4 - .../Commands.Common.Network.csproj | 11 -- .../Commands.Common.Storage.csproj | 66 -------- .../ResourceModel/AzureStorageBase.cs | 7 +- .../Commands.Common.Storage/packages.config | 18 --- .../Commands.Common/Commands.Common.csproj | 11 -- .../ApiManagement/ApiManagement.sln | 7 +- ...nds.ApiManagement.ServiceManagement.csproj | 32 ---- .../packages.config | 2 - .../Commands.ApiManagement.Test.csproj | 14 -- .../packages.config | 2 +- .../Commands.ApiManagement.csproj | 16 +- .../Commands.ApiManagement/packages.config | 5 +- ...piManagement.ServiceManagement.Test.csproj | 16 -- .../Commands.SMAPI.Test/packages.config | 2 +- .../Commands.Batch.Test.csproj | 19 --- .../Commands.Batch.Test/packages.config | 1 - .../Commands.Batch/Commands.Batch.csproj | 16 +- .../AzureBatch/Commands.Batch/packages.config | 5 +- ...mmon.Authentication.ResourceManager.csproj | 6 - .../Commands.ResourceManager.Common.csproj | 6 - ...cenarioTests.ResourceManager.Common.csproj | 8 - .../Commands.Compute/Commands.Compute.csproj | 4 - .../Compute/Commands.Compute/packages.config | 1 - .../Compute/Stack/Sync/Sync.csproj | 36 +---- .../Compute/Stack/Sync/packages.config | 13 +- .../Commands.DataFactories.Test.csproj | 21 --- .../packages.config | 2 +- .../Commands.DataFactories.csproj | 19 ++- .../Commands.DataFactories/packages.config | 5 +- .../Commands.DataFactoryV2.Test.csproj | 57 ------- .../packages.config | 10 +- .../Commands.DataFactoryV2.csproj | 4 - .../Commands.DataFactoryV2/packages.config | 5 - .../Commands.HDInsight.Test.csproj | 46 ------ .../Commands.HDInsight.Test/packages.config | 9 +- .../Commands.HDInsight.csproj | 24 +-- .../Models/Management/AzureHDInsightOMS.cs | 1 - .../Commands.HDInsight/packages.config | 9 +- src/ResourceManager/HDInsight/HDInsight.sln | 7 +- .../Commands.Insights.csproj | 4 - .../Commands.Insights/packages.config | 1 - .../Commands.KeyVault.csproj | 23 ++- .../Commands.KeyVault/packages.config | 4 + .../Commands.Profile.Test.csproj | 34 ---- .../Commands.Profile.Test/packages.config | 7 - .../Commands.Profile/Commands.Profile.csproj | 9 -- .../Resources/AzureRM.Resources.psd1 | 1 - .../Commands.Resources.Test.csproj | 33 ---- .../Commands.Resources.Test/packages.config | 6 - .../Commands.Resources.csproj | 3 - .../Commands.Resources/packages.config | 1 - src/ResourceManager/Resources/Resources.sln | 10 +- .../Commands.Scheduler.Test.csproj | 19 --- src/ResourceManager/Sql/AzureRM.Sql.psd1 | 5 +- .../Commands.Sql.Test.csproj | 41 ----- .../Sql/Commands.Sql.Test/packages.config | 7 - .../Sql/Commands.Sql/Commands.Sql.csproj | 25 --- .../Sql/Commands.Sql/packages.config | 2 - src/ResourceManager/Sql/Sql.sln | 7 +- .../Commands.Management.Storage.Test.csproj | 15 ++ .../packages.config | 7 +- .../Commands.Management.Storage.csproj | 8 - .../packages.config | 5 +- .../AzureRM.StreamAnalytics.psd1 | 5 +- .../Commands.StreamAnalytics.Test.csproj | 52 ------ .../packages.config | 10 +- .../Commands.StreamAnalytics.csproj | 24 --- .../Commands.StreamAnalytics/packages.config | 2 - .../Tags/Commands.Tags/Commands.Tags.csproj | 7 +- .../Commands.ServiceManagement.Common.csproj | 8 - .../Commands.Storage/Commands.Storage.csproj | 3 - 77 files changed, 179 insertions(+), 966 deletions(-) delete mode 100644 src/Common/Commands.Common.Storage/packages.config diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 632eab758fc6..e10022d19e4d 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -126,6 +126,11 @@ + + + + + @@ -691,15 +696,6 @@ - - - - - - - - - @@ -709,51 +705,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -954,6 +908,9 @@ + + + @@ -1225,21 +1182,6 @@ - - - - - - - - - - - - - - - @@ -1312,9 +1254,11 @@ - - - + + + + + @@ -1500,21 +1444,6 @@ - - - - - - - - - - - - - - - @@ -1575,21 +1504,6 @@ - - - - - - - - - - - - - - - @@ -3257,6 +3171,7 @@ + @@ -3428,27 +3343,10 @@ - - - - - - - - - - - - - - - - - @@ -3509,6 +3407,7 @@ + @@ -3592,11 +3491,6 @@ - - - - - @@ -3619,7 +3513,7 @@ - + @@ -3675,11 +3569,6 @@ - - - - - @@ -3698,11 +3587,6 @@ - - - - - diff --git a/src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj b/src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj index e896be268ad6..07028a3390ae 100644 --- a/src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj +++ b/src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj @@ -88,14 +88,7 @@ ..\..\..\src\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Primitives.dll True - - - - - - - diff --git a/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj b/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj index 2ad115a76fca..cae20f8ac5ae 100644 --- a/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj +++ b/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj @@ -111,15 +111,8 @@ ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll True - - - - - - - diff --git a/src/Common/Commands.Common.Authorization/Commands.Common.Authorization.csproj b/src/Common/Commands.Common.Authorization/Commands.Common.Authorization.csproj index 930a20844235..9cd2d5892469 100644 --- a/src/Common/Commands.Common.Authorization/Commands.Common.Authorization.csproj +++ b/src/Common/Commands.Common.Authorization/Commands.Common.Authorization.csproj @@ -60,14 +60,7 @@ - - - - - - - @@ -109,20 +102,6 @@ - - - {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} - Commands.ResourceManager.Common - - - {70527617-7598-4aef-b5bd-db9186b8184b} - Commands.Common.Authentication.Abstractions - - - {5ee72c53-1720-4309-b54b-5fb79703195f} - Commands.Common - - ..\..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - - - False - ..\..\..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + + ..\..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - - - diff --git a/src/ResourceManager/Compute/Stack/Sync/packages.config b/src/ResourceManager/Compute/Stack/Sync/packages.config index cdfe596b3463..f23633cf757f 100644 --- a/src/ResourceManager/Compute/Stack/Sync/packages.config +++ b/src/ResourceManager/Compute/Stack/Sync/packages.config @@ -1,11 +1,8 @@  - - - - - - - + + + + - + \ No newline at end of file diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj index bb6d996f3df1..403a8c18a02a 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj @@ -125,9 +125,6 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - - ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - False ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll @@ -146,16 +143,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 - - - - - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True @@ -300,10 +291,6 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {d3804b64-c0d3-48f8-82ec-1f632f833c9e} - Commands.Common.Authentication - {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common @@ -312,18 +299,10 @@ {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} - Commands.Common.Storage - {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {8058d403-06e3-4bed-8924-d166ce303961} - Commands.Resources.Rest - {9577252e-0a6b-4d61-86e8-95f7f309a987} Commands.DataFactories diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config index a21a797717f1..beb036333f1a 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj index b37feb20ac11..3821159013c3 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj @@ -48,16 +48,20 @@ false - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - False ..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.13.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll - - False + + ..\..\..\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 + + False ..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.4.6604.1\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll @@ -65,6 +69,9 @@ True + + ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config index ac322df8ef89..d3f927a7dbe2 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config @@ -1,7 +1,10 @@  - + + + + \ No newline at end of file diff --git a/src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.csproj b/src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.csproj index e5f9301bd029..01f413b7d6c2 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.csproj @@ -67,48 +67,15 @@ ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.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 - False ..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.4.6604.1\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll - - ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll - True - - - ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll - True - - - ..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll - True - ..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.2\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll True - - ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - - - - False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True @@ -160,34 +127,10 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {d3804b64-c0d3-48f8-82ec-1f632f833c9e} - Commands.Common.Authentication - - - {5ee72c53-1720-4309-b54b-5fb79703195f} - Commands.Common - - - {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} - Commands.ResourceManager.Common - - - {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} - Commands.Common.Storage - {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {8058d403-06e3-4bed-8924-d166ce303961} - Commands.Resources.Rest - - - {26B676D3-E448-4FA5-A23C-C79E7753D280} - Commands.DataFactoryV2 - diff --git a/src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/packages.config index 501d025e4cb6..acff45e1dd84 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/packages.config @@ -3,7 +3,7 @@ - + @@ -11,18 +11,12 @@ - - - - - - @@ -30,4 +24,4 @@ - + \ No newline at end of file diff --git a/src/ResourceManager/DataFactories/Commands.DataFactoryV2/Commands.DataFactoryV2.csproj b/src/ResourceManager/DataFactories/Commands.DataFactoryV2/Commands.DataFactoryV2.csproj index d94e190db40d..2296781b8dcb 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactoryV2/Commands.DataFactoryV2.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactoryV2/Commands.DataFactoryV2.csproj @@ -190,10 +190,6 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {d3804b64-c0d3-48f8-82ec-1f632f833c9e} - Commands.Common.Authentication - {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ResourceManager/DataFactories/Commands.DataFactoryV2/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactoryV2/packages.config index 20830783c22c..5192d5107667 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactoryV2/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactoryV2/packages.config @@ -1,10 +1,5 @@  - - - - - \ No newline at end of file diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj index 30f51b8e2006..d226a071330c 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj +++ b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj @@ -72,18 +72,6 @@ ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.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.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -109,18 +97,6 @@ ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - False - ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - - - False - ..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -130,22 +106,8 @@ - - - - - - - False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - - - - - - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True @@ -191,10 +153,6 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {d3804b64-c0d3-48f8-82ec-1f632f833c9e} - Commands.Common.Authentication - {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common @@ -207,10 +165,6 @@ {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {E1F5201D-6067-430E-B303-4E367652991B} - Commands.Resources - {6b7540c5-8ab3-4011-864b-0be76f282f9e} Commands.HDInsight diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config index a98c631f6904..a83821c8dab7 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config +++ b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config @@ -4,7 +4,6 @@ - @@ -15,18 +14,12 @@ - - - - - - @@ -34,4 +27,4 @@ - + \ No newline at end of file diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj index e14e0f28f676..48ea9d1e66f7 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj @@ -131,16 +131,22 @@ False ..\..\..\packages\Microsoft.Azure.Management.HDInsight.Job.2.0.4\lib\net40\Microsoft.Azure.Management.HDInsight.Job.dll - - False - ..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + + ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True + + ..\..\..\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\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + + ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + @@ -151,10 +157,6 @@ {269acf73-0a34-42dc-ab9c-4b15931a489d} Commands.Common.Graph.RBAC - - {D3804B64-C0D3-48F8-82EC-1F632F833C9E} - Commands.Common.Authentication - {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightOMS.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightOMS.cs index 205cde855333..6741ff5f708e 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightOMS.cs +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightOMS.cs @@ -13,7 +13,6 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Management.HDInsight.Models; -using Newtonsoft.Json.Linq; namespace Microsoft.Azure.Commands.HDInsight.Models.Management { diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config b/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config index 65011fd94e8d..b1a52e373f25 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config @@ -1,7 +1,10 @@  - - - + + + + + + \ No newline at end of file diff --git a/src/ResourceManager/HDInsight/HDInsight.sln b/src/ResourceManager/HDInsight/HDInsight.sln index 40a86684d30b..3bc0c6923262 100644 --- a/src/ResourceManager/HDInsight/HDInsight.sln +++ b/src/ResourceManager/HDInsight/HDInsight.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" EndProject @@ -121,4 +121,7 @@ Global {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} {CFF09E81-1E31-444E-B4D4-A21E946C29E2} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6AB9B3A2-9258-4A64-BC35-648F704648A7} + EndGlobalSection EndGlobal diff --git a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj index 034ec695cdbc..bfdca4c1df89 100644 --- a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj +++ b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj @@ -46,10 +46,6 @@ ..\..\..\packages\Microsoft.Azure.Management.Monitor.0.16.1-preview\lib\net452\Microsoft.Azure.Management.Monitor.dll - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - diff --git a/src/ResourceManager/Insights/Commands.Insights/packages.config b/src/ResourceManager/Insights/Commands.Insights/packages.config index 0019c5a35635..660c96939a33 100644 --- a/src/ResourceManager/Insights/Commands.Insights/packages.config +++ b/src/ResourceManager/Insights/Commands.Insights/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj index e379b7ac7c38..9b419349ceaf 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj +++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj @@ -195,8 +195,20 @@ ..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.3.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll True + + ..\..\..\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\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + @@ -229,13 +241,10 @@ - - - - + + + + \ No newline at end of file diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/packages.config b/src/ResourceManager/KeyVault/Commands.KeyVault/packages.config index d10da5b20109..36cd2951c87f 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault/packages.config +++ b/src/ResourceManager/KeyVault/Commands.KeyVault/packages.config @@ -4,4 +4,8 @@ + + + + \ No newline at end of file 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 90efa4cf34f8..810507ff1ec5 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj +++ b/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj @@ -60,10 +60,6 @@ ..\..\..\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.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll @@ -76,18 +72,6 @@ ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.8.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.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 - False ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll @@ -124,18 +108,12 @@ False ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll - - ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll True @@ -146,7 +124,6 @@ - @@ -158,17 +135,6 @@ False ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll - - - - False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - - - - - - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/packages.config b/src/ResourceManager/Profile/Commands.Profile.Test/packages.config index 859c722b2bdb..e0807ba66353 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/packages.config +++ b/src/ResourceManager/Profile/Commands.Profile.Test/packages.config @@ -3,29 +3,22 @@ - - - - - - - diff --git a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj index cec2ab57e4c3..a3636da9343b 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj +++ b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj @@ -47,8 +47,6 @@ false - - ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -57,14 +55,7 @@ ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll True - - - - - - - diff --git a/src/ResourceManager/Resources/AzureRM.Resources.psd1 b/src/ResourceManager/Resources/AzureRM.Resources.psd1 index ab0ba5c200fb..9eca5cb7c9b8 100644 --- a/src/ResourceManager/Resources/AzureRM.Resources.psd1 +++ b/src/ResourceManager/Resources/AzureRM.Resources.psd1 @@ -55,7 +55,6 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.3.0'; } # Assemblies that must be loaded prior to importing this module RequiredAssemblies = '.\Microsoft.Azure.Management.ResourceManager.dll', - '.\Microsoft.Azure.ResourceManager.dll', '.\Microsoft.Azure.Management.Authorization.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj index ef28f2cf90b4..2b8981cdf02a 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj +++ b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj @@ -67,9 +67,6 @@ ..\..\..\packages\Microsoft.Azure.Insights.0.10.0-preview\lib\net45\Microsoft.Azure.Insights.dll - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - False ..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll @@ -85,18 +82,6 @@ ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.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.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -137,9 +122,6 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - - ..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - False ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll @@ -163,17 +145,6 @@ ..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll True - - - - False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - - - - - - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True @@ -245,10 +216,6 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {d3804b64-c0d3-48f8-82ec-1f632f833c9e} - Commands.Common.Authentication - {269acf73-0a34-42dc-ab9c-4b15931a489d} Commands.Common.Graph.RBAC diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config index cb6e0f1bfacb..fcd9adfa84ea 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config +++ b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config @@ -6,7 +6,6 @@ - @@ -15,9 +14,6 @@ - - - @@ -27,8 +23,6 @@ - - diff --git a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj index aa6f3d04e18c..d0cec35d85f1 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj +++ b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj @@ -51,9 +51,6 @@ ..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll - - ..\..\..\packages\Microsoft.Azure.Management.Resources.2.20.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll - ..\..\..\packages\Microsoft.Azure.Management.Authorization.2.6.0-preview\lib\net452\Microsoft.Azure.Management.Authorization.dll diff --git a/src/ResourceManager/Resources/Commands.Resources/packages.config b/src/ResourceManager/Resources/Commands.Resources/packages.config index d8dda45a0511..a61f27624ccc 100644 --- a/src/ResourceManager/Resources/Commands.Resources/packages.config +++ b/src/ResourceManager/Resources/Commands.Resources/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/src/ResourceManager/Resources/Resources.sln b/src/ResourceManager/Resources/Resources.sln index 0e0048bac10d..ae2f6e2879ac 100644 --- a/src/ResourceManager/Resources/Resources.sln +++ b/src/ResourceManager/Resources/Resources.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" EndProject @@ -39,6 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ChangeLog.md = ChangeLog.md EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "..\Insights\Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,6 +107,10 @@ Global {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/ResourceManager/Scheduler/Commands.Scheduler.Test/Commands.Scheduler.Test.csproj b/src/ResourceManager/Scheduler/Commands.Scheduler.Test/Commands.Scheduler.Test.csproj index c02ca3852088..4f57bb8e9dc1 100644 --- a/src/ResourceManager/Scheduler/Commands.Scheduler.Test/Commands.Scheduler.Test.csproj +++ b/src/ResourceManager/Scheduler/Commands.Scheduler.Test/Commands.Scheduler.Test.csproj @@ -129,10 +129,6 @@ ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True - - ..\..\..\packages\WindowsAzure.Storage.7.1.2\lib\net40\Microsoft.WindowsAzure.Storage.dll - True - ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll True @@ -150,17 +146,10 @@ ..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll True - - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll True - - - - - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True @@ -227,10 +216,6 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {d3804b64-c0d3-48f8-82ec-1f632f833c9e} - Commands.Common.Authentication - {3819D8A7-C62C-4C47-8DDD-0332D9CE1252} Commands.ResourceManager.Common @@ -239,10 +224,6 @@ {3436A126-EDC9-4060-8952-9A1BE34CDD95} Commands.ScenarioTests.ResourceManager.Common - - {84fabee4-86cd-43b5-a131-9fdae3a58f0b} - Commands.Scheduler - diff --git a/src/ResourceManager/Sql/AzureRM.Sql.psd1 b/src/ResourceManager/Sql/AzureRM.Sql.psd1 index 93299d989779..e680ee5920d1 100644 --- a/src/ResourceManager/Sql/AzureRM.Sql.psd1 +++ b/src/ResourceManager/Sql/AzureRM.Sql.psd1 @@ -56,10 +56,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.3.0'; } # Assemblies that must be loaded prior to importing this module RequiredAssemblies = '.\Microsoft.Azure.Management.Sql.dll', '.\Microsoft.Azure.Management.Sql.Legacy.dll', - '.\Microsoft.Azure.Management.Storage.dll', - '.\Microsoft.Data.Edm.dll', '.\Microsoft.Data.OData.dll', - '.\Microsoft.Data.Services.Client.dll', - '.\Microsoft.WindowsAzure.Storage.dll', '.\System.Spatial.dll' + '.\Microsoft.Azure.Management.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj index 886f67a79899..2b9cc45510fb 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj +++ b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj @@ -56,10 +56,6 @@ ..\..\..\packages\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll @@ -98,18 +94,6 @@ ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.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 - False ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll @@ -156,13 +140,6 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll - - ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - - - False - ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -182,16 +159,6 @@ False ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll - - - False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - - - - - - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True @@ -344,10 +311,6 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {d3804b64-c0d3-48f8-82ec-1f632f833c9e} - Commands.Common.Authentication - {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common @@ -360,10 +323,6 @@ {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} - Commands.Common.Storage - {69ed499e-6f3c-488f-86b8-b74cfda4d47e} Commands.Sql diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/packages.config b/src/ResourceManager/Sql/Commands.Sql.Test/packages.config index 2666cd2a4075..ab11ac6b6e72 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/packages.config +++ b/src/ResourceManager/Sql/Commands.Sql.Test/packages.config @@ -5,7 +5,6 @@ - @@ -16,9 +15,6 @@ - - - @@ -27,10 +23,7 @@ - - - diff --git a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj index 8c2e899fdac5..7c506e6beb0d 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj +++ b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj @@ -447,10 +447,6 @@ {04B53727-16E6-4EF0-9116-04C7F1C33842} SqlManagement - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - @@ -460,33 +456,12 @@ ..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll - - ..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - True - - - ..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - True - - - ..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - True - ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll - - ..\..\..\packages\WindowsAzure.Storage.8.1.1\lib\net45\Microsoft.WindowsAzure.Storage.dll - True - - False - - ..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - True - diff --git a/src/ResourceManager/Sql/Commands.Sql/packages.config b/src/ResourceManager/Sql/Commands.Sql/packages.config index 548c3cbbb424..63c5d206b8eb 100644 --- a/src/ResourceManager/Sql/Commands.Sql/packages.config +++ b/src/ResourceManager/Sql/Commands.Sql/packages.config @@ -1,7 +1,5 @@  - - \ No newline at end of file diff --git a/src/ResourceManager/Sql/Sql.sln b/src/ResourceManager/Sql/Sql.sln index fb7c36b29ba0..aaa16eacdce2 100644 --- a/src/ResourceManager/Sql/Sql.sln +++ b/src/ResourceManager/Sql/Sql.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" EndProject @@ -132,4 +132,7 @@ Global {56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0F86E3C6-681C-4369-A21D-70F61B6CD6F8} + EndGlobalSection EndGlobal diff --git a/src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj b/src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj index 219957950821..628d155b8cb7 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj +++ b/src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj @@ -65,6 +65,15 @@ ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll True + + ..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll + + + ..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll + + + ..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll @@ -94,6 +103,9 @@ ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + + ..\..\..\packages\WindowsAzure.Storage.8.1.1\lib\net45\Microsoft.WindowsAzure.Storage.dll + False ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -105,6 +117,9 @@ + + ..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll + diff --git a/src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config b/src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config index d85874a939c0..95234474fe51 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config +++ b/src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config @@ -4,7 +4,7 @@ - + @@ -12,6 +12,9 @@ + + + @@ -19,6 +22,8 @@ + + diff --git a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj index 6f24344b7d1e..a61f428522fb 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj +++ b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj @@ -48,24 +48,17 @@ false - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - ..\..\..\packages\Microsoft.Azure.Management.Storage.7.1.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll ..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - True ..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - True ..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - True ..\..\..\packages\WindowsAzure.Storage.8.1.1\lib\net45\Microsoft.WindowsAzure.Storage.dll @@ -74,7 +67,6 @@ ..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - True diff --git a/src/ResourceManager/Storage/Commands.Management.Storage/packages.config b/src/ResourceManager/Storage/Commands.Management.Storage/packages.config index b7ddb336efa9..c21f85a48692 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage/packages.config +++ b/src/ResourceManager/Storage/Commands.Management.Storage/packages.config @@ -1,6 +1,9 @@  - + + + + \ No newline at end of file diff --git a/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 b/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 index 1b47d035bc07..744e8303d41c 100644 --- a/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 +++ b/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 @@ -54,10 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.3.0'; }) # Assemblies that must be loaded prior to importing this module -RequiredAssemblies = '.\Microsoft.Azure.Management.StreamAnalytics.dll', - '.\Microsoft.Data.Edm.dll', '.\Microsoft.Data.OData.dll', - '.\Microsoft.Data.Services.Client.dll', - '.\Microsoft.WindowsAzure.Storage.dll', '.\System.Spatial.dll' +RequiredAssemblies = '.\Microsoft.Azure.Management.StreamAnalytics.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj index f16f949d059f..d6685c857e4f 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj @@ -54,10 +54,6 @@ ..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - False ..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll @@ -77,18 +73,6 @@ False ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.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.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll @@ -127,16 +111,6 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - - ..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - - - False - ..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - - - ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - @@ -148,16 +122,6 @@ ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll - - - False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - - - - - - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True @@ -180,30 +144,14 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {d3804b64-c0d3-48f8-82ec-1f632f833c9e} - Commands.Common.Authentication - - - {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} - Commands.Common.Storage - {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common - - {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} - Commands.ResourceManager.Common - {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {9577252e-0a6b-4d61-86e8-95f7f309a987} - Commands.DataFactories - diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config index b5384ce27756..0cf76b48f4b2 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config @@ -4,7 +4,6 @@ - @@ -13,9 +12,6 @@ - - - @@ -23,10 +19,6 @@ - - - - @@ -34,4 +26,4 @@ - + \ No newline at end of file diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj index e6a025461061..1def79aac9a4 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj @@ -48,35 +48,11 @@ false - - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True - False ..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.2.0.0\lib\net452\Microsoft.Azure.Management.StreamAnalytics.dll - - ..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll - True - - - ..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll - True - - - ..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll - True - - - ..\..\..\packages\WindowsAzure.Storage.8.1.1\lib\net45\Microsoft.WindowsAzure.Storage.dll - True - - - ..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll - True - diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config index a2e2c8141b9c..bf956b862044 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config @@ -1,6 +1,4 @@  - - \ No newline at end of file diff --git a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj index 07fa5bb5a899..8d0fefbe8c2d 100644 --- a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj +++ b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj @@ -104,12 +104,9 @@ - + - + \ No newline at end of file diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Commands.ServiceManagement.Common.csproj b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Commands.ServiceManagement.Common.csproj index 9d90c6954981..553c0830a402 100644 --- a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Commands.ServiceManagement.Common.csproj +++ b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Commands.ServiceManagement.Common.csproj @@ -112,18 +112,10 @@ False ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll - - - - - - - - diff --git a/src/Storage/Commands.Storage/Commands.Storage.csproj b/src/Storage/Commands.Storage/Commands.Storage.csproj index a69be7aa436d..40f621435b22 100644 --- a/src/Storage/Commands.Storage/Commands.Storage.csproj +++ b/src/Storage/Commands.Storage/Commands.Storage.csproj @@ -69,9 +69,6 @@ False - - - ..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll True From d1d9a827c2aa62220ee2040b8ad7c2805e91e052 Mon Sep 17 00:00:00 2001 From: MiYanni Date: Mon, 26 Feb 2018 10:06:06 -0800 Subject: [PATCH 2/5] Fixed wxi after splitting out the RedisCache changes. --- setup/azurecmdfiles.wxi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index e10022d19e4d..6bb2a778e6c3 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -1182,6 +1182,21 @@ + + + + + + + + + + + + + + + @@ -3491,6 +3506,11 @@ + + + + + From 9aa3a606b1808236047f23ce29fbac2e1ce0158f Mon Sep 17 00:00:00 2001 From: MiYanni Date: Thu, 1 Mar 2018 15:54:13 -0800 Subject: [PATCH 3/5] Fix merge issue. --- src/ResourceManager/Resources/Commands.Resources/packages.config | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ResourceManager/Resources/Commands.Resources/packages.config b/src/ResourceManager/Resources/Commands.Resources/packages.config index f3827872ea4f..b0c8264bcfea 100644 --- a/src/ResourceManager/Resources/Commands.Resources/packages.config +++ b/src/ResourceManager/Resources/Commands.Resources/packages.config @@ -2,5 +2,4 @@ - \ No newline at end of file From 304a18132b694942a880bae884937b65a4a57632 Mon Sep 17 00:00:00 2001 From: MiYanni Date: Thu, 1 Mar 2018 16:28:01 -0800 Subject: [PATCH 4/5] Fix merge issue. --- .../Resources/Commands.Resources.Test/packages.config | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config index fc64b14792f6..8e04ce892a94 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config +++ b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config @@ -6,7 +6,6 @@ - From eb7376b814aa65bbaedc26ee335c0fb742637ef2 Mon Sep 17 00:00:00 2001 From: MiYanni Date: Thu, 1 Mar 2018 17:27:23 -0800 Subject: [PATCH 5/5] Fix merge issue. --- setup/azurecmdfiles.wxi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 2c0d544e2707..e860b1914cd9 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -1279,11 +1279,6 @@ - - - - -