diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
index e885e62e9249..caf5b506a3d2 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-10-16 09:04:28 UTC
+2020-10-28 02:50:39 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
-Commit: ce71a0bd91903fe312dc5ddb9b3e520755d6dd77
+Commit: e86a6eed316503ed17c2f7dfab94b2fa0f0c4129
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 ec1d87c1af0f..e640883fba74 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
@@ -6,6 +6,7 @@
- Added logSettings property into CopyActivity
- Added connectionProperties property into Concur linkedService
- Added authenticationType and sessionToken properties into AmazonS3 linkedService
+- Added support for more frequency types for TumblingWindowTrigger
## Version 4.12.0
### Feature Additions
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowFrequency.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowFrequency.cs
index cb9b05f7a2cc..c604611f87e0 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowFrequency.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowFrequency.cs
@@ -18,5 +18,6 @@ public static class TumblingWindowFrequency
{
public const string Minute = "Minute";
public const string Hour = "Hour";
+ public const string Month = "Month";
}
}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowTrigger.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowTrigger.cs
index 5a56eb8d06cd..ff3c7f15b191 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowTrigger.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowTrigger.cs
@@ -40,7 +40,7 @@ public TumblingWindowTrigger()
/// Pipeline for which runs are created when an
/// event is fired for trigger window that is ready.
/// The frequency of the time windows. Possible
- /// values include: 'Minute', 'Hour'
+ /// values include: 'Minute', 'Hour', 'Month'
/// The interval of the time windows. The
/// minimum interval allowed is 15 Minutes.
/// The start time for the time period for the
@@ -98,7 +98,7 @@ public TumblingWindowTrigger()
///
/// Gets or sets the frequency of the time windows. Possible values
- /// include: 'Minute', 'Hour'
+ /// include: 'Minute', 'Hour', 'Month'
///
[JsonProperty(PropertyName = "typeProperties.frequency")]
public string Frequency { get; set; }
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 a330e93da586..d61aa980da1b 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,6 +14,7 @@
- Added logSettings property into CopyActivity
- Added connectionProperties property into Concur linkedService
- Added authenticationType and sessionToken properties into AmazonS3 linkedService
+- Added support for more frequency types for TumblingWindowTrigger
]]>
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/TriggerJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/TriggerJsonSamples.cs
index 371f47775829..153af7ad04cb 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/TriggerJsonSamples.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/TriggerJsonSamples.cs
@@ -178,6 +178,43 @@ public class TriggerJsonSamples : JsonSampleCollection
}
}
}
+";
+
+ public const string TumblingWindowTriggerSample_Month = @"
+{
+ name: ""myDemoTWTrigger"",
+ properties: {
+ type: ""TumblingWindowTrigger"",
+ typeProperties: {
+ frequency: ""Month"",
+ interval: 24,
+ startTime: ""2017-04-14T13:00:00Z"",
+ endTime: ""2018-04-14T13:00:00Z"",
+ delay: ""00:00:01"",
+ retryPolicy: {
+ count: 3,
+ intervalInSeconds: 30
+ },
+ maxConcurrency: 10
+ },
+ pipeline: {
+ pipelineReference: {
+ type: ""PipelineReference"",
+ referenceName: ""myPipeline""
+ },
+ parameters: {
+ windowStart: {
+ type: ""Expression"",
+ value: ""@{trigger().outputs.windowStartTime}""
+ },
+ windowEnd: {
+ type: ""Expression"",
+ value: ""@{trigger().outputs.windowEndTime}""
+ },
+ }
+ }
+ }
+}
";
[JsonSample]