Skip to content

Commit 2bc9f92

Browse files
shuagarwshuagarw
committed
Merge branch 'dev' of github.com:Azure/azure-powershell into parameterAndBugFixes
2 parents 9fbfcd4 + 13c321d commit 2bc9f92

File tree

197 files changed

+2865
-3732
lines changed

Some content is hidden

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

197 files changed

+2865
-3732
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
60+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.3.1-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />

‎src/Common/AzurePSCmdlet.cs renamed to ‎src/Common/Commands.Common/AzurePSCmdlet.cs

File renamed without changes.

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

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
67+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Common.NetFramework">
@@ -143,12 +143,9 @@
143143
<Reference Include="System.Xml" />
144144
</ItemGroup>
145145
<ItemGroup>
146-
<Compile Include="..\AzurePSCmdlet.cs">
147-
<Link>AzurePSCmdlet.cs</Link>
148-
</Compile>
146+
<Compile Include="AzurePSCmdlet.cs" />
149147
<Compile Include="AzurePSDataCollectionProfile.cs" />
150148
<Compile Include="AzurePowerShell.cs" />
151-
<Compile Include="ComputeCloudException.cs" />
152149
<Compile Include="Constants.cs" />
153150
<Compile Include="ProfileClient.cs" />
154151
<Compile Include="Properties\Resources.Designer.cs">
@@ -157,8 +154,6 @@
157154
<DependentUpon>Resources.resx</DependentUpon>
158155
</Compile>
159156
<Compile Include="PublishSettingsImporter.cs" />
160-
<Compile Include="RequiredResourceLookup.cs" />
161-
<Compile Include="RPRegistrationAction.cs" />
162157
<Compile Include="MetricHelper.cs" />
163158
<Compile Include="SecureStringExtensions.cs" />
164159
<Compile Include="ConversionUtilities.cs" />
@@ -167,25 +162,9 @@
167162
<Compile Include="PowerShellUtilities.cs" />
168163
<Compile Include="RecordingTracingInterceptor.cs" />
169164
<Compile Include="ProfileClientExtensions.cs" />
170-
<Compile Include="ServiceManagementTypes.cs" />
171-
<Compile Include="ChannelHelper.cs" />
172165
<Compile Include="ClientCreatedArgs.cs" />
173-
<Compile Include="CloudBaseCmdlet.cs" />
174-
<Compile Include="AzureSMCmdlet.cs" />
175166
<Compile Include="CmdletExtensions.cs" />
176-
<Compile Include="ConfigurationConstants.cs" />
177-
<Compile Include="DiagnosticsHelper.cs" />
178-
<Compile Include="ErrorHelper.cs" />
179-
<Compile Include="IdnHelper.cs" />
180-
<Compile Include="ManagementOperationContext.cs" />
181-
<Compile Include="Parameters.cs" />
182-
<Compile Include="SubscriptionCmdletBase.cs" />
183167
<Compile Include="TestMockSupport.cs" />
184-
<Compile Include="HttpClientExtensions.cs" />
185-
<Compile Include="HttpRestCallLogger.cs" />
186-
<Compile Include="HttpRestMessageInspector.cs" />
187-
<Compile Include="ProcessHelper.cs" />
188-
<Compile Include="Tasks.cs" />
189168
<Compile Include="PSAzureAccount.cs" />
190169
<Compile Include="Properties\AssemblyInfo.cs" />
191170
</ItemGroup>

‎src/Common/Commands.Common/ProfileClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
using Hyak.Common;
2323
using Microsoft.Azure.Common.Authentication.Factories;
2424
using Microsoft.Azure.Common.Authentication.Models;
25-
using Microsoft.Azure.Common.Authentication.Properties;
25+
using Microsoft.WindowsAzure.Commands.Common.Properties;
2626
using Microsoft.WindowsAzure.Subscriptions;
2727

2828
namespace Microsoft.Azure.Common.Authentication

‎src/Common/Commands.Common/Properties/Resources.Designer.cs

Lines changed: 140 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Common/Commands.Common/Properties/Resources.resx

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,4 +1496,49 @@ Select Y to enable data collection [Y/N]:</value>
14961496
<data name="DataCollectionSaveFileInformation" xml:space="preserve">
14971497
<value>The setting profile has been saved to the following path '{0}'.</value>
14981498
</data>
1499+
<data name="AuthenticatingForSingleTenant" xml:space="preserve">
1500+
<value>[Common.Authentication]: Authenticating for account {0} with single tenant {1}.</value>
1501+
</data>
1502+
<data name="ChangingDefaultEnvironmentNotSupported" xml:space="preserve">
1503+
<value>Changing public environment is not supported.</value>
1504+
</data>
1505+
<data name="EnvironmentNameNeedsToBeSpecified" xml:space="preserve">
1506+
<value>Environment name needs to be specified.</value>
1507+
</data>
1508+
<data name="EnvironmentNeedsToBeSpecified" xml:space="preserve">
1509+
<value>Environment needs to be specified.</value>
1510+
</data>
1511+
<data name="EnvironmentNotFound" xml:space="preserve">
1512+
<value>The environment name '{0}' is not found.</value>
1513+
</data>
1514+
<data name="FilePathIsNotValid" xml:space="preserve">
1515+
<value>File path is not valid.</value>
1516+
</data>
1517+
<data name="InvalidSubscriptionName" xml:space="preserve">
1518+
<value>Must specify a non-null subscription name.</value>
1519+
</data>
1520+
<data name="RemoveDefaultSubscription" xml:space="preserve">
1521+
<value>The default subscription is being removed. Use Select-AzureSubscription -Default &lt;subscriptionName&gt; to select a new default subscription.</value>
1522+
</data>
1523+
<data name="RemovingDefaultEnvironmentsNotSupported" xml:space="preserve">
1524+
<value>Removing public environment is not supported.</value>
1525+
</data>
1526+
<data name="SubscriptionIdNotFoundMessage" xml:space="preserve">
1527+
<value>The subscription id {0} doesn't exist.</value>
1528+
</data>
1529+
<data name="SubscriptionNameNeedsToBeSpecified" xml:space="preserve">
1530+
<value>Subscription name needs to be specified.</value>
1531+
</data>
1532+
<data name="SubscriptionNameNotFoundMessage" xml:space="preserve">
1533+
<value>The subscription name {0} doesn't exist.</value>
1534+
</data>
1535+
<data name="SubscriptionNeedsToBeSpecified" xml:space="preserve">
1536+
<value>Subscription needs to be specified.</value>
1537+
</data>
1538+
<data name="UserNameIsNotValid" xml:space="preserve">
1539+
<value>User name is not valid.</value>
1540+
</data>
1541+
<data name="UserNameNeedsToBeSpecified" xml:space="preserve">
1542+
<value>User name needs to be specified.</value>
1543+
</data>
14991544
</root>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.ApplicationInsights" version="1.1.1-beta" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Common.Authentication" version="1.3.1-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@
155155
<None Include="packages.config" />
156156
</ItemGroup>
157157
<ItemGroup>
158+
<ProjectReference Include="..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj">
159+
<Project>{cff09e81-1e31-444e-b4d4-a21e946c29e2}</Project>
160+
<Name>Commands.ServiceManagement.Common</Name>
161+
</ProjectReference>
158162
<ProjectReference Include="..\Commands.Common\Commands.Common.csproj">
159163
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
160164
<Name>Commands.Common</Name>

0 commit comments

Comments
 (0)