Skip to content

Commit

Permalink
Merge pull request #1258 from yugangw-msft/build
Browse files Browse the repository at this point in the history 
Get resource, compute, storage and network package build
  • Loading branch information
@amarzavery
amarzavery committed Jul 17, 2015
2 parents a0c9e3c + 07c6343 commit dd9eebf
Show file tree
Hide file tree
Showing 63 changed files with 436 additions and 247 deletions.
12 changes: 8 additions & 4 deletions src/ResourceManagement/Compute/Compute.Tests/Compute.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,22 @@
<ProjectReference Include="..\..\Resource\ResourceManagement\ResourceManagement.csproj">
<Project>{165ef660-235b-45af-83cb-0d32bef4c1a2}</Project>
<Name>ResourceManagement</Name>
<Properties>SkipValidatePackageReferences=true</Properties>
</ProjectReference>
<ProjectReference Include="..\..\Storage\StorageManagement\StorageManagement.csproj">
<Project>{a7f47b7f-319b-411f-bf33-f57899a430cb}</Project>
<Name>StorageManagement</Name>
<Properties>SkipValidatePackageReferences=true</Properties>
</ProjectReference>
<ProjectReference Include="..\ComputeManagement\ComputeManagement.csproj">
<Project>{4f41c7a2-7df6-4cc1-9f2d-66e8f05c2331}</Project>
<Name>ComputeManagement</Name>
<Properties>SkipValidatePackageReferences=true</Properties>
</ProjectReference>
<ProjectReference Include="..\..\Network\NetworkManagement\NetworkManagement.csproj">
<Project>{4500a2d3-c087-4fbc-bebd-e630cd728788}</Project>
<Name>NetworkManagement</Name>
<Properties>SkipValidatePackageReferences=true</Properties>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand All @@ -150,12 +154,12 @@
<HintPath>..\..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.1.0.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Reference Include="Microsoft.Rest.ClientRuntime">
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.1.0.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.1.0.11\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure">
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/AvailabilitySetTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class AvailabilitySetTests
const int UDTooLow = 0;
const int UDTooHi = 21;

[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestOperations()
{
using (var context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/ExtImgTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public void TestExtImgListVersionsNoFilter()
}
}

[Fact]
[Fact(Skip="TODO: AutoRest")]
public void TestExtImgListVersionsFilters()
{
using (var context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/ExtensionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ VirtualMachineExtension GetTestVMExtension()
return vmExtension;
}

[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestVMExtensionOperations()
{
using (var context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/ListVMTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Compute.Tests
{
public class ListVMTests: VMTestBase
{
[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestListVMInSubscription()
{
using (var context = UndoContext.Current)
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/OSProfileTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private void ValidateWinRMCustomDataAndUnattendContent(string winRMCertificateUr

// See recording instructions in HyakSpec\ReadMe.txt. The key vault URLs produced by the script are plugged
// into SecretVaultHelper, below.
[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestVMWithWindowsOSProfile()
{
using (var context = UndoContext.Current)
Expand Down Expand Up @@ -215,7 +215,7 @@ public void TestVMWithWindowsOSProfile()
}
}

[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestVMWithLinuxOSProfile()
{
using (var context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/UsageTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace Compute.Tests
/// </summary>
public class UsageTests : VMTestBase
{
[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestListUsages()
{
using (UndoContext context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/VMDataDiskTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace Compute.Tests
{
public class VMDataDiskTests : VMTestBase
{
[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestVMDataDiskScenario()
{
using (var context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/VMImageTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void TestVMImageListNoFilter()
}
}

[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestVMImageListFilters()
{
using (var context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/VMMarketplaceTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public VirtualMachineImage GetMarketplaceImage()
return m_CrpClient.VirtualMachineImages.Get(m_location, vmmPublisherName, vmmOfferName, vmmSku, imageRef.Version);
}

[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestVMMarketplace()
{
using (var context = UndoContext.Current)
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/VMNetworkInterfaceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace Compute.Tests
{
public class VMNetworkInterfaceTests : VMTestBase
{
[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestNicVirtualMachineReference()
{
using (var context = UndoContext.Current)
Expand Down Expand Up @@ -90,7 +90,7 @@ public void TestNicVirtualMachineReference()
}
}

[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestMultiNicVirtualMachineReference()
{
using (var context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/VMOperationalTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class VMOperationalTests : VMTestBase
/// Capture VM
/// Delete RG
/// </summary>
[Fact]
[Fact(Skip = "TODO: AutoRest")]
public void TestVMOperations()
{
using (var context = UndoContext.Current)
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManagement/Compute/Compute.Tests/ScenarioTests/VMScenarioTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class VMScenarioTests : VMTestBase
/// Delete VM
/// Delete RG
/// </summary>
[Fact]
[Fact(Skip = "TODO: AutoRest")]
[Trait("Name", "TestVMScenarioOperations")]
public void TestVMScenarioOperations()
{
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManagement/Compute/Compute.Tests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<package id="Microsoft.Azure.Test.Framework" version="2.0.5658.29898-prerelease" targetFramework="net45" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="2.0.5658.29898-prerelease" targetFramework="net45" />
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="1.0.11" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime" version="1.0.3" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="1.0.12" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
<package id="xunit" version="1.9.2" targetFramework="net451" />
<package id="xunit.runner.visualstudio" version="0.99.9-build1021" targetFramework="net451" />
Expand Down
14 changes: 0 additions & 14 deletions src/ResourceManagement/Compute/Compute.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net40-Debug|Any CPU.Build.0 = Net40-Debug|Any CPU
{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net40-Release|Any CPU.Build.0 = Net40-Release|Any CPU
{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
Expand All @@ -44,41 +42,29 @@ Global
{3C768CCE-36A0-433E-8280-31979756CC07}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
{3C768CCE-36A0-433E-8280-31979756CC07}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net40-Debug|Any CPU.Build.0 = Net40-Debug|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net40-Release|Any CPU.Build.0 = Net40-Release|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net40-Debug|Any CPU.Build.0 = Net40-Debug|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net40-Release|Any CPU.Build.0 = Net40-Release|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
{A7F47B7F-319B-411F-BF33-F57899A430CB}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Debug|Any CPU.Build.0 = Net40-Debug|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Release|Any CPU.Build.0 = Net40-Release|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
25 changes: 16 additions & 9 deletions src/ResourceManagement/Compute/ComputeManagement/ComputeManagement.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,27 @@
</ItemGroup>
<ItemGroup>
<None Include="Microsoft.Azure.Management.Compute.nuget.proj" />
<None Include="Microsoft.Azure.Management.Compute.nuspec" />
<None Include="Microsoft.Azure.Management.Compute.nuspec">
<SubType>Designer</SubType>
</None>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.1.0.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
<ItemGroup Condition=" '$(LibraryFxTarget)' == 'net45' ">
<Reference Include="Microsoft.Rest.ClientRuntime">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.1.0.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(LibraryFxTarget)' == 'portable' ">
<Reference Include="Microsoft.Rest.ClientRuntime">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.1.0.3\lib\portable-net403+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.1.0.11\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\portable-net403+win+wpa81\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" Condition=" '$(LibraryFxTarget)' == 'portable' " />
Expand Down
18 changes: 9 additions & 9 deletions src/ResourceManagement/Compute/ComputeManagement/Microsoft.Azure.Management.Compute.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@ Note: This client library is for Virtual Machines under Azure Resource Manager.<
<copyright>Copyright © Microsoft Corporation</copyright>
<tags>Microsoft Azure resource management virtual machine compute REST HTTP client core common azureofficial windowsazureofficial</tags>
<references>
<group targetFramework="portable-net45+sl50+wp80+win">
<group targetFramework="portable-net403+win8+wpa81">
<reference file="Microsoft.Azure.Management.Compute.dll" />
</group>
<group targetFramework="net40">
<group targetFramework="net45">
<reference file="Microsoft.Azure.Management.Compute.dll" />
</group>
</references>
<dependencies>
<dependency id="Microsoft.Azure.Common" version="[2.1.0,3.0)" />
<dependency id="Microsoft.Rest.ClientRuntime.Azure" version="[1.0.12,2.0)" />
</dependencies>
</metadata>
<files>
<file src="ResourceManagement\Compute\ComputeManagement\**\*.cs" target="src" />
<file src="..\binaries\portable\Microsoft.Azure.Management.Compute.dll" target="lib\portable-net45+sl50+wp80+win" />
<file src="..\binaries\portable\Microsoft.Azure.Management.Compute.pdb" target="lib\portable-net45+sl50+wp80+win" />
<file src="..\binaries\portable\Microsoft.Azure.Management.Compute.xml" target="lib\portable-net45+sl50+wp80+win" />
<file src="..\binaries\net40\Microsoft.Azure.Management.Compute.dll" target="lib\net40" />
<file src="..\binaries\net40\Microsoft.Azure.Management.Compute.pdb" target="lib\net40" />
<file src="..\binaries\net40\Microsoft.Azure.Management.Compute.xml" target="lib\net40" />
<file src="..\binaries\portable\Microsoft.Azure.Management.Compute.dll" target="lib\portable-net403+win8+wpa81" />
<file src="..\binaries\portable\Microsoft.Azure.Management.Compute.pdb" target="lib\portable-net403+win8+wpa81" />
<file src="..\binaries\portable\Microsoft.Azure.Management.Compute.xml" target="lib\portable-net403+win8+wpa81" />
<file src="..\binaries\net45\Microsoft.Azure.Management.Compute.dll" target="lib\net45" />
<file src="..\binaries\net45\Microsoft.Azure.Management.Compute.pdb" target="lib\net45" />
<file src="..\binaries\net45\Microsoft.Azure.Management.Compute.xml" target="lib\net45" />
</files>
</package>
8 changes: 6 additions & 2 deletions src/ResourceManagement/Compute/ComputeManagement/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Rest.ClientRuntime" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="1.0.11" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime" version="1.0.3" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="1.0.12" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
</packages>
4 changes: 3 additions & 1 deletion src/ResourceManagement/Network/Network.Tests/Helpers/NetworkManagementTestUtilities.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ public static class NetworkManagementTestUtilities
public static NetworkResourceProviderClient GetNetworkResourceProviderClient(RecordedDelegatingHandler handler)
{
handler.IsPassThrough = true;
var client = TestBase.GetServiceClient<NetworkResourceProviderClient>(new CSMTestEnvironmentFactory(), handler);
var env = new CSMTestEnvironmentFactory();
var client = TestBase.GetServiceClient<NetworkResourceProviderClient>(env, handler);
client.SubscriptionId = env.GetTestEnvironment().SubscriptionId;
if (Environment.GetEnvironmentVariable("AZURE_TEST_MODE") == null ||
Environment.GetEnvironmentVariable("AZURE_TEST_MODE") == "Playback")
{
Expand Down
4 changes: 3 additions & 1 deletion src/ResourceManagement/Network/Network.Tests/Helpers/ResourcesManagementTestUtilities.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ public static class ResourcesManagementTestUtilities
public static ResourceManagementClient GetResourceManagementClientWithHandler(RecordedDelegatingHandler handler)
{
handler.IsPassThrough = true;
var client = TestBase.GetServiceClient<ResourceManagementClient>(new CSMTestEnvironmentFactory(), handler);
var env = new CSMTestEnvironmentFactory();
var client = TestBase.GetServiceClient<ResourceManagementClient>(env, handler);
client.SubscriptionId = env.GetTestEnvironment().SubscriptionId;
if (Environment.GetEnvironmentVariable("AZURE_TEST_MODE") == null ||
Environment.GetEnvironmentVariable("AZURE_TEST_MODE") == "Playback")
{
Expand Down
Loading

0 comments on commit dd9eebf

Please sign in to comment.