[DataFactory]Fixed Set-AzDataFactoryV2 -InputObject not correct with PublicNetworkAccess Parameter (#17968)

* [DataFactory]Updated ADF .Net SDK version to 5.4.0

* [DataFactory]Updated ADF .Net SDK version to 6.0.0

* [DataFactory]Fixed Set-AzDataFactoryV2 -InputObject not correct with PublicNetworkAccess Parameter

Author: Jingshu923

src/DataFactory/DataFactoryV2/Changelog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed Set-AzDataFactoryV2 -InputObject not correct with PublicNetworkAccess Parameter
 
 ## Version 1.16.6
 * Updated ADF .Net SDK version to 6.0.0

src/DataFactory/DataFactoryV2/DataFactories/SetAzureDataFactoryCommand.cs

@@ -501,7 +501,7 @@ public override void ExecuteCmdlet()
                 factoryIdentityType = this.IdentityType;
             }
 
-            if(this.UserAssignedIdentity != null && this.UserAssignedIdentity.Count > 0)
+            if (this.UserAssignedIdentity != null && this.UserAssignedIdentity.Count > 0)
             {
                 if (!factoryIdentityType.ToLower().Contains(FactoryIdentityType.UserAssigned.ToLower()))
                 {
@@ -511,7 +511,7 @@ public override void ExecuteCmdlet()
             FactoryIdentity factoryIdentity = new FactoryIdentity(factoryIdentityType, userAssignedIdentities: this.UserAssignedIdentity);
 
             EncryptionConfiguration encryption = null;
-            if(!string.IsNullOrWhiteSpace(this.EncryptionVaultBaseUrl) && !string.IsNullOrWhiteSpace(this.EncryptionKeyName))
+            if (!string.IsNullOrWhiteSpace(this.EncryptionVaultBaseUrl) && !string.IsNullOrWhiteSpace(this.EncryptionKeyName))
             {
                 CMKIdentityDefinition cmkIdentity = null;
                 if (!string.IsNullOrWhiteSpace(this.EncryptionUserAssignedIdentity))
@@ -552,14 +552,15 @@ private void ValidateParameters()
                 this.ResourceGroupName = InputObject.ResourceGroupName;
                 this.Name = InputObject.DataFactoryName;
                 this.Location = this.Location ?? InputObject.Location;
+                this.PublicNetworkAccess = this.PublicNetworkAccess ?? InputObject.PublicNetworkAccess;
                 this.Tag = this.Tag ?? new Hashtable((IDictionary)InputObject.Tags);
 
-                if(InputObject.Identity != null)
+                if (InputObject.Identity != null)
                 {
                     this.IdentityType = InputObject.Identity.Type;
                     this.UserAssignedIdentity = InputObject.Identity.UserAssignedIdentities;
                 }
-                if(InputObject.Encryption != null)
+                if (InputObject.Encryption != null)
                 {
                     this.EncryptionVaultBaseUrl = InputObject.Encryption.VaultBaseUrl;
                     this.EncryptionKeyName = InputObject.Encryption.KeyName;
@@ -590,7 +591,7 @@ private void ValidateParameters()
                         }
                     }
                 }
-                
+
                 this.GlobalParameterDefinition = InputObject.GlobalParameters;
             }