diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
index 28443ac9b1f2..1fb700cf39cb 100644
--- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
+++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
@@ -5,11 +5,11 @@ Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/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
Autorest CSharp Version: 2.3.82
-2022-01-05 04:17:30 UTC
+2022-02-07 01:57:04 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: main
-Commit: 7b89a1a3fcb08b6f9f12ee67049b6b8d561ad684
+Commit: 6af1afc7c3fbdea232a80f1334894d459e1dc922
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 dcabea5b249c..63a56d4df4d7 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
@@ -1,5 +1,10 @@
# Changelog for the Azure Data Factory V2 .NET SDK
+## Version 5.2.0
+### Feature Additions
+- Added FailActivity in ADF
+- Fixed update PublicNetworkAccess not work in Factory Update API
+
## Version 5.1.0
### Feature Additions
- Added support UAMI M2
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs
index fc5f63bde9ce..6cd911726e6c 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs
@@ -10,6 +10,8 @@
namespace Microsoft.Azure.Management.DataFactory.Models
{
+ using Microsoft.Rest;
+ using Microsoft.Rest.Serialization;
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
@@ -18,6 +20,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models
///
/// Parameters for updating a factory resource.
///
+ [Rest.Serialization.JsonTransformation]
public partial class FactoryUpdateParameters
{
///
@@ -66,13 +69,13 @@ public FactoryUpdateParameters()
/// Gets or sets whether or not public network access is allowed for
/// the data factory. Possible values include: 'Enabled', 'Disabled'
///
- [JsonProperty(PropertyName = "publicNetworkAccess")]
+ [JsonProperty(PropertyName = "properties.publicNetworkAccess")]
public string PublicNetworkAccess { get; set; }
///
/// Validate the object.
///
- ///
+ ///
/// Thrown if validation fails
///
public virtual void Validate()
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs
new file mode 100644
index 000000000000..8f4c66ca5d0d
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs
@@ -0,0 +1,107 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Microsoft.Rest.Serialization;
+ using Newtonsoft.Json;
+ using System.Collections;
+ using System.Collections.Generic;
+ using System.Linq;
+
+ ///
+ /// This activity will fail within its own scope and output a custom error
+ /// message and error code. The error message and code can provided either
+ /// as a string literal or as an expression that can be evaluated to a
+ /// string at runtime. The activity scope can be the whole pipeline or a
+ /// control activity (e.g. foreach, switch, until), if the fail activity is
+ /// contained in it.
+ ///
+ [Newtonsoft.Json.JsonObject("Fail")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class FailActivity : ControlActivity
+ {
+ ///
+ /// Initializes a new instance of the FailActivity class.
+ ///
+ public FailActivity()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the FailActivity class.
+ ///
+ /// Activity name.
+ /// The error message that surfaced in the Fail
+ /// activity. It can be dynamic content that's evaluated to a non
+ /// empty/blank string at runtime. Type: string (or Expression with
+ /// resultType string).
+ /// The error code that categorizes the error
+ /// type of the Fail activity. It can be dynamic content that's
+ /// evaluated to a non empty/blank string at runtime. Type: string (or
+ /// Expression with resultType string).
+ /// Unmatched properties from the
+ /// message are deserialized this collection
+ /// Activity description.
+ /// Activity depends on condition.
+ /// Activity user properties.
+ public FailActivity(string name, object message, object errorCode, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList))
+ : base(name, additionalProperties, description, dependsOn, userProperties)
+ {
+ Message = message;
+ ErrorCode = errorCode;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the error message that surfaced in the Fail activity.
+ /// It can be dynamic content that's evaluated to a non empty/blank
+ /// string at runtime. Type: string (or Expression with resultType
+ /// string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.message")]
+ public object Message { get; set; }
+
+ ///
+ /// Gets or sets the error code that categorizes the error type of the
+ /// Fail activity. It can be dynamic content that's evaluated to a non
+ /// empty/blank string at runtime. Type: string (or Expression with
+ /// resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.errorCode")]
+ public object ErrorCode { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public override void Validate()
+ {
+ base.Validate();
+ if (Message == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "Message");
+ }
+ if (ErrorCode == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "ErrorCode");
+ }
+ }
+ }
+}
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 09a2fb1ae1bd..b295c8ca31aa 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
@@ -5,14 +5,13 @@
Microsoft.Azure.Management.DataFactory
Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms.
- 5.1.0
+ 5.2.0
Microsoft.Azure.Management.DataFactory
Microsoft Azure resource management;Data Factory;ADF;
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs
index 6ede3735f133..b8679468bfab 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs
@@ -6,8 +6,8 @@
[assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")]
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")]
-[assembly: AssemblyVersion("5.1.0.0")]
-[assembly: AssemblyFileVersion("5.1.0.0")]
+[assembly: AssemblyVersion("5.2.0.0")]
+[assembly: AssemblyFileVersion("5.2.0.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]