diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
index ea0948071a12..26811d693022 100644
--- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
+++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
@@ -4,11 +4,11 @@ Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk
-2020-08-06 02:01:09 UTC
+2020-07-30 05:05:28 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
-Commit: 9ea4dc2d936d8eaae61d507242771b1d6447a96e
+Commit: b8630cc7b5869fbb764eeca3a618b23141e612db
AutoRest information
Requested version: v2
Bootstrapper version: autorest@2.0.4413
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
index 50e876a11ae4..992ea8cf4dd7 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
@@ -6,7 +6,6 @@
- Added column delimiter for SAP Table/open hub
- Added azureCloudType for Aad Auth
- Added snapshot to Azure File Storage linked service
-- Added source/sink level staging support in dataflow
## Version 4.10.0
### Feature Additions
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs
index 5e73cd8cb403..7fde44a13732 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs
@@ -35,15 +35,12 @@ public DataFlowSink()
/// Linked service reference.
/// Schema linked service
/// reference.
- /// Staging info for execute data flow
- /// activity.
- public DataFlowSink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), DataFlowStagingInfo staging = default(DataFlowStagingInfo))
+ public DataFlowSink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference))
: base(name, description)
{
Dataset = dataset;
LinkedService = linkedService;
SchemaLinkedService = schemaLinkedService;
- Staging = staging;
CustomInit();
}
@@ -70,12 +67,6 @@ public DataFlowSink()
[JsonProperty(PropertyName = "schemaLinkedService")]
public LinkedServiceReference SchemaLinkedService { get; set; }
- ///
- /// Gets or sets staging info for execute data flow activity.
- ///
- [JsonProperty(PropertyName = "staging")]
- public DataFlowStagingInfo Staging { get; set; }
-
///
/// Validate the object.
///
@@ -97,10 +88,6 @@ public override void Validate()
{
SchemaLinkedService.Validate();
}
- if (Staging != null)
- {
- Staging.Validate();
- }
}
}
}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSource.cs
index cd976967cba1..838e69cc4a25 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSource.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSource.cs
@@ -35,15 +35,12 @@ public DataFlowSource()
/// Linked service reference.
/// Schema linked service
/// reference.
- /// Staging info for execute data flow
- /// activity.
- public DataFlowSource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), DataFlowStagingInfo staging = default(DataFlowStagingInfo))
+ public DataFlowSource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference))
: base(name, description)
{
Dataset = dataset;
LinkedService = linkedService;
SchemaLinkedService = schemaLinkedService;
- Staging = staging;
CustomInit();
}
@@ -70,12 +67,6 @@ public DataFlowSource()
[JsonProperty(PropertyName = "schemaLinkedService")]
public LinkedServiceReference SchemaLinkedService { get; set; }
- ///
- /// Gets or sets staging info for execute data flow activity.
- ///
- [JsonProperty(PropertyName = "staging")]
- public DataFlowStagingInfo Staging { get; set; }
-
///
/// Validate the object.
///
@@ -97,10 +88,6 @@ public override void Validate()
{
SchemaLinkedService.Validate();
}
- if (Staging != null)
- {
- Staging.Validate();
- }
}
}
}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
index 28cfe7cef4c7..39c9bf30f468 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
@@ -14,7 +14,6 @@
- Added column delimiter for SAP Table/open hub
- Added azureCloudType for Aad Auth
- Added snapshot to Azure File Storage linked service
-- Added source/sink level staging support in dataflow
]]>
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs
index 55f8f1321ab9..a37aa53bfd05 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs
@@ -92,51 +92,5 @@ public class DataFlowJsonSamples : JsonSampleCollection
}
}
";
-
- [JsonSample]
- public const string MappingDataFlowWithSourceSinkStaging = @"
- {
- ""name"": ""exampleDataFlow"",
- ""properties"": {
- ""description"": ""Sample demo data flow to convert currencies showing usage of union, derive and conditional split transformation."",
- ""type"": ""MappingDataFlow"",
- ""typeProperties"": {
- ""sources"": [
- {
- ""dataset"": {
- ""referenceName"": ""CurrencyDatasetUSD"",
- ""type"": ""DatasetReference""
- },
- ""name"": ""USDCurrency"",
- ""staging"": {
- ""linkedService"": {
- ""referenceName"": ""blob_store_sasToken01"",
- ""type"": ""LinkedServiceReference""
- },
- ""folderPath"":""testcontainer01""
- }
- }
- ],
- ""sinks"": [
- {
- ""dataset"": {
- ""referenceName"": ""USDOutput"",
- ""type"": ""DatasetReference""
- },
- ""name"": ""USDSink"",
- ""staging"": {
- ""linkedService"": {
- ""referenceName"": ""blob_store_sasToken02"",
- ""type"": ""LinkedServiceReference""
- },
- ""folderPath"":""testcontainer02""
- }
- }
- ],
- ""script"": ""some script""
- }
- }
- }
-";
}
}