diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index d3ac8b616de74..56270fc5c27c7 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -169,7 +169,7 @@
com.azure
azure-identity
- 1.2.0-beta.3
+ 1.2.0
com.azure
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index f62077bfded3c..7afea5f3cbf93 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -68,7 +68,7 @@ com.azure:azure-data-schemaregistry-avro;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-data-tables;12.0.0-beta.2;12.0.0-beta.3
com.azure:azure-digitaltwins-core;1.0.1;1.1.0-beta.1
com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-identity;1.1.3;1.2.0-beta.3
+com.azure:azure-identity;1.1.3;1.2.0
com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-eventgrid;2.0.0-beta.3;2.0.0-beta.4
com.azure:azure-messaging-eventhubs;5.3.1;5.4.0-beta.1
@@ -177,7 +177,6 @@ com.microsoft:microsoft-opentelemetry-exporter-azuremonitor;1.0.0-beta.1;1.0.0-b
# unreleased_:;dependency-version
# note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
unreleased_com.azure:azure-core-experimental;1.0.0-beta.9
-unreleased_com.azure:azure-identity;1.2.0-beta.2
unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.7
unreleased_com.azure:azure-messaging-eventhubs;5.3.0
diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml
index 25b3e8e067cef..445e04eefdec4 100644
--- a/sdk/e2e/pom.xml
+++ b/sdk/e2e/pom.xml
@@ -33,7 +33,7 @@
com.azure
azure-identity
- 1.2.0-beta.3
+ 1.2.0
com.azure
diff --git a/sdk/identity/azure-identity-perf/pom.xml b/sdk/identity/azure-identity-perf/pom.xml
index 01eeec8a4c4d0..878c4f5cb5e33 100644
--- a/sdk/identity/azure-identity-perf/pom.xml
+++ b/sdk/identity/azure-identity-perf/pom.xml
@@ -27,7 +27,7 @@
com.azure
azure-identity
- 1.2.0-beta.3
+ 1.2.0
com.azure
diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
index 9c2930b1c93ce..8ca622e8f38d6 100644
--- a/sdk/identity/azure-identity/CHANGELOG.md
+++ b/sdk/identity/azure-identity/CHANGELOG.md
@@ -1,10 +1,14 @@
# Release History
-## 1.2.0-beta.3 (Unreleased)
+## 1.2.0 (2020-11-09)
### New Features
- Added Azure Service Fabric Managed Identity support to `ManagedIdentityCredential`
- Added Azure Arc Managed Identity support to `ManagedIdentityCredential`
+- Added support for Docker Containers in `DefaultAzureCredential`
+
+### Fixes and improvements
+- Prevent `VisualStudioCodeCredential` using invalid authentication data when no user is signed in to Visual Studio Code
### Dependency Updates
- Upgraded `azure-core` dependency to 1.10.0
diff --git a/sdk/identity/azure-identity/README.md b/sdk/identity/azure-identity/README.md
index 65edc037e5fc1..aaacf628e61dc 100644
--- a/sdk/identity/azure-identity/README.md
+++ b/sdk/identity/azure-identity/README.md
@@ -24,7 +24,7 @@ Maven dependency for Azure Secret Client library. Add it to your project's pom f
com.azure
azure-identity
- 1.1.3
+ 1.2.0
```
[//]: # ({x-version-update-end})
diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml
index 6338f5ecda7dc..d2651107b7522 100644
--- a/sdk/identity/azure-identity/pom.xml
+++ b/sdk/identity/azure-identity/pom.xml
@@ -6,7 +6,7 @@
com.azure
azure-identity
- 1.2.0-beta.3
+ 1.2.0
Microsoft Azure client library for Identity
This module contains client library for Microsoft Azure Identity.
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java
index f21c644a22a80..3aa5429b5848a 100644
--- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java
+++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java
@@ -38,12 +38,10 @@ public final class ManagedIdentityCredential implements TokenCredential {
.identityClientOptions(identityClientOptions)
.build();
Configuration configuration = Configuration.getGlobalConfiguration().clone();
-//<<<<<<< HEAD
-// if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) {
-// appServiceMSICredential = new AppServiceMsiCredential(clientId, identityClient);
-// virtualMachineMSICredential = null;
-//=======
- if (configuration.contains(Configuration.PROPERTY_IDENTITY_ENDPOINT)) {
+
+ if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) {
+ managedIdentityServiceCredential = new AppServiceMsiCredential(clientId, identityClient);
+ } else if (configuration.contains(Configuration.PROPERTY_IDENTITY_ENDPOINT)) {
if (configuration.contains(Configuration.PROPERTY_IDENTITY_HEADER)) {
if (configuration.contains(PROPERTY_IDENTITY_SERVER_THUMBPRINT)) {
managedIdentityServiceCredential = new ServiceFabricMsiCredential(clientId, identityClient);
@@ -55,8 +53,6 @@ public final class ManagedIdentityCredential implements TokenCredential {
} else {
managedIdentityServiceCredential = new VirtualMachineMsiCredential(clientId, identityClient);
}
- } else if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) {
- managedIdentityServiceCredential = new AppServiceMsiCredential(clientId, identityClient);
} else {
managedIdentityServiceCredential = new VirtualMachineMsiCredential(clientId, identityClient);
}