Skip to content

. #138

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 58 commits into from
Oct 3, 2015
Merged

. #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
adf5743
showing error message
Sep 16, 2015
0eede1d
cmdlet name fix
Sep 16, 2015
d531100
adding output types to cmdlet
Sep 18, 2015
cc183cd
merge
Sep 19, 2015
d5b7740
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Sep 21, 2015
534c3f6
rg name optional, adding sqoop support, misc. bug fixes
Sep 23, 2015
485a4ff
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 28, 2015
d438dd9
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 28, 2015
0974856
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 29, 2015
7db5cee
fixing script action bug
Sep 30, 2015
726e197
merge from latest
Sep 30, 2015
a915cb7
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 30, 2015
7606edf
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 30, 2015
ebacc4f
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 30, 2015
b1b6309
Adding wmfversion param to the set cmdlet for ASM
eshaparmar Sep 30, 2015
0657745
Added WMF version param to ARM
eshaparmar Sep 30, 2015
eb25091
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
eshaparmar Oct 1, 2015
636ae15
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
eshaparmar Oct 2, 2015
c08da62
adding warning message, adding sqoop cmdlet
Oct 2, 2015
ccbb5f5
renaming ClusterCredential to HttpCredential
Oct 2, 2015
1cc2b3b
Bump up ADF nuget to 4.0.0
Oct 2, 2015
1d9bf62
Re-run ADF mock tests and attached new session records.
Oct 2, 2015
87c9bc7
updating help files
Oct 2, 2015
c3c3274
display script action bug fix
Oct 2, 2015
3f07f40
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Oct 2, 2015
3abfda8
Add Find-Resource cmdlet and test/help file
vivsriaus Oct 2, 2015
5d352cc
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
eshaparmar Oct 2, 2015
05c6a21
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Oct 2, 2015
6992987
Capture new test record
vivsriaus Oct 2, 2015
23f693d
Edit help for extension resource type
vivsriaus Oct 2, 2015
d760e8a
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
stankovski Oct 2, 2015
fd3793d
Fixed test broken by removal of TemplateFile parameter from New-Azure…
stankovski Oct 2, 2015
2b73653
Delete ResourceManager.sln
ravbhatnagar Oct 2, 2015
5476ccf
Merge pull request #1047 from vivsriaus/FindResource
amarzavery Oct 2, 2015
bc1b9ba
Merge pull request #1021 from shefaliv/dev
stankovski Oct 2, 2015
4f5f9a5
Merge pull request #1035 from dscsolutions/wmfparam
stankovski Oct 2, 2015
33ac507
Add FindResourceGroupCmdlet
Oct 2, 2015
740f2a1
add Get ERserviceProvider cmdlet
deepakswifty Oct 3, 2015
9f124a3
Merge pull request #1050 from stankovski/dev
stankovski Oct 3, 2015
b6dbc51
Merge pull request #1046 from yitao-zhang/adf4.0
stankovski Oct 3, 2015
11ea787
Merge pull request #1051 from ravbhatnagar/dev
stankovski Oct 3, 2015
e33f84d
Add parameter set AzureRmResourceGroup
Oct 3, 2015
3034441
updating hdi refs
Oct 3, 2015
f12920e
Fix test issues
Oct 3, 2015
46711cd
building
Oct 3, 2015
11ad873
update compute lib
deepakswifty Oct 3, 2015
36a1a5a
Add cmdlet info headers (CommandName and ParameterSetName)
vivsriaus Oct 3, 2015
ac99f7e
[#104343046] add a keyword help decorator script
devigned Oct 3, 2015
985bd73
[#104343046] add copyright header to doc commands
devigned Oct 3, 2015
899292a
[#104343046] remove the debug output and fix Node creation
devigned Oct 3, 2015
ba64190
[#104343046] add progress notifications
devigned Oct 3, 2015
de75d6e
[Fixes #104343046] update the keyworks for each command
devigned Oct 3, 2015
8d5cedc
Merge pull request #1059 from devigned/feature/keywords
ogail Oct 3, 2015
4b8dd40
Merge pull request #1058 from vivsriaus/Headers
ogail Oct 3, 2015
f91e06c
Merge pull request #1053 from DeepakRajendranMsft/ExpressRouteService…
ogail Oct 3, 2015
a5ce138
Merge pull request #1054 from chidmdxx/AddParameterSetGetResourceGroup
ogail Oct 3, 2015
56d97ab
Merge pull request #1052 from chidmdxx/FindResourceGroupCmdlet
ogail Oct 3, 2015
f2674a6
Merge pull request #1055 from shefaliv/dev
ogail Oct 3, 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
42,563 changes: 22,167 additions & 20,396 deletions src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.12-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.13-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Compute" version="8.2.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="2.0.12-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="2.0.13-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.5715.36130-prerelease" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.12-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.13-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,33 @@ public class SetAzureVMDscExtensionCommand : VirtualMachineExtensionBaseCmdlet
[Parameter(
HelpMessage = "Extension handler gets auto updated to the latest version if this switch is present.")]
public SwitchParameter AutoUpdate { get; set; }
//Private Variables

/// <summary>
/// Specifies the version of the Windows Management Framework (WMF) to install
/// on the VM.
///
/// The DSC Azure Extension depends on DSC features that are only available in
/// the WMF updates. This parameter specifies which version of the update to
/// install on the VM. The possible values are "4.0","latest" and "5.0PP".
///
/// A value of "4.0" will install KB3000850
/// (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server
/// 2012 R2, or WMF 4.0
/// (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other
/// versions of Windows if a newer version isnt already installed.
///
/// A value of "5.0PP" will install the latest release of WMF 5.0PP
/// (http://go.microsoft.com/fwlink/?LinkId=398175).
///
/// A value of "latest" will install the latest WMF, currently WMF 5.0PP
///
/// The default value is "latest"
/// </summary>
[Parameter(ValueFromPipelineByPropertyName = true)]
[ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP" })]
public string WmfVersion { get; set; }

//Private Variables
private const string VersionRegexExpr = @"^(([0-9])\.)\d+$";

/// <summary>
Expand Down Expand Up @@ -276,7 +301,9 @@ private void CreateConfiguration()
{
var publicSettings = new DscExtensionPublicSettings();
var privateSettings = new DscExtensionPrivateSettings();


publicSettings.WmfVersion = string.IsNullOrEmpty(WmfVersion) ? "latest" : WmfVersion;

if (!string.IsNullOrEmpty(ArchiveBlobName))
{
ConfigurationUris configurationUris = UploadConfigurationDataToBlob();
Expand Down
Loading