Skip to content

[#102955616, #103828190] Add output types for profile cmdlets and fix… #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 24, 2015
Merged

[#102955616, #103828190] Add output types for profile cmdlets and fix… #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0914abd
[#102955616, #103828190] Add output types for profile cmdlets and fix…
markcowl Sep 22, 2015
48f048b
reverting unintended help file parameter renaming
markcowl Sep 22, 2015
b2adc4f
Merging with upstream changes
markcowl Sep 23, 2015
a3ca5dc
Moving model classes and updating scenario tests
markcowl Sep 23, 2015
1ae79b0
Fixing output for profile types
markcowl Sep 23, 2015
853c11a
[#103828190, #103425146, #103697132] Fix display and reported issues …
markcowl Sep 24, 2015
d3d7a9a
Merging with upstream
markcowl Sep 24, 2015
3de5d1e
Correcting merge error
markcowl Sep 24, 2015
c1a7975
Fixing tests and updating converters to handle null values
markcowl Sep 24, 2015
7eda13a
removing app.config files
markcowl Sep 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common.Storage/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.3.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
Expand Down
0 src/Common/AzurePSCmdlet.cs → src/Common/Commands.Common/AzurePSCmdlet.cs
View file
Open in desktop
File renamed without changes.
25 changes: 2 additions & 23 deletions src/Common/Commands.Common/Commands.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
Expand Down Expand Up @@ -143,12 +143,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\AzurePSCmdlet.cs">
<Link>AzurePSCmdlet.cs</Link>
</Compile>
<Compile Include="AzurePSCmdlet.cs" />
<Compile Include="AzurePSDataCollectionProfile.cs" />
<Compile Include="AzurePowerShell.cs" />
<Compile Include="ComputeCloudException.cs" />
<Compile Include="Constants.cs" />
<Compile Include="ProfileClient.cs" />
<Compile Include="Properties\Resources.Designer.cs">
Expand All @@ -157,8 +154,6 @@
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="PublishSettingsImporter.cs" />
<Compile Include="RequiredResourceLookup.cs" />
<Compile Include="RPRegistrationAction.cs" />
<Compile Include="MetricHelper.cs" />
<Compile Include="SecureStringExtensions.cs" />
<Compile Include="ConversionUtilities.cs" />
Expand All @@ -167,25 +162,9 @@
<Compile Include="PowerShellUtilities.cs" />
<Compile Include="RecordingTracingInterceptor.cs" />
<Compile Include="ProfileClientExtensions.cs" />
<Compile Include="ServiceManagementTypes.cs" />
<Compile Include="ChannelHelper.cs" />
<Compile Include="ClientCreatedArgs.cs" />
<Compile Include="CloudBaseCmdlet.cs" />
<Compile Include="AzureSMCmdlet.cs" />
<Compile Include="CmdletExtensions.cs" />
<Compile Include="ConfigurationConstants.cs" />
<Compile Include="DiagnosticsHelper.cs" />
<Compile Include="ErrorHelper.cs" />
<Compile Include="IdnHelper.cs" />
<Compile Include="ManagementOperationContext.cs" />
<Compile Include="Parameters.cs" />
<Compile Include="SubscriptionCmdletBase.cs" />
<Compile Include="TestMockSupport.cs" />
<Compile Include="HttpClientExtensions.cs" />
<Compile Include="HttpRestCallLogger.cs" />
<Compile Include="HttpRestMessageInspector.cs" />
<Compile Include="ProcessHelper.cs" />
<Compile Include="Tasks.cs" />
<Compile Include="PSAzureAccount.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common/ProfileClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
using Hyak.Common;
using Microsoft.Azure.Common.Authentication.Factories;
using Microsoft.Azure.Common.Authentication.Models;
using Microsoft.Azure.Common.Authentication.Properties;
using Microsoft.WindowsAzure.Commands.Common.Properties;
using Microsoft.WindowsAzure.Subscriptions;

namespace Microsoft.Azure.Common.Authentication
Expand Down
145 changes: 140 additions & 5 deletions src/Common/Commands.Common/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions src/Common/Commands.Common/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,4 +1496,49 @@ Select Y to enable data collection [Y/N]:</value>
<data name="DataCollectionSaveFileInformation" xml:space="preserve">
<value>The setting profile has been saved to the following path '{0}'.</value>
</data>
<data name="AuthenticatingForSingleTenant" xml:space="preserve">
<value>[Common.Authentication]: Authenticating for account {0} with single tenant {1}.</value>
</data>
<data name="ChangingDefaultEnvironmentNotSupported" xml:space="preserve">
<value>Changing public environment is not supported.</value>
</data>
<data name="EnvironmentNameNeedsToBeSpecified" xml:space="preserve">
<value>Environment name needs to be specified.</value>
</data>
<data name="EnvironmentNeedsToBeSpecified" xml:space="preserve">
<value>Environment needs to be specified.</value>
</data>
<data name="EnvironmentNotFound" xml:space="preserve">
<value>The environment name '{0}' is not found.</value>
</data>
<data name="FilePathIsNotValid" xml:space="preserve">
<value>File path is not valid.</value>
</data>
<data name="InvalidSubscriptionName" xml:space="preserve">
<value>Must specify a non-null subscription name.</value>
</data>
<data name="RemoveDefaultSubscription" xml:space="preserve">
<value>The default subscription is being removed. Use Select-AzureSubscription -Default &lt;subscriptionName&gt; to select a new default subscription.</value>
</data>
<data name="RemovingDefaultEnvironmentsNotSupported" xml:space="preserve">
<value>Removing public environment is not supported.</value>
</data>
<data name="SubscriptionIdNotFoundMessage" xml:space="preserve">
<value>The subscription id {0} doesn't exist.</value>
</data>
<data name="SubscriptionNameNeedsToBeSpecified" xml:space="preserve">
<value>Subscription name needs to be specified.</value>
</data>
<data name="SubscriptionNameNotFoundMessage" xml:space="preserve">
<value>The subscription name {0} doesn't exist.</value>
</data>
<data name="SubscriptionNeedsToBeSpecified" xml:space="preserve">
<value>Subscription needs to be specified.</value>
</data>
<data name="UserNameIsNotValid" xml:space="preserve">
<value>User name is not valid.</value>
</data>
<data name="UserNameNeedsToBeSpecified" xml:space="preserve">
<value>User name needs to be specified.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Common/Commands.Common/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="Microsoft.ApplicationInsights" version="1.1.1-beta" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.3.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
Expand Down
4 changes: 4 additions & 0 deletions src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj">
<Project>{cff09e81-1e31-444e-b4d4-a21e946c29e2}</Project>
<Name>Commands.ServiceManagement.Common</Name>
</ProjectReference>
<ProjectReference Include="..\Commands.Common\Commands.Common.csproj">
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
<Name>Commands.Common</Name>
Expand Down
Loading