diff --git a/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTests.cs b/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTests.cs index 534cece2c658..10543f8df6e0 100644 --- a/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTests.cs +++ b/src/ApiManagement/ApiManagement.Test/ScenarioTests/ApiManagementTests.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using Microsoft.Azure.Management.Storage; +using Microsoft.Azure.Management.Storage.Version2017_10_01; using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Microsoft.Azure.Test.HttpRecorder; @@ -136,9 +136,6 @@ private void RunPowerShellTest(params string[] scripts) "ScenarioTests\\Common.ps1", "ScenarioTests\\" + GetType().Name + ".ps1", _helper.RMProfileModule, -#if !NETSTANDARD - _helper.RMStorageDataPlaneModule, -#endif _helper.GetRMModulePath("AzureRM.ApiManagement.psd1"), "AzureRM.Storage.ps1", "AzureRM.Resources.ps1"); diff --git a/src/ApiManagement/ApiManagement.sln b/src/ApiManagement/ApiManagement.sln index 9a8f90180532..476add0dc6f1 100644 --- a/src/ApiManagement/ApiManagement.sln +++ b/src/ApiManagement/ApiManagement.sln @@ -2,15 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27703.2042 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiManagement", "ApiManagement\Apicsproj", "{DC0A9742-DF36-48C9-BD2F-68D01AED6257}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiManagement", "ApiManagement\ApiManagement.csproj", "{DC0A9742-DF36-48C9-BD2F-68D01AED6257}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiTest", "ApiTest\ApiTest.csproj", "{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiManagement.Test", "ApiManagement.Test\ApiManagement.Test.csproj", "{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiServiceManagement", "ApiServiceManagement\ApiServicecsproj", "{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiManagement.ServiceManagement", "ApiManagement.ServiceManagement\ApiManagement.ServiceManagement.csproj", "{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiServiceTest", "ApiServiceTest\ApiServiceTest.csproj", "{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiManagement.ServiceManagement.Test", "ApiManagement.ServiceManagement.Test\ApiManagement.ServiceManagement.Test.csproj", "{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" EndProject diff --git a/src/Compute/Compute.Test/Common/ComputeTestController.cs b/src/Compute/Compute.Test/Common/ComputeTestController.cs index d50b08e01012..256eb3a5054d 100644 --- a/src/Compute/Compute.Test/Common/ComputeTestController.cs +++ b/src/Compute/Compute.Test/Common/ComputeTestController.cs @@ -24,10 +24,6 @@ using System.Linq; using Microsoft.Azure.Management.Network; using Microsoft.Azure.Management.KeyVault; -#if !NETSTANDARD -using Microsoft.Azure.Test; -using TestBase = Microsoft.Azure.Test.TestBase; -#endif using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Rest.ClientRuntime.Azure.TestFramework; using NetworkManagementClientInternal = Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient; @@ -36,7 +32,6 @@ using System.Runtime.Versioning; using Microsoft.Azure.Management.Internal.Resources; using CommonStorage = Microsoft.Azure.Management.Storage.Version2017_10_01; -using PublicStorage = Microsoft.Azure.Management.Storage; namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests { @@ -46,8 +41,6 @@ public sealed class ComputeTestController : RMTestBase public CommonStorage.StorageManagementClient StorageClient { get; private set; } - public PublicStorage.StorageManagementClient PublicStorageClient { get; private set; } - public ComputeManagementClient ComputeManagementClient { get; private set; } public KeyVaultManagementClient KeyVaultManagementClient { get; private set; } @@ -129,9 +122,6 @@ public void RunPsTestWorkflow( "ScenarioTests\\ComputeTestCommon.ps1", "ScenarioTests\\" + callingClassName + ".ps1", _helper.RMProfileModule, -#if !NETSTANDARD - _helper.RMStorageDataPlaneModule, -#endif _helper.GetRMModulePath("AzureRM.Compute.psd1"), _helper.GetRMModulePath("AzureRM.Network.psd1"), _helper.GetRMModulePath("AzureRM.KeyVault.psd1"), @@ -161,7 +151,6 @@ private void SetupManagementClients(MockContext context) NetworkManagementClientInternal = GetNetworkManagementClientInternal(context); KeyVaultManagementClient = GetKeyVaultManagementClient(context); ResourceManagementClient = GetResourceManagementClient(context); - PublicStorageClient = GetPublicStorageManagementClient(context); _helper.SetupSomeOfManagementClients( StorageClient, @@ -169,8 +158,7 @@ private void SetupManagementClients(MockContext context) NetworkManagementClient, NetworkManagementClientInternal, KeyVaultManagementClient, - ResourceManagementClient, - PublicStorageClient); + ResourceManagementClient); } private static ResourceManagementClient GetResourceManagementClient(MockContext context) @@ -183,11 +171,6 @@ private static CommonStorage.StorageManagementClient GetStorageManagementClient( return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); } - private static PublicStorage.StorageManagementClient GetPublicStorageManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - private static KeyVaultManagementClient GetKeyVaultManagementClient(MockContext context) { return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); diff --git a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowController.cs b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowController.cs index 89936b067a9f..dd5979e7dc2c 100644 --- a/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowController.cs +++ b/src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowController.cs @@ -91,7 +91,6 @@ public void RunPsTestWorkflow( "ScenarioTests\\" + callingClassName + ".ps1", _helper.RMProfileModule, _helper.GetRMModulePath(@"AzureRM.LogicApp.psd1"), - _helper.GetRMModulePath(@"AzureRM.Resources.psd1"), "AzureRM.Resources.ps1"); try diff --git a/src/MachineLearning/MachineLearning.Test/ScenarioTests/BaseTestController.cs b/src/MachineLearning/MachineLearning.Test/ScenarioTests/BaseTestController.cs index bc6f31d94715..98c911903e0c 100644 --- a/src/MachineLearning/MachineLearning.Test/ScenarioTests/BaseTestController.cs +++ b/src/MachineLearning/MachineLearning.Test/ScenarioTests/BaseTestController.cs @@ -18,7 +18,7 @@ using System.Diagnostics; using System.Linq; using Microsoft.Azure.Commands.Common.Authentication; -using Microsoft.Azure.Management.Storage; +using Microsoft.Azure.Management.Storage.Version2017_10_01; using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.Rest; diff --git a/src/Media/Media.Test/ScenarioTests/TestController.cs b/src/Media/Media.Test/ScenarioTests/TestController.cs index 171d150c4b79..fb6fe0948e83 100644 --- a/src/Media/Media.Test/ScenarioTests/TestController.cs +++ b/src/Media/Media.Test/ScenarioTests/TestController.cs @@ -19,7 +19,7 @@ using System.Linq; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Management.Media; -using Microsoft.Azure.Management.Storage; +using Microsoft.Azure.Management.Storage.Version2017_10_01; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Microsoft.WindowsAzure.Commands.ScenarioTest; diff --git a/src/Network/Network.Test/NetworkResourcesController.cs b/src/Network/Network.Test/NetworkResourcesController.cs index 26413866336e..588738688d55 100644 --- a/src/Network/Network.Test/NetworkResourcesController.cs +++ b/src/Network/Network.Test/NetworkResourcesController.cs @@ -17,7 +17,6 @@ using Microsoft.Azure.Management.ContainerInstance; using Microsoft.Azure.Management.Network; using Microsoft.Azure.Management.Redis; -using Microsoft.Azure.Management.Storage; using Microsoft.Azure.Management.OperationalInsights; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.ScenarioTest; @@ -29,6 +28,7 @@ using Microsoft.Azure.Management.Internal.Resources; using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Rest.ClientRuntime.Azure.TestFramework; +using Microsoft.Azure.Management.Storage.Version2017_10_01; namespace Commands.Network.Test { diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/TestsBase.cs b/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/TestsBase.cs index 8cd5915e2663..c72687e9cdc7 100644 --- a/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/TestsBase.cs +++ b/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/TestsBase.cs @@ -29,7 +29,7 @@ using Microsoft.Azure.Management.Internal.Resources; using Microsoft.Azure.Management.Network; using Microsoft.Azure.Management.RecoveryServices; -using Microsoft.Azure.Management.Storage; +using Microsoft.Azure.Management.Storage.Version2017_10_01; using Microsoft.Azure.ServiceManagement.Common.Models; namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests @@ -140,10 +140,6 @@ public Collection RunPsTestWorkflow( "ScenarioTests\\" + testFolderName + "\\" + callingClassName + ".ps1", _helper.RMProfileModule, _helper.GetRMModulePath("AzureRM.RecoveryServices.psd1"), -#if !NETSTANDARD - _helper.GetRMModulePath("AzureRM.RecoveryServices.Backup.psd1"), - _helper.RMStorageDataPlaneModule, -#endif _helper.GetRMModulePath("AzureRM.Compute.psd1"), _helper.GetRMModulePath("AzureRM.Network.psd1"), "AzureRM.Storage.ps1", diff --git a/src/RedisCache/RedisCache.Test/ScenarioTests/RedisCacheController.cs b/src/RedisCache/RedisCache.Test/ScenarioTests/RedisCacheController.cs index 7b27ddef2b72..109b6b9b1df3 100644 --- a/src/RedisCache/RedisCache.Test/ScenarioTests/RedisCacheController.cs +++ b/src/RedisCache/RedisCache.Test/ScenarioTests/RedisCacheController.cs @@ -22,7 +22,7 @@ using System.IO; using System.Linq; using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory; -using Microsoft.Azure.Management.Storage; +using Microsoft.Azure.Management.Storage.Version2017_10_01; using System.Collections.Generic; using System.Diagnostics; using Microsoft.Azure.ServiceManagement.Common.Models; diff --git a/src/Sql/Sql.Test/ScenarioTests/AdvancedThreatProtectionTests.cs b/src/Sql/Sql.Test/ScenarioTests/AdvancedThreatProtectionTests.cs index 24a6b32b7ffd..b97092ef22d3 100644 --- a/src/Sql/Sql.Test/ScenarioTests/AdvancedThreatProtectionTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/AdvancedThreatProtectionTests.cs @@ -25,10 +25,9 @@ public class AdvancedThreatProtectionTests : SqlTestsBase protected override void SetupManagementClients(RestTestFramework.MockContext context) { var sqlClient = GetSqlClient(context); - var publicstorageV2Client = GetPublicStorageManagementClient(context); var storageV2Client = GetStorageManagementClient(context); var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, publicstorageV2Client, storageV2Client, newResourcesClient); + Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient); } public AdvancedThreatProtectionTests(ITestOutputHelper output) : base(output) diff --git a/src/Sql/Sql.Test/ScenarioTests/AuditingClassicStorageTests.cs b/src/Sql/Sql.Test/ScenarioTests/AuditingClassicStorageTests.cs index 98bebd384890..f05d16e3a15d 100644 --- a/src/Sql/Sql.Test/ScenarioTests/AuditingClassicStorageTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/AuditingClassicStorageTests.cs @@ -25,10 +25,9 @@ public class AuditingClassicStorageTests : SqlTestsBase protected override void SetupManagementClients(RestTestFramework.MockContext context) { var sqlClient = GetSqlClient(context); - var publicstorageV2Client = GetPublicStorageManagementClient(context); var storageV2Client = GetStorageManagementClient(context); var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, publicstorageV2Client, storageV2Client, newResourcesClient); + Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient); } public AuditingClassicStorageTests(ITestOutputHelper output) : base(output) diff --git a/src/Sql/Sql.Test/ScenarioTests/BlobAuditingClassicStorageTests.cs b/src/Sql/Sql.Test/ScenarioTests/BlobAuditingClassicStorageTests.cs index 7af6e6f7e2fe..754a3562ac58 100644 --- a/src/Sql/Sql.Test/ScenarioTests/BlobAuditingClassicStorageTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/BlobAuditingClassicStorageTests.cs @@ -25,10 +25,9 @@ public class BlobAuditingClassicStorageTests : SqlTestsBase protected override void SetupManagementClients(RestTestFramework.MockContext context) { var sqlClient = GetSqlClient(context); - var publicstorageV2Client = GetPublicStorageManagementClient(context); var storageV2Client = GetStorageManagementClient(context); var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, publicstorageV2Client, storageV2Client, newResourcesClient); + Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient); } public BlobAuditingClassicStorageTests(ITestOutputHelper output) : base(output) diff --git a/src/Sql/Sql.Test/ScenarioTests/BlobAuditingTests.cs b/src/Sql/Sql.Test/ScenarioTests/BlobAuditingTests.cs index b65e58b588bd..7c00a7cc437a 100644 --- a/src/Sql/Sql.Test/ScenarioTests/BlobAuditingTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/BlobAuditingTests.cs @@ -25,10 +25,9 @@ public class BlobAuditingTests : SqlTestsBase protected override void SetupManagementClients(RestTestFramework.MockContext context) { var sqlClient = GetSqlClient(context); - var publicstorageV2Client = GetPublicStorageManagementClient(context); var storageV2Client = GetStorageManagementClient(context); var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, publicstorageV2Client, storageV2Client, newResourcesClient); + Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient); } public BlobAuditingTests(ITestOutputHelper output) : base(output) diff --git a/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs index 4d4c6d62777f..ca21b20061c1 100644 --- a/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs +++ b/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs @@ -24,7 +24,6 @@ using Microsoft.Azure.Management.Internal.Resources; using Microsoft.Azure.Management.Sql; using CommonStorage = Microsoft.Azure.Management.Storage.Version2017_10_01; -using PublicStorage = Microsoft.Azure.Management.Storage; using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Xunit.Abstractions; @@ -110,10 +109,5 @@ protected static CommonStorage.StorageManagementClient GetStorageManagementClien return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); } - protected static PublicStorage.StorageManagementClient GetPublicStorageManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs index 4963cb2b285f..5caecb728c19 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs @@ -25,10 +25,9 @@ public class ThreatDetectionClassicStorageTests : SqlTestsBase protected override void SetupManagementClients(RestTestFramework.MockContext context) { var sqlClient = GetSqlClient(context); - var publicstorageV2Client = GetPublicStorageManagementClient(context); var storageV2Client = GetStorageManagementClient(context); var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, publicstorageV2Client, storageV2Client, newResourcesClient); + Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient); } public ThreatDetectionClassicStorageTests(ITestOutputHelper output) : base(output) diff --git a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs index 5cc09af0ca04..71a1455e2805 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs @@ -25,10 +25,9 @@ public class ThreatDetectionTests : SqlTestsBase protected override void SetupManagementClients(RestTestFramework.MockContext context) { var sqlClient = GetSqlClient(context); - var publicstorageV2Client = GetPublicStorageManagementClient(context); var storageV2Client = GetStorageManagementClient(context); var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, publicstorageV2Client, storageV2Client, newResourcesClient); + Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient); } public ThreatDetectionTests(ITestOutputHelper output) : base(output) diff --git a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs index e04158f4e42d..1371cf4bdb30 100644 --- a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs @@ -25,10 +25,9 @@ public class VulnerabilityAssessmentTests : SqlTestsBase protected override void SetupManagementClients(RestTestFramework.MockContext context) { var sqlClient = GetSqlClient(context); - var publicstorageV2Client = GetPublicStorageManagementClient(context); var storageV2Client = GetStorageManagementClient(context); var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, publicstorageV2Client, storageV2Client, newResourcesClient); + Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient); } public VulnerabilityAssessmentTests(ITestOutputHelper output) : base(output) diff --git a/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj b/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj index 735a9af3ce51..19e5519f24e5 100644 --- a/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj +++ b/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj @@ -2,7 +2,6 @@ Management.Storage - false diff --git a/src/Storage/Storage.Management.Test/TestController.cs b/src/Storage/Storage.Management.Test/TestController.cs index 5bcfe970e096..65a20ae1bae2 100644 --- a/src/Storage/Storage.Management.Test/TestController.cs +++ b/src/Storage/Storage.Management.Test/TestController.cs @@ -87,9 +87,6 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries).Last(); _helper.SetupModules(AzureModule.AzureResourceManager, _helper.RMProfileModule, -#if !NETSTANDARD - _helper.RMStorageDataPlaneModule, -#endif _helper.RMStorageModule, "ScenarioTests\\Common.ps1", "ScenarioTests\\" + callingClassName + ".ps1", diff --git a/src/Websites/Websites.Test/ScenarioTests/WebsitesController.cs b/src/Websites/Websites.Test/ScenarioTests/WebsitesController.cs index dfd5c931eaef..5e65d094ad3b 100644 --- a/src/Websites/Websites.Test/ScenarioTests/WebsitesController.cs +++ b/src/Websites/Websites.Test/ScenarioTests/WebsitesController.cs @@ -15,7 +15,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Commands.ScenarioTest; using Microsoft.Azure.Management.Authorization.Version2015_07_01; -using Microsoft.Azure.Management.Storage; +using Microsoft.Azure.Management.Storage.Version2017_10_01; using Microsoft.Azure.Management.WebSites; using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Azure.Test.HttpRecorder; diff --git a/tools/Common.Netcore.Dependencies.Test.targets b/tools/Common.Netcore.Dependencies.Test.targets index 61a03ebc5d49..163a56696dc5 100644 --- a/tools/Common.Netcore.Dependencies.Test.targets +++ b/tools/Common.Netcore.Dependencies.Test.targets @@ -19,10 +19,10 @@ All - + All - + All @@ -52,13 +52,12 @@ - - $(NugetPackageRoot)microsoft.azure.powershell.scenariotest.resourcemanager\1.1.12-preview\tools\ + $(NugetPackageRoot)microsoft.azure.powershell.scenariotest.resourcemanager\1.1.13-preview\tools\ diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets index 39ce45808833..13d893dae1da 100644 --- a/tools/Common.Netcore.Dependencies.targets +++ b/tools/Common.Netcore.Dependencies.targets @@ -7,49 +7,49 @@ All - + All - + All - + All - + All - + All - + All - + All - + All - + All - + All - + All - + All - + All - + All - + All @@ -66,7 +66,7 @@ - $(NugetPackageRoot)microsoft.azure.powershell.storage\1.1.12-preview\tools\ + $(NugetPackageRoot)microsoft.azure.powershell.storage\1.1.13-preview\tools\ diff --git a/tools/RepoTasks/RepoTasks.CmdletsForTest/RepoTasks.CmdletsForTest.csproj b/tools/RepoTasks/RepoTasks.CmdletsForTest/RepoTasks.CmdletsForTest.csproj index b4d83d614cfe..d2179ea4e492 100644 --- a/tools/RepoTasks/RepoTasks.CmdletsForTest/RepoTasks.CmdletsForTest.csproj +++ b/tools/RepoTasks/RepoTasks.CmdletsForTest/RepoTasks.CmdletsForTest.csproj @@ -37,7 +37,7 @@ ..\..\..\src\packages\Microsoft.ApplicationInsights.1.2.0\lib\net45\Microsoft.ApplicationInsights.dll - ..\..\..\src\packages\Microsoft.Azure.PowerShell.Authentication.Abstractions.1.1.12-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll + ..\..\..\src\packages\Microsoft.Azure.PowerShell.Authentication.Abstractions.1.1.13-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll ..\..\..\src\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll @@ -58,7 +58,7 @@ ..\..\..\src\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - ..\..\..\src\packages\Microsoft.Azure.PowerShell.Common.1.1.12-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll + ..\..\..\src\packages\Microsoft.Azure.PowerShell.Common.1.1.13-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll ..\..\..\src\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll diff --git a/tools/RepoTasks/RepoTasks.CmdletsForTest/packages.config b/tools/RepoTasks/RepoTasks.CmdletsForTest/packages.config index 8f484cc9a63f..5650fc7ea7e3 100644 --- a/tools/RepoTasks/RepoTasks.CmdletsForTest/packages.config +++ b/tools/RepoTasks/RepoTasks.CmdletsForTest/packages.config @@ -5,8 +5,8 @@ - - + + diff --git a/tools/RepoTasks/RepoTasks.RemoteWorker/RepoTasks.RemoteWorker.csproj b/tools/RepoTasks/RepoTasks.RemoteWorker/RepoTasks.RemoteWorker.csproj index 72ce6d29b15f..a70619760941 100644 --- a/tools/RepoTasks/RepoTasks.RemoteWorker/RepoTasks.RemoteWorker.csproj +++ b/tools/RepoTasks/RepoTasks.RemoteWorker/RepoTasks.RemoteWorker.csproj @@ -37,7 +37,7 @@ ..\..\..\src\packages\Microsoft.ApplicationInsights.1.2.0\lib\net45\Microsoft.ApplicationInsights.dll - ..\..\..\src\packages\Microsoft.Azure.PowerShell.Authentication.Abstractions.1.1.12-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll + ..\..\..\src\packages\Microsoft.Azure.PowerShell.Authentication.Abstractions.1.1.13-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll ..\..\..\src\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll @@ -58,7 +58,7 @@ ..\..\..\src\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - ..\..\..\src\packages\Microsoft.Azure.PowerShell.Common.1.1.12-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll + ..\..\..\src\packages\Microsoft.Azure.PowerShell.Common.1.1.13-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll ..\..\..\src\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll diff --git a/tools/RepoTasks/RepoTasks.RemoteWorker/packages.config b/tools/RepoTasks/RepoTasks.RemoteWorker/packages.config index a14f685f244b..645584b451d0 100644 --- a/tools/RepoTasks/RepoTasks.RemoteWorker/packages.config +++ b/tools/RepoTasks/RepoTasks.RemoteWorker/packages.config @@ -5,8 +5,8 @@ - - + + diff --git a/tools/StaticAnalysis/StaticAnalysis.csproj b/tools/StaticAnalysis/StaticAnalysis.csproj index 158a4d2b5e98..5fbadf36fc96 100644 --- a/tools/StaticAnalysis/StaticAnalysis.csproj +++ b/tools/StaticAnalysis/StaticAnalysis.csproj @@ -54,10 +54,10 @@ ..\..\src\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll - ..\..\src\packages\Microsoft.Azure.PowerShell.Authentication.Abstractions.1.1.12-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll + ..\..\src\packages\Microsoft.Azure.PowerShell.Authentication.Abstractions.1.1.13-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll - ..\..\src\packages\Microsoft.Azure.PowerShell.Common.1.1.12-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll + ..\..\src\packages\Microsoft.Azure.PowerShell.Common.1.1.13-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll ..\..\src\packages\Microsoft.Rest.ClientRuntime.2.3.18\lib\net452\Microsoft.Rest.ClientRuntime.dll diff --git a/tools/StaticAnalysis/packages.config b/tools/StaticAnalysis/packages.config index 745f8e5b902c..d3393c4383a6 100644 --- a/tools/StaticAnalysis/packages.config +++ b/tools/StaticAnalysis/packages.config @@ -7,8 +7,8 @@ - - + +