diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
index c377e02402..1ae3d8d178 100644
--- a/schemas/2018-06-01/Microsoft.DataFactory.json
+++ b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -1804,6 +1804,17 @@
           "properties": {},
           "description": "The Azure Batch URI. Type: string (or Expression with resultType string)."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -2017,6 +2028,17 @@
           "properties": {},
           "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -2279,6 +2301,17 @@
           "properties": {},
           "description": "The connection string. It is mutually exclusive with sasUri, serviceEndpoint property. Type: string, SecureString or AzureKeyVaultSecretReference."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "encryptedCredential": {
           "type": "string",
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
@@ -2714,6 +2747,17 @@
           "properties": {},
           "description": "Required to specify MSI, if using Workspace resource id for databricks REST API. Type: string (or Expression with resultType string)."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "domain": {
           "type": "object",
           "properties": {},
@@ -2920,6 +2964,17 @@
     "AzureDataExplorerLinkedServiceTypeProperties": {
       "type": "object",
       "properties": {
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "database": {
           "type": "object",
           "properties": {},
@@ -3247,6 +3302,17 @@
           "properties": {},
           "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "dataLakeStoreUri": {
           "type": "object",
           "properties": {},
@@ -3754,6 +3820,22 @@
     "AzureFunctionLinkedServiceTypeProperties": {
       "type": "object",
       "properties": {
+        "authentication": {
+          "type": "object",
+          "properties": {},
+          "description": "Type of authentication (Required to specify MSI) used to connect to AzureFunction. Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -3774,6 +3856,11 @@
             }
           ],
           "description": "The base definition of a secret type."
+        },
+        "resourceId": {
+          "type": "object",
+          "properties": {},
+          "description": "Allowed token audiences for azure function."
         }
       },
       "required": [
@@ -3815,6 +3902,17 @@
           "type": "object",
           "properties": {},
           "description": "The base URL of the Azure Key Vault. e.g. https://myakv.vault.azure.net Type: string (or Expression with resultType string)."
+        },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
         }
       },
       "required": [
@@ -4153,6 +4251,11 @@
           ],
           "description": "The base definition of a secret type."
         },
+        "authentication": {
+          "type": "object",
+          "properties": {},
+          "description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -4835,6 +4938,17 @@
           "properties": {},
           "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -4918,6 +5032,17 @@
           "properties": {},
           "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -5059,6 +5184,17 @@
           "properties": {},
           "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -5167,6 +5303,11 @@
           "properties": {},
           "description": "SQL writer table type. Type: string (or Expression with resultType string)."
         },
+        "sqlWriterUseTableLock": {
+          "type": "object",
+          "properties": {},
+          "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)."
+        },
         "storedProcedureParameters": {
           "oneOf": [
             {
@@ -5197,6 +5338,22 @@
           "enum": [
             "AzureSqlSink"
           ]
+        },
+        "upsertSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SqlUpsertSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Sql upsert option settings"
+        },
+        "writeBehavior": {
+          "type": "object",
+          "properties": {},
+          "description": "Write behavior when copying data into Azure SQL. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)"
         }
       },
       "required": [
@@ -7683,6 +7840,50 @@
       ],
       "description": "Couchbase server dataset."
     },
+    "CredentialReference": {
+      "type": "object",
+      "properties": {
+        "additionalProperties": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "object",
+                "properties": {}
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Unmatched properties from the message are deserialized this collection"
+        },
+        "referenceName": {
+          "type": "string",
+          "description": "Reference credential name."
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "CredentialReference"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        }
+      },
+      "required": [
+        "referenceName",
+        "type"
+      ],
+      "description": "Credential reference type."
+    },
     "CustomActivity": {
       "type": "object",
       "properties": {
@@ -10766,8 +10967,7 @@
               "type": "string",
               "enum": [
                 "IntegrationRuntimeReference",
-                "LinkedServiceReference",
-                "CredentialReference"
+                "LinkedServiceReference"
               ]
             },
             {
@@ -14276,6 +14476,17 @@
           "properties": {},
           "description": "Specifies the core configuration parameters (as in core-site.xml) for the HDInsight cluster to be created."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "dataNodeSize": {
           "type": "object",
           "properties": {},
@@ -16213,6 +16424,17 @@
           ],
           "description": "Catalog information for managed dedicated integration runtime."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "customSetupScriptProperties": {
           "oneOf": [
             {
@@ -16279,17 +16501,6 @@
           ],
           "description": "License type for bringing your own license scenario."
         },
-        "managedCredential": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/EntityReference"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The entity reference."
-        },
         "packageStores": {
           "oneOf": [
             {
@@ -22123,6 +22334,17 @@
           "properties": {},
           "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)."
         },
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "enableServerCertificateValidation": {
           "type": "object",
           "properties": {},
@@ -25347,6 +25569,11 @@
           "properties": {},
           "description": "SQL pre-copy script. Type: string (or Expression with resultType string)."
         },
+        "sqlWriterUseTableLock": {
+          "type": "object",
+          "properties": {},
+          "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)."
+        },
         "tableOption": {
           "type": "object",
           "properties": {},
@@ -25357,6 +25584,22 @@
           "enum": [
             "SqlDWSink"
           ]
+        },
+        "upsertSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SqlDWUpsertSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Sql DW upsert option settings"
+        },
+        "writeBehavior": {
+          "type": "object",
+          "properties": {},
+          "description": "Write behavior when copying data into azure SQL DW. Type: SqlDWWriteBehaviorEnum (or Expression with resultType SqlDWWriteBehaviorEnum)"
         }
       },
       "required": [
@@ -25410,6 +25653,22 @@
       ],
       "description": "A copy activity SQL Data Warehouse source."
     },
+    "SqlDWUpsertSettings": {
+      "type": "object",
+      "properties": {
+        "interimSchemaName": {
+          "type": "object",
+          "properties": {},
+          "description": "Schema name for interim table. Type: string (or Expression with resultType string)."
+        },
+        "keys": {
+          "type": "object",
+          "properties": {},
+          "description": "Key column names for unique row identification. Type: array of strings (or Expression with resultType array of strings)."
+        }
+      },
+      "description": "Sql DW upsert option settings"
+    },
     "SqlMISink": {
       "type": "object",
       "properties": {
@@ -25428,6 +25687,11 @@
           "properties": {},
           "description": "SQL writer table type. Type: string (or Expression with resultType string)."
         },
+        "sqlWriterUseTableLock": {
+          "type": "object",
+          "properties": {},
+          "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)."
+        },
         "storedProcedureParameters": {
           "oneOf": [
             {
@@ -25458,6 +25722,22 @@
           "enum": [
             "SqlMISink"
           ]
+        },
+        "upsertSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SqlUpsertSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Sql upsert option settings"
+        },
+        "writeBehavior": {
+          "type": "object",
+          "properties": {},
+          "description": "White behavior when copying data into azure SQL MI. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)"
         }
       },
       "required": [
@@ -25638,6 +25918,11 @@
           "properties": {},
           "description": "SQL writer table type. Type: string (or Expression with resultType string)."
         },
+        "sqlWriterUseTableLock": {
+          "type": "object",
+          "properties": {},
+          "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)."
+        },
         "storedProcedureParameters": {
           "oneOf": [
             {
@@ -25668,6 +25953,22 @@
           "enum": [
             "SqlServerSink"
           ]
+        },
+        "upsertSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SqlUpsertSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Sql upsert option settings"
+        },
+        "writeBehavior": {
+          "type": "object",
+          "properties": {},
+          "description": "Write behavior when copying data into sql server. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)"
         }
       },
       "required": [
@@ -25857,6 +26158,11 @@
           "properties": {},
           "description": "SQL writer table type. Type: string (or Expression with resultType string)."
         },
+        "sqlWriterUseTableLock": {
+          "type": "object",
+          "properties": {},
+          "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)."
+        },
         "storedProcedureParameters": {
           "oneOf": [
             {
@@ -25887,6 +26193,22 @@
           "enum": [
             "SqlSink"
           ]
+        },
+        "upsertSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SqlUpsertSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Sql upsert option settings"
+        },
+        "writeBehavior": {
+          "type": "object",
+          "properties": {},
+          "description": "Write behavior when copying data into sql. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)"
         }
       },
       "required": [
@@ -25955,6 +26277,27 @@
       ],
       "description": "A copy activity SQL source."
     },
+    "SqlUpsertSettings": {
+      "type": "object",
+      "properties": {
+        "interimSchemaName": {
+          "type": "object",
+          "properties": {},
+          "description": "Schema name for interim table. Type: string (or Expression with resultType string)."
+        },
+        "keys": {
+          "type": "object",
+          "properties": {},
+          "description": "Key column names for unique row identification. Type: array of strings (or Expression with resultType array of strings)."
+        },
+        "useTempDB": {
+          "type": "object",
+          "properties": {},
+          "description": "Specifies whether to use temp db for upsert interim table. Type: boolean (or Expression with resultType boolean)."
+        }
+      },
+      "description": "Sql upsert option settings"
+    },
     "SquareLinkedService": {
       "type": "object",
       "properties": {
@@ -28039,6 +28382,17 @@
     "WebActivityAuthentication": {
       "type": "object",
       "properties": {
+        "credential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CredentialReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Credential reference type."
+        },
         "password": {
           "oneOf": [
             {
@@ -28081,9 +28435,6 @@
           "description": "TenantId for which Azure Auth token will be requested when using ServicePrincipal Authentication. Type: string (or Expression with resultType string)."
         }
       },
-      "required": [
-        "type"
-      ],
       "description": "Web activity authentication properties."
     },
     "WebActivityTypeProperties": {