Skip to content

Commit 6ea5e08

Browse files
committed
Merge pull request #1291 from dscsolutions/wmfversion
Remove default for wmfversion for set cmdlets
2 parents 4b58f19 + 5794707 commit 6ea5e08

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,6 @@ private void CreateConfiguration()
302302
var publicSettings = new DscExtensionPublicSettings();
303303
var privateSettings = new DscExtensionPrivateSettings();
304304

305-
publicSettings.WmfVersion = string.IsNullOrEmpty(WmfVersion) ? "latest" : WmfVersion;
306-
307305
if (!string.IsNullOrEmpty(ArchiveBlobName))
308306
{
309307
ConfigurationUris configurationUris = UploadConfigurationDataToBlob();
@@ -321,6 +319,11 @@ private void CreateConfiguration()
321319
privateSettings.Items = settings.Item2;
322320

323321
privateSettings.DataBlobUri = configurationUris.DataBlobUri;
322+
323+
if (!string.IsNullOrEmpty(WmfVersion))
324+
{
325+
publicSettings.WmfVersion = WmfVersion;
326+
}
324327
}
325328

326329
if (string.IsNullOrEmpty(this.Location))

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ private void CreateConfiguration()
381381
var publicSettings = new DscExtensionPublicSettings();
382382
var privateSettings = new DscExtensionPrivateSettings();
383383

384-
publicSettings.WmfVersion = string.IsNullOrEmpty(WmfVersion) ? "latest" : WmfVersion;
384+
385385

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

402402
privateSettings.DataBlobUri = configurationUris.DataBlobUri;
403+
404+
if (!string.IsNullOrEmpty(WmfVersion))
405+
{
406+
publicSettings.WmfVersion = WmfVersion;
407+
}
403408
}
404409

405410
//

0 commit comments

Comments
 (0)