Skip to content
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

Fix issues found in end game #4734

Merged
merged 4 commits into from
Nov 9, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ depLocation=dependencies/
excp=Exception in getClasspathEntries
azureSDKcontainerID=com.microsoft.azuretools.SDK_CONTAINER
sdkID=com.microsoft.azuretools.sdk
sdkJar=dependencies/azure-1.36.2.jar
sdkJar=dependencies/azure-1.36.3.jar
jstDep=org.eclipse.jst.component.dependency
aiCheckBoxTxt=Enable telemetry with Application Insights
webxmlPath=WebContent/WEB-INF/web.xml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ lblVersion=Version :
libNotAvail=Library is not available.
notFound=Not found
sdkID=com.microsoft.azuretools.sdk
sdkJar=dependencies/azure-1.36.2.jar
sdkJar=dependencies/azure-1.36.3.jar
title=Microsoft Azure Libraries for Java
verNotAvail=The selected version is not available.
version1=Microsoft Azure Libraries for Java, version %s.%s.%s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ err=Error
prefFileName=WAEclipsePlugin
bundleName=org.eclipse.core.runtime
sdkLibBundleName=com.microsoftopentechnologies.windowsazure.tools.sdk
sdkLibBaseJar=dependencies/azure-1.36.2.jar
sdkLibBaseJar=dependencies/azure-1.36.3.jar
SDKLocErrMsg=Error occurred while retrieving path of Azure libraries
resCLExWkspRfrsh=Exception while refresh of workspace.
cmhLblStrgAcc=Storage Accounts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

public class PluginHelper {

private static final String AZURE_ARTIFACT = "azure-1.36.2.jar";
private static final String AZURE_ARTIFACT = "azure-1.36.3.jar";

/**
* @return resource filename in plugin's directory
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@ public JComponent prepare(WizardNavigationState wizardNavigationState) {
fillRegions();
}
}
if ((knownImageBtn.isSelected() && knownImageComboBox.getSelectedItem() == null) ||
(customImageBtn.isSelected() && imageLabelList.getSelectedValue() == null)) {
disableNext();
}
return rootPanel;
}

Expand Down
2 changes: 1 addition & 1 deletion Utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<kotlin.version>1.3.72</kotlin.version>
<kotlin.jvmTargetVersion>1.8</kotlin.jvmTargetVersion>
<jackson.version>2.11.1</jackson.version>
<azure.version>1.36.2</azure.version>
<azure.version>1.36.3</azure.version>
<docker.client.version>8.16.0</docker.client.version>
<azure.client.version>1.7.5</azure.client.version>
<azure.storage.version>8.6.4</azure.storage.version>
Expand Down