Fix CI failure and conflict

services/datafactory/mgmt/2018-06-01/datafactory/models.go

@@ -1710,25 +1710,6 @@ func PossibleTypeBasicCustomSetupBaseValues() []TypeBasicCustomSetupBase {
 	return []TypeBasicCustomSetupBase{TypeCmdkeySetup, TypeComponentSetup, TypeCustomSetupBase, TypeEnvironmentVariableSetup}
 }
 
-// TypeBasicCustomSetupBase enumerates the values for type basic custom setup base.
-type TypeBasicCustomSetupBase string
-
-const (
-	// TypeCmdkeySetup ...
-	TypeCmdkeySetup TypeBasicCustomSetupBase = "CmdkeySetup"
-	// TypeComponentSetup ...
-	TypeComponentSetup TypeBasicCustomSetupBase = "ComponentSetup"
-	// TypeCustomSetupBase ...
-	TypeCustomSetupBase TypeBasicCustomSetupBase = "CustomSetupBase"
-	// TypeEnvironmentVariableSetup ...
-	TypeEnvironmentVariableSetup TypeBasicCustomSetupBase = "EnvironmentVariableSetup"
-)
-
-// PossibleTypeBasicCustomSetupBaseValues returns an array of possible values for the TypeBasicCustomSetupBase const type.
-func PossibleTypeBasicCustomSetupBaseValues() []TypeBasicCustomSetupBase {
-	return []TypeBasicCustomSetupBase{TypeCmdkeySetup, TypeComponentSetup, TypeCustomSetupBase, TypeEnvironmentVariableSetup}
-}
-
 // TypeBasicDataset enumerates the values for type basic dataset.
 type TypeBasicDataset string
 
@@ -134895,7 +134876,7 @@ func (o3lstp *Office365LinkedServiceTypeProperties) UnmarshalJSON(body []byte) e
 	return nil
 }
 
-// Office365Source a copy activity source for an Office365 service.
+// Office365Source a copy activity source for an Office 365 service.
 type Office365Source struct {
 	// AllowedGroups - The groups containing all the users. Type: array of strings (or Expression with resultType array of strings).
 	AllowedGroups interface{} `json:"allowedGroups,omitempty"`
@@ -134907,6 +134888,8 @@ type Office365Source struct {
 	StartTime interface{} `json:"startTime,omitempty"`
 	// EndTime - End time of the requested range for this dataset. Type: string (or Expression with resultType string).
 	EndTime interface{} `json:"endTime,omitempty"`
+	// OutputColumns - The columns to be read out from the Office 365 table. Type: array of objects (or Expression with resultType array of objects). Example: [ { "name": "Id" }, { "name": "CreatedDateTime" } ]
+	OutputColumns interface{} `json:"outputColumns,omitempty"`
 	// AdditionalProperties - Unmatched properties from the message are deserialized this collection
 	AdditionalProperties map[string]interface{} `json:""`
 	// SourceRetryCount - Source retry count. Type: integer (or Expression with resultType integer).
@@ -134938,6 +134921,9 @@ func (o3s Office365Source) MarshalJSON() ([]byte, error) {
 	if o3s.EndTime != nil {
 		objectMap["endTime"] = o3s.EndTime
 	}
+	if o3s.OutputColumns != nil {
+		objectMap["outputColumns"] = o3s.OutputColumns
+	}
 	if o3s.SourceRetryCount != nil {
 		objectMap["sourceRetryCount"] = o3s.SourceRetryCount
 	}
@@ -135445,6 +135431,15 @@ func (o3s *Office365Source) UnmarshalJSON(body []byte) error {
 				}
 				o3s.EndTime = endTime
 			}
+		case "outputColumns":
+			if v != nil {
+				var outputColumns interface{}
+				err = json.Unmarshal(*v, &outputColumns)
+				if err != nil {
+					return err
+				}
+				o3s.OutputColumns = outputColumns
+			}
 		default:
 			if v != nil {
 				var additionalProperties interface{}