Skip to content

Commit 2c5a9f5

Browse files
committed
Merge branch 'endgame-s187' into release
2 parents 7505250 + 1c8ce8f commit 2c5a9f5

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
exclude group: "com.fasterxml.jackson", module: "jackson-bom"
1313
}
1414
compile project(':azure-intellij-plugin-lib')
15-
compile "com.microsoft.azure:azure-toolkit-common-lib:0.7.0"
15+
compile "com.microsoft.azure:azure-toolkit-common-lib:0.7.1"
1616

17-
aspect "com.microsoft.azure:azure-toolkit-common-lib:0.7.0"
17+
aspect "com.microsoft.azure:azure-toolkit-common-lib:0.7.1"
1818
}

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ subprojects {
103103
compileOnly 'org.projectlombok:lombok:1.18.8'
104104
annotationProcessor 'org.projectlombok:lombok:1.18.8'
105105

106-
compile 'com.microsoft.azure:azure-toolkit-common-lib:0.7.0', {
106+
compile 'com.microsoft.azure:azure-toolkit-common-lib:0.7.1', {
107107
exclude group: "com.squareup.okhttp3", module: "okhttp"
108108
exclude group: "com.squareup.okhttp3", module: "okhttp-urlconnection"
109109
exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
@@ -171,9 +171,9 @@ dependencies {
171171
exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
172172
}
173173
compile 'com.microsoft.azure:azure-client-authentication:1.7.5', { force = true }
174-
compile 'com.microsoft.azure:azure-toolkit-resource-lib:0.7.0', { force = true }
175-
compile 'com.microsoft.azure:azure-toolkit-springcloud-lib:0.7.0', { force = true }
176-
aspect "com.microsoft.azure:azure-toolkit-common-lib:0.7.0", {
174+
compile 'com.microsoft.azure:azure-toolkit-resource-lib:0.7.1', { force = true }
175+
compile 'com.microsoft.azure:azure-toolkit-springcloud-lib:0.7.1', { force = true }
176+
aspect "com.microsoft.azure:azure-toolkit-common-lib:0.7.1", {
177177
exclude group: "com.squareup.okhttp3", module: "okhttp"
178178
exclude group: "com.squareup.okhttp3", module: "okhttp-urlconnection"
179179
exclude group: "com.squareup.okhttp3", module: "logging-interceptor"

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/appservice/DraftServicePlan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public String type() {
9999

100100
@Override
101101
public String regionName() {
102-
throw new OperationNotSupportedException();
102+
return this.region == null ? null : this.region.getName();
103103
}
104104

105105
@Override

Utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<rx.version>1.3.8</rx.version>
7373
<slf4j-api.version>1.7.30</slf4j-api.version>
7474

75-
<azure.toolkit-lib.version>0.7.0</azure.toolkit-lib.version>
75+
<azure.toolkit-lib.version>0.7.1</azure.toolkit-lib.version>
7676
<azure.storage.version>8.6.5</azure.storage.version>
7777
<azure.security.keyvault.secrets.version>4.2.0</azure.security.keyvault.secrets.version>
7878
<azure.security.keyvault.keys.version>4.2.0</azure.security.keyvault.keys.version>

0 commit comments

Comments
 (0)