Skip to content

Commit 5b8fecb

Browse files
huangpfhuangpf
committed
Merge pull request #71 from Azure/dev
.
2 parents b035794 + 29f9629 commit 5b8fecb

File tree

82 files changed

+130
-43713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+130
-43713
lines changed

‎setup/azurecmdfiles.wxi‎

Lines changed: 4 additions & 276 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,4 @@
187187
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
188188
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
189189
</Target>
190-
</Project>
190+
</Project>

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136
<Reference Include="System" />
137137
<Reference Include="System.Core" />
138138
<Reference Include="System.Data.Services.Client" />
139-
<Reference Include="System.IO.Compression.FileSystem" />
140139
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
141140
<Reference Include="System.Net" />
142141
<Reference Include="System.Net.Http" />
@@ -175,8 +174,6 @@
175174
<Compile Include="Common\GeneralTests.cs" />
176175
<Compile Include="Common\IdnUtilitiesTests.cs" />
177176
<Compile Include="Common\JsonUtilitiesTests.cs" />
178-
<Compile Include="Extensions\DSC\DscExtensionConfigurationParsingHelperTests.cs" />
179-
<Compile Include="Extensions\DSC\DscExtensionSettingsSerializerTests.cs" />
180177
<Compile Include="Mocks\ClientMocks.cs" />
181178
<Compile Include="Common\PSObjectExtensions.cs" />
182179
<Compile Include="Common\RemoveAzurePublishSettings.cs" />
@@ -314,4 +311,4 @@
314311
</PropertyGroup>
315312
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
316313
</Target>
317-
</Project>
314+
</Project>

‎src/Common/Commands.Common/Commands.Common.csproj‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,6 @@
7070
<SpecificVersion>False</SpecificVersion>
7171
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7272
</Reference>
73-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
75-
</Reference>
76-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
78-
</Reference>
79-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
81-
</Reference>
8273
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8374
<SpecificVersion>False</SpecificVersion>
8475
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -103,9 +94,6 @@
10394
<SpecificVersion>False</SpecificVersion>
10495
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
10596
</Reference>
106-
<Reference Include="Microsoft.WindowsAzure.Storage">
107-
<HintPath>..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
108-
</Reference>
10997
<Reference Include="Newtonsoft.Json">
11098
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
11199
<Private>True</Private>
@@ -120,7 +108,6 @@
120108
</Reference>
121109
<Reference Include="System" />
122110
<Reference Include="System.Core" />
123-
<Reference Include="System.IO.Compression.FileSystem" />
124111
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
125112
<Reference Include="System.Net" />
126113
<Reference Include="System.Net.Http" />
@@ -142,9 +129,6 @@
142129
<Reference Include="System.ServiceModel" />
143130
<Reference Include="System.ServiceModel.Channels" />
144131
<Reference Include="System.ServiceModel.Web" />
145-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
146-
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
147-
</Reference>
148132
<Reference Include="System.Web.Extensions" />
149133
<Reference Include="System.Windows.Forms" />
150134
<Reference Include="System.Xml.Linq" />
@@ -157,14 +141,6 @@
157141
<Compile Include="AzurePowerShell.cs" />
158142
<Compile Include="ComputeCloudException.cs" />
159143
<Compile Include="Constants.cs" />
160-
<Compile Include="Extensions\DSC\DscExtensionCmdletConstants.cs" />
161-
<Compile Include="Extensions\DSC\DscExtensionPrivateSettings.cs" />
162-
<Compile Include="Extensions\DSC\DscExtensionPublicSettings.cs" />
163-
<Compile Include="Extensions\DSC\DscExtensionSettingsSerializer.cs" />
164-
<Compile Include="Extensions\DSC\Exceptions\GetDscResourceException.cs" />
165-
<Compile Include="Extensions\DSC\Publish\ConfigurationParseResult.cs" />
166-
<Compile Include="Extensions\DSC\Publish\ConfigurationParsingHelper.cs" />
167-
<Compile Include="Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs" />
168144
<Compile Include="Properties\Resources.Designer.cs">
169145
<AutoGen>True</AutoGen>
170146
<DesignTime>True</DesignTime>
@@ -219,4 +195,4 @@
219195
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
220196
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
221197
</Target>
222-
</Project>
198+
</Project>

‎src/Common/Commands.Common/packages.config‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
12-
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
13-
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
14-
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
1512
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1613
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1714
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
1815
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
1916
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2017
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
21-
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
22-
<package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />
2318
</packages>

‎src/Common/Commands.Profile/Profile/NewAzureProfile.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,9 @@ private void InitializeAzureProfile(AzureProfile profile, string parameterSet, A
175175
var servicePrincipalAccount = new AzureAccount
176176
{
177177
Id = settings.Credential.UserName,
178-
Type = AzureAccount.AccountType.ServicePrincipal
178+
Type = AzureAccount.AccountType.ServicePrincipal,
179179
};
180+
servicePrincipalAccount.SetOrAppendProperty(AzureAccount.Property.Tenants, settings.Tenant);
180181
profileClient.InitializeProfile(settings.Environment, new Guid(settings.SubscriptionId),
181182
servicePrincipalAccount,
182183
settings.Credential.Password, settings.StorageAccount);

‎src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,15 @@ function Run-ServiceExtensionSetCmdletTests
484484
try
485485
{
486486
# New-AzureDeployment (in Azure.psd1)
487-
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
487+
$testMode = Get-ComputeTestMode;
488+
if ($testMode.ToLower() -ne 'playback')
489+
{
490+
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
491+
}
492+
else
493+
{
494+
$cspkg = "https://${storageName}.blob.azure.windows.net/blob/OneWebOneWorker.cspkg";
495+
}
488496
$cscfg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cscfg';
489497

490498
# Staging 1st
@@ -538,7 +546,15 @@ function Run-ServiceDeploymentExtensionCmdletTests
538546
try
539547
{
540548
# New-AzureDeployment (in Azure.psd1)
541-
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
549+
$testMode = Get-ComputeTestMode;
550+
if ($testMode.ToLower() -ne 'playback')
551+
{
552+
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
553+
}
554+
else
555+
{
556+
$cspkg = "https://${storageName}.blob.azure.windows.net/blob/OneWebOneWorker.cspkg";
557+
}
542558
$cscfg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cscfg';
543559

544560
$rdpCfg1 = New-AzureServiceRemoteDesktopExtensionConfig -Credential $credential -Role WebRole1

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,4 @@
244244
<Target Name="AfterBuild">
245245
</Target>
246246
-->
247-
</Project>
247+
</Project>

‎src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,4 +479,4 @@
479479
<Target Name="AfterBuild">
480480
</Target>
481481
-->
482-
</Project>
482+
</Project>

‎src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,4 +314,4 @@
314314
<Target Name="AfterBuild">
315315
</Target>
316316
-->
317-
</Project>
317+
</Project>

0 commit comments

Comments
 (0)