Updated 'NetworkIpConfiguration\Interfaces' configuration data (#174)

* Updated 'NetworkIpConfiguration\Interfaces' configuration data * Update azure-pipelines.yml to install GitVersion.Tool version 5.* * Update azure-pipelines.yml to install GitVersion.Tool version 5.*
dsccommunity · Oct 17, 2024 · 0c821bf · 0c821bf
1 parent 01a3c96
commit 0c821bf
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed from 'CommonTasks' to 'DscConfig.Demo' for faster build time.
 - Added support for PowerShell 7.
 - Added support for Azure Guest Configuration.
+- Updated 'NetworkIpConfiguration\Interfaces' configuration data.
 
 ### Fixed
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -31,7 +31,7 @@ stages:
             displayName: 'Display Environment Variables'
 
           - pwsh: |
-              dotnet tool install --global GitVersion.Tool
+              dotnet tool install --global GitVersion.Tool --version 5.*
               $gitVersionObject = dotnet-gitversion | ConvertFrom-Json
               $gitVersionObject.PSObject.Properties.ForEach{
                   Write-Host -Object "Setting Task Variable '$($_.Name)' with value '$($_.Value)'."
@@ -108,7 +108,7 @@ stages:
             displayName: 'Display Environment Variables'
 
           - pwsh: |
-              dotnet tool install --global GitVersion.Tool
+              dotnet tool install --global GitVersion.Tool --version 5.*
               $gitVersionObject = dotnet-gitversion | ConvertFrom-Json
               $gitVersionObject.PSObject.Properties.ForEach{
                   Write-Host -Object "Setting Task Variable '$($_.Name)' with value '$($_.Value)'."

diff --git a/source/AllNodes/Dev/DSCFile01.yml b/source/AllNodes/Dev/DSCFile01.yml
@@ -13,11 +13,6 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 192.168.111.100
-      Prefix: 24
-      Gateway: 192.168.111.50
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/AllNodes/Dev/DSCWeb01.yml b/source/AllNodes/Dev/DSCWeb01.yml
@@ -13,11 +13,6 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 192.168.111.101
-      Prefix: 24
-      Gateway: 192.168.111.50
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/AllNodes/Dev/ReferenceConfigurationDev.yml b/source/AllNodes/Dev/ReferenceConfigurationDev.yml
@@ -13,11 +13,7 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 127.0.0.1
-      Prefix: 24
       Gateway: 127.0.0.1
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/AllNodes/Prod/DSCFile03.yml b/source/AllNodes/Prod/DSCFile03.yml
@@ -13,11 +13,6 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 192.168.111.120
-      Prefix: 24
-      Gateway: 192.168.111.50
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/AllNodes/Prod/DSCWeb03.yml b/source/AllNodes/Prod/DSCWeb03.yml
@@ -13,11 +13,6 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 192.168.111.121
-      Prefix: 24
-      Gateway: 192.168.111.50
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/AllNodes/Prod/ReferenceConfigurationProd.yml b/source/AllNodes/Prod/ReferenceConfigurationProd.yml
@@ -13,11 +13,7 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 127.0.0.3
-      Prefix: 24
       Gateway: 127.0.0.3
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/AllNodes/Test/DSCFile02.yml b/source/AllNodes/Test/DSCFile02.yml
@@ -13,11 +13,6 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 192.168.111.110
-      Prefix: 24
-      Gateway: 192.168.111.50
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/AllNodes/Test/DSCWeb02.yml b/source/AllNodes/Test/DSCWeb02.yml
@@ -13,11 +13,6 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 192.168.111.111
-      Prefix: 24
-      Gateway: 192.168.111.50
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/AllNodes/Test/ReferenceConfigurationTest.yml b/source/AllNodes/Test/ReferenceConfigurationTest.yml
@@ -13,11 +13,7 @@ NetworkIpConfiguration:
   Interfaces:
     - InterfaceAlias: DscWorkshop 0
       IpAddress: 127.0.0.2
-      Prefix: 24
       Gateway: 127.0.0.2
-      DnsServer:
-        - 192.168.111.10
-      DisableNetbios: true
 
 PSDscAllowPlainTextPassword: True
 PSDscAllowDomainUser: True

diff --git a/source/Baselines/Server.yml b/source/Baselines/Server.yml
@@ -1,11 +1,11 @@
 Configurations:
   - ComputerSettings
-  #- NetworkIpConfiguration
+  - NetworkIpConfiguration
   - WindowsEventLogs
 
 NetworkIpConfiguration:
   Interfaces:
-    - InterfaceAlias: DscWorkshop 0*
+    - InterfaceAlias: DscWorkshop 0
       Prefix: 24
       Gateway: 192.168.111.50
       DnsServer:

diff --git a/source/Datum.yml b/source/Datum.yml
@@ -53,14 +53,14 @@ lookup_options:
       tuple_keys:
         - Key
 
-  #NetworkIpConfiguration:
-  #  merge_hash: deep
-  #NetworkIpConfiguration\Interfaces:
-  #  #merge_basetype_array: Deep
-  #  merge_hash_array: DeepTuple
-  #  merge_options:
-  #    tuple_keys:
-  #      - InterfaceAlias
+  NetworkIpConfiguration:
+    merge_hash: deep
+  NetworkIpConfiguration\Interfaces:
+    #merge_basetype_array: Deep
+    merge_hash_array: DeepTuple
+    merge_options:
+      tuple_keys:
+        - InterfaceAlias
 
   ComputerSettings:
     merge_hash: deep