Skip to content

Remove default for wmfversion for set cmdlets #1291

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 3 commits into from Dec 22, 2015
Merged

Remove default for wmfversion for set cmdlets #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25a0672
change default for wmfversion param
eshaparmar Nov 5, 2015
38aec23
Merge branch 'dev' into wmfversion
eshaparmar Nov 13, 2015
5794707
Merge branch 'dev' into wmfversion
eshaparmar Dec 22, 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
7 changes: 5 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,6 @@ 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 All @@ -321,6 +319,11 @@ private void CreateConfiguration()
privateSettings.Items = settings.Item2;

privateSettings.DataBlobUri = configurationUris.DataBlobUri;

if (!string.IsNullOrEmpty(WmfVersion))
{
publicSettings.WmfVersion = WmfVersion;
}
}

if (string.IsNullOrEmpty(this.Location))
Expand Down
7 changes: 6 additions & 1 deletion ...nagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ private void CreateConfiguration()
var publicSettings = new DscExtensionPublicSettings();
var privateSettings = new DscExtensionPrivateSettings();

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


if (!string.IsNullOrEmpty(ConfigurationArchive))
{
Expand All @@ -400,6 +400,11 @@ private void CreateConfiguration()
privateSettings.Items = settings.Item2;

privateSettings.DataBlobUri = configurationUris.DataBlobUri;

if (!string.IsNullOrEmpty(WmfVersion))
{
publicSettings.WmfVersion = WmfVersion;
}
}

//
Expand Down