Skip to content

. #110

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.

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 60 commits into from
Sep 25, 2015
Merged

. #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
260443f
Authorization: Bug fix in Get-AzureRMRoleAassignment to filter list o…
namratab Sep 21, 2015
4e303e7
[#103628912] Added installation script
stankovski Sep 21, 2015
0914abd
[#102955616, #103828190] Add output types for profile cmdlets and fix…
markcowl Sep 22, 2015
df99235
Updated scripts to use new msbuild configuration
stankovski Sep 22, 2015
29f8f3a
Merge pull request #958 from stankovski/dev
stankovski Sep 22, 2015
73ed8eb
Update SQL help documentation
jamestao Sep 22, 2015
2032a22
Batch update cmdlets
Sep 4, 2015
dba36ec
Tests for Batch Update cmdlets
Sep 8, 2015
1ac0309
Help for Batch update cmdlets
Sep 8, 2015
03b34fd
Fix session records for Batch update tests
Sep 8, 2015
6950060
Rename Batch interceptor helper methods
Sep 10, 2015
0e85db2
fixes #103823362 undo renaming for key vault data plane cmdlets
Sep 22, 2015
5166469
Merge pull request #948 from jamestao/dev
ogail Sep 22, 2015
ad1cf6f
Merge dev branch changes into Batch update cmdlets
Sep 22, 2015
d045e2c
Graph call optimization and parameter fixes
shuagarw Sep 22, 2015
6caf154
Merge branch 'dev' of github.com:Azure/azure-powershell into paramete…
shuagarw Sep 22, 2015
3fc36d9
fixes #103934158 Rename AzureRM cmdlets to AzureRm
Sep 22, 2015
392e3fd
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Sep 22, 2015
48f048b
reverting unintended help file parameter renaming
markcowl Sep 22, 2015
59e6fc5
Added AzureRM.Installer module
stankovski Sep 22, 2015
3cfe7dc
Added Publish step to msbuild
stankovski Sep 22, 2015
a0b4906
Merge pull request #962 from jianghaolu/dev
amarzavery Sep 22, 2015
06df4ed
Added AzureRM installer
stankovski Sep 22, 2015
1f17434
RoleAssignment fixes
shuagarw Sep 23, 2015
83664bd
Merge branch 'dev' of github.com:Azure/azure-powershell into paramete…
shuagarw Sep 23, 2015
2cc2e63
Merge pull request #964 from stankovski/dev
Sep 23, 2015
f7497c8
Fix a bunch of typos.
rhencke Sep 23, 2015
ac06ca4
skip failing tests
namratab Sep 23, 2015
843d985
Merge branch 'dev' of github.com:Azure/azure-powershell into DocUpdate
namratab Sep 23, 2015
0270be6
Merge pull request #947 from namratab/DocUpdate
markcowl Sep 23, 2015
207a0f7
Merge branch 'dev' of github.com:Azure/azure-powershell into paramete…
shuagarw Sep 23, 2015
f69f6df
[fixes #103934158] Fix storage data plane renamings
jianghaolu Sep 23, 2015
b2adc4f
Merging with upstream changes
markcowl Sep 23, 2015
a3ca5dc
Moving model classes and updating scenario tests
markcowl Sep 23, 2015
48ccf0b
Merge pull request #960 from jasper-schneider/batchUpdateCmdlets
ogail Sep 23, 2015
6ab0000
Fix Tests
Sep 23, 2015
13a8f10
Role Assignment fixes review comments
shuagarw Sep 23, 2015
1ae79b0
Fixing output for profile types
markcowl Sep 23, 2015
496f794
Fix reference of storage data plane in ApiManagement
jianghaolu Sep 23, 2015
81bab9e
[fixes #103937270] Add -SubscriptionName to Get-AzureRMSubscription
jianghaolu Sep 23, 2015
443c1f9
Clean up ARM EnvironmentSetupHelper
jianghaolu Sep 23, 2015
818c7dd
Merge pull request #968 from jianghaolu/dev
Sep 23, 2015
b994e6b
Merge pull request #971 from jianghaolu/subname
ogail Sep 24, 2015
05be958
Additional changes for RoleAssignments
shuagarw Sep 24, 2015
9fbfcd4
Merge branch 'dev' of github.com:Azure/azure-powershell into paramete…
shuagarw Sep 24, 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
48e4ea9
Added help for Profile cmdlets [##103821006]
markcowl Sep 24, 2015
044d728
Merge pull request #954 from markcowl/pocotypes
Sep 24, 2015
ca9b6b8
Merge branch 'dev' of github.com:Azure/azure-powershell into rmprofile
markcowl Sep 24, 2015
13c321d
Merge pull request #972 from markcowl/rmprofile
Sep 24, 2015
2bc9f92
Merge branch 'dev' of github.com:Azure/azure-powershell into paramete…
shuagarw Sep 24, 2015
2c27318
Fixing issue with AzureEndpoints.
ms-alguerra Sep 24, 2015
b7599d2
Merge pull request #965 from rhencke/patch-1
markcowl Sep 25, 2015
b7a4473
Merge pull request #969 from jasper-schneider/fixTests
markcowl Sep 25, 2015
8c041a4
Merge pull request #970 from shuagarw/parameterAndBugFixes
markcowl Sep 25, 2015
5d7c796
Merge pull request #975 from t-alguer/dev
markcowl Sep 25, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<SetupOutputDirectory>$(PublishDirectory)\Setup</SetupOutputDirectory>
<TestOutputDirectory>$(PublishDirectory)\TestResults</TestOutputDirectory>
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
<NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' != '' ">http://psget/PSGallery/api/v2/</NuGetPublishingSource>
</PropertyGroup>
<ItemGroup>
<AzureResourceManagerSln Include=".\src\ResourceManager.sln" />
Expand Down Expand Up @@ -115,6 +116,7 @@
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
<PowerShellCommand>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
</PropertyGroup>

<!--
Expand Down Expand Up @@ -285,6 +287,14 @@
<!--If we are testing locally then we copy the binaries and do not submit to the code sign server-->
<Copy SourceFiles="@(InstallersToSign)" DestinationFolder="signed" Condition="$(DelaySign)" />
</Target>

<!-- Publish all packages -->
<Target Name="Publish" DependsOnTargets="Build">
<Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
<Message Importance="high" Text="Publishing Cmdlets..." />

<Exec Command="$(PowerShellCommand) -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\PublishModules.ps1 $(Configuration) $(NuGetKey) \&quot;$(NuGetPublishingSource)\&quot;&quot;"/>
</Target>

<PropertyGroup>
<RunTestLive Condition="'$(RunTestLive)' == ''">false</RunTestLive>
Expand Down
33 changes: 29 additions & 4 deletions setup-powershellget/Setup/ShortcutStartup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,36 @@ Param(
[switch]$Install
)

cd c:\
$welcomeMessage = @"
$error.clear()
try {
if ($Install.IsPresent) {
Write-Output @"

Finalizing installation of Azure PowerShell.
Installing Azure Modules from PowerShell Gallery.
This may take some time...
"@
Import-Module PackageManagement
Get-PackageProvider -Name NuGet -ForceBootstrap

$NuGetPublishingSource = $env:NuGetPublishingSource
if ([string]::IsNullOrWhiteSpace($NuGetPublishingSource)) {
Install-Module AzureRM -Repository $NuGetPublishingSource
} else {
Install-Module AzureRM
}
} else {
cd c:\
$welcomeMessage = @"
For a list of all Azure cmdlets type 'help azure'.
For a list of Azure Pack cmdlets type 'Get-Command *wapack*'.
"@
Write-Output $welcomeMessage
Write-Output $welcomeMessage

$VerbosePreference = "Continue"
$VerbosePreference = "Continue"
}
}
catch { Write-Output $error }
if ($error) {
Read-Host -Prompt "An error occured during installation. Press any key..."
}
2 changes: 1 addition & 1 deletion setup-powershellget/azurecmd.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<CustomAction Id="SetCustomActionDataValue" Return="check" Property="UpdatePSShortcut"
Value="ShortcutPath=[AzureSdkMenu]Microsoft Azure PowerShell.lnk;DefaultShortcutPath=[ProgramMenuFolder]System Tools\Windows PowerShell.lnk" />
<CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;Set-ExecutionPolicy RemoteSigned -Force&quot;" Execute="deferred" Impersonate="no" Return="check"/>
<CustomAction Id="RunModuleInstallScript" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;\&quot;[PowerShellFolder]\ShortcutStartup.ps1 -Install\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
<CustomAction Id="RunModuleInstallScript" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;. \&quot;[PowerShellFolder]\ShortcutStartup.ps1\&quot; -Install&quot;" Execute="deferred" Impersonate="no" Return="check"/>

<InstallExecuteSequence>
<Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
Expand Down
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
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
25 changes: 2 additions & 23 deletions src/Common/Commands.Common/Commands.Common.csproj
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
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

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

Loading