Skip to content

AzureRT PR S51 - Updating Start/Stop Emulator related cmdlets to work with latest .NET release #587

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 2 commits into from
Jul 10, 2015
Merged

AzureRT PR S51 - Updating Start/Stop Emulator related cmdlets to work with latest .NET release #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
737e8ac
Updating Start/Stop Emulator related cmdlets to work with latest .NET…
Jul 10, 2015
6409710
Update based on PR feedback.
Jul 10, 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
4 changes: 2 additions & 2 deletions src/Common/Commands.Common/Properties/Resources.Designer.cs
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/Common/Commands.Common/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ use and privacy statement at <url> and (c) agree to sharing my contact inf
<value>Cannot find storage account '{0}' please type the name of an existing storage account.</value>
</data>
<data name="StorageEmulatorExe" xml:space="preserve">
<value>WAStorageEmulator.exe</value>
<value>AzureStorageEmulator.exe</value>
</data>
<data name="StorageEmulatorInstallPathRegistryKeyValue" xml:space="preserve">
<value>InstallPath</value>
Expand Down
3 changes: 1 addition & 2 deletions src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureSdkVersionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ internal class AzureSdkVersionInfo
{
//When intergrate with new Azure SDK, please update the versions here.
//If you find there are other version strings to update, please move them to here.
public const string SupportAzureSdkVersionRegKey = "v2.5";
public const string SupportAzureSdkVersion = "2.5.0";
public const string DefaultAzureSdkVersionRegKey = "v2.7";
}
}
14 changes: 6 additions & 8 deletions src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools
{
public class AzureTool
{
public const string SupportAzureSdkVersion = "2.5.0";
public const string SupportAzureSdkVersion = "2.7.0";

public static void Validate()
{
Expand Down Expand Up @@ -94,13 +94,11 @@ private static string GetSdkVersionRegistryValue()
{
throw new InvalidOperationException(Resources.AzureToolsNotInstalledMessage);
}
version = key.GetSubKeyNames().FirstOrDefault(n => n == AzureSdkVersionInfo.SupportAzureSdkVersionRegKey);

if (string.IsNullOrEmpty(version) && key.GetSubKeyNames().Length > 0)
{
throw new InvalidOperationException(string.Format(Resources.AzureSdkVersionNotSupported, AzureSdkVersionInfo.SupportAzureSdkVersionRegKey));
}
else if (string.IsNullOrEmpty(version) && key.GetSubKeyNames().Length == 0)
// select the latest version of SDK installed on the machine.
version = key.GetSubKeyNames().LastOrDefault();

if (string.IsNullOrWhiteSpace(version) && key.GetSubKeyNames().Length == 0)
{
throw new InvalidOperationException(Resources.AzureToolsNotInstalledMessage);
}
Expand All @@ -110,7 +108,7 @@ private static string GetSdkVersionRegistryValue()
{
if (IgnoreMissingSDKError)
{
version = AzureSdkVersionInfo.SupportAzureSdkVersionRegKey;
version = AzureSdkVersionInfo.DefaultAzureSdkVersionRegKey;
}
else
{
Expand Down
Loading