Skip to content

HPF PR: dev <- Azure:dev #357

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
huangpf merged 8 commits into from
Jan 25, 2016
Merged

HPF PR: dev <- Azure:dev #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7738ff9
Fix New-AzureDeployment cmdlet
hyonholee Oct 9, 2015
9b1d98a
Update ASM AzureRT test setup
hyonholee Oct 9, 2015
98cfd6c
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
hyonholee Jan 21, 2016
88bc078
Fix Set-AzureDiskEncryptionExtension issue dut to client library update
hyonholee Jan 21, 2016
593816a
Revert unnecessary change
hyonholee Jan 21, 2016
79e3815
Update ADF OM.
Jan 25, 2016
909bd3d
Merge pull request #1709 from yitao-zhang/dev
Jan 25, 2016
4a33c53
Merge pull request #1694 from hyonholee/hotfix
Jan 25, 2016
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
12 changes: 6 additions & 6 deletions ...Compute/Commands.Compute/Extension/AzureDiskEncryption/SetAzureDiskEncryptionExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ private AzureOperationResponse<VirtualMachine> UpdateVmEncryptionSettings()
parameters).GetAwaiter().GetResult();
}

private string GetExtensionPublicSettings()
private Hashtable GetExtensionPublicSettings()
{
Hashtable publicSettings = new Hashtable();
publicSettings.Add(aadClientIDKey, AadClientID ?? String.Empty);
Expand All @@ -321,24 +321,24 @@ private string GetExtensionPublicSettings()
publicSettings.Add(encryptionOperationKey, enableEncryptionOperation);
publicSettings.Add(sequenceVersionKey, SequenceVersion ?? String.Empty);

return JsonConvert.SerializeObject(publicSettings);
return publicSettings;
}

private string GetExtensionProtectedSettings()
private Hashtable GetExtensionProtectedSettings()
{
Hashtable protectedSettings = new Hashtable();
protectedSettings.Add(aadClientSecretKey, AadClientSecret ?? String.Empty);
if (string.Equals(this.currentOSType, "Linux"))
{
protectedSettings.Add(passphraseKey, Passphrase ?? null);
}
return JsonConvert.SerializeObject(protectedSettings);
return protectedSettings;
}

private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParameters)
{
string SettingString = GetExtensionPublicSettings();
string ProtectedSettingString = GetExtensionProtectedSettings();
Hashtable SettingString = GetExtensionPublicSettings();
Hashtable ProtectedSettingString = GetExtensionProtectedSettings();

if (vmParameters == null)
{
Expand Down
5 changes: 2 additions & 3 deletions ...ourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.1.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.DataFactories">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.3.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.DataFactories" version="4.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.DataFactories" version="4.3.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.5799.28345-prerelease" targetFramework="net45" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5799.28345-prerelease" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.1.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.3.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/DataFactories/Commands.DataFactories/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="Microsoft.Azure.Common.Authentication" version="1.5.2-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.DataFactories" version="4.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.DataFactories" version="4.3.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
Expand Down