2.11.3 (master) -> 2.12.0 (develop)

.gitignore

@@ -1,5 +1,6 @@
 /Carbon/bin/coreclr
 /Carbon/bin/fullclr
+/Carbon/*.md
 **/obj/**
 **/.vs/**
 Source/**/bin/**
@@ -27,4 +28,5 @@ Carbon/LICENSE.txt
 Carbon/NOTICE.txt
 *.orig
 /.vscode/**
-/.dotnet*
+/.dotnet*
+/global.json

CHANGELOG.md

@@ -1,12 +1,29 @@
 # 2.12.0
 
-* Fixed: Importing Carbon fails under PowerShell 4.
 * The `Install-CMsi`, `Get-CMsi`, and `Get-CProgramInstallInfo` functions have moved to a new `Carbon.Windows.Installer`
 module, now available on the PowerShell Gallery. Please switch to the new module and update usages. If you use these
 functions from Carbon, a warning message will be written. These function will be removed in the next major version of
 Carbon.
 
 
+# 2.11.3
+
+* Fixed: Carbon doesn't load Microsoft.Web.Administration assembly on PowerShell 7+.
+
+
+# 2.11.2
+
+* Fixed: `Carbon.Firewall.Rule` type missing the `LocalIP` and `RemoteIP` properties (which are aliases for the
+  `LocalIpAddress` and `RemoteIPAddress` properties, respectively).
+
+
+# 2.11.1
+
+* Fixed: Carbon fails to import multiple times in the same session.
+* Fixed: Carbon fails when used as a nested module and Carbon is loaded globally or by nested in another module.
+* Fixed: Importing Carbon fails under PowerShell 4.
+
+
 # 2.11.0
 
 * Fixed: Resolve-CPathCase fails on PowerShell Core.

Carbon.nuspec

@@ -43,9 +43,14 @@
 
 All functions are idempotent: when run multiple times with the same arguments, your system will be in the same state without failing or producing errors.</description>
     <language>en-us</language>
-    <releaseNotes>$ReleaseNotes$</releaseNotes>
+    <releaseNotes>https://github.com/webmd-health-services/Carbon/blob/master/CHANGELOG.md</releaseNotes>
     <copyright>Aaron Jensen and WebMD Health Services</copyright>
-    <tags>$Tags$</tags>
+    <tags>.net, acl, active-directory, certificates, com, compression, computer, credential, cryptography, directory,
+    dsc, dsc-resources, encryption, environment, file-system, firewall, groups, hosts-file, http, identity, iis, ini,
+    installers, internet-explorer, ip, junctions, msi, msmq, netsh, networking, ntfs, operating-system, os, path,
+    performance-counters, powershell, principal, privileges, programs, registry, rsa, scheduled-tasks, security,
+    service, shares, sid, smb, ssl, text, trusted-host, users, wcf, windows, windows-features, xml, zip, PSModule,
+    DscResources, setup, automation, admin</tags>
   </metadata>
   <files>
     <file src=".\Carbon\**\*" target="Carbon" exclude="**\*.pdb" />

Carbon/Carbon.psd1

@@ -89,13 +89,9 @@ All functions are idempotent: when run multiple times with the same arguments, y
     ScriptsToProcess = @()
 
     # Type files (.ps1xml) to be loaded when importing this module
-    TypesToProcess = @(
-                        'Carbon.types.ps1xml',
-                        'Types\Scheduled.Service.RegisteredTask.types.ps1xml',
-                        'Types\System.IO.DirectoryInfo.types.ps1xml'
-                        'Types\System.IO.FileInfo.types.ps1xml'
-                        'Types\System.ServiceProcess.ServiceController.types.ps1xml'
-                      )
+    # DO NOT USE! If you import a module twice that has the same type data, you get errors. :( Use Update-TypeData to
+    # dynamically add extended type data.
+    # TypesToProcess = @( )
 
     # Format files (.ps1xml) to be loaded when importing this module
     FormatsToProcess = @(

Carbon/Carbon.psm1

@@ -48,9 +48,43 @@ if( $IsPSCore )
     $carbonAssemblyDir = Join-Path -Path $CarbonBinDir -ChildPath 'coreclr' -Resolve
 }
 
+function Add-CAssembly
+{
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)]
+        [String] $Path,
+
+        [switch] $PassThru
+    )
+
+    $numErrors = $Global:Error.Count
+    try
+    {
+        Add-Type -Path $Path
+        if( $PassThru )
+        {
+            return $true
+        }
+    }
+    catch
+    {
+        $numErrorsToRemove = $Global:Error.Count - $numErrors
+        for( $idx = 0; $idx -lt $numErrorsToRemove; ++$idx )
+        {
+            $Global:Error.RemoveAt(0)
+        }
+        if( $PassThru )
+        {
+            return $false
+        }
+    }
+}
+
 Write-Timing ('Loading Carbon assemblies from "{0}".' -f $carbonAssemblyDir)
-Get-ChildItem -Path (Join-Path -Path $carbonAssemblyDir -ChildPath '*') -Filter 'Carbon*.dll' -Exclude 'Carbon.Iis.dll' |
-    ForEach-Object { Add-Type -Path $_.FullName }
+$carbonAssembliesPath = Join-Path -Path $carbonAssemblyDir -ChildPath '*'
+Get-ChildItem -Path $carbonAssembliesPath -Filter 'Carbon*.dll' -Exclude 'Carbon.Iis.dll' |
+    ForEach-Object { Add-CAssembly -Path $_.FullName }
 
 # Active Directory
 
@@ -67,14 +101,12 @@ if( (Test-Path -Path 'env:SystemRoot') )
     if( -not (Test-Path -Path 'env:CARBON_SKIP_IIS_IMPORT') -and `
         (Test-Path -Path $microsoftWebAdministrationPath -PathType Leaf) )
     {
-        $exportIisFunctions = $true
-        if( -not $IsPSCore )
-        {
-            Write-Timing ('Adding Microsoft.Web.Administration assembly.')
-            Add-Type -Path $microsoftWebAdministrationPath
-            Write-Timing ('Adding Carbon.Iis assembly.')
-            Add-Type -Path (Join-Path -Path $carbonAssemblyDir -ChildPath 'Carbon.Iis.dll' -Resolve)
-        }
+        Write-Timing ('Adding Microsoft.Web.Administration assembly.')
+        $webAdministrationLoaded = Add-CAssembly -Path $microsoftWebAdministrationPath -PassThru
+        Write-Timing ('Adding Carbon.Iis assembly.')
+        $carbonIisAssemblyPath = Join-Path -Path $carbonAssemblyDir -ChildPath 'Carbon.Iis.dll' -Resolve
+        $carbonIisLoaded = Add-CAssembly -Path $carbonIisAssemblyPath -PassThru
+        $exportIisFunctions = ($webAdministrationLoaded -and $carbonIisLoaded)
     }
 }
 
@@ -94,6 +126,84 @@ $TrustedHostsPath = 'WSMan:\localhost\Client\TrustedHosts'
 Write-Timing ('Adding System.DirectoryServices.AccountManagement assembly.')
 Add-Type -AssemblyName 'System.DirectoryServices.AccountManagement'
 
+function Add-CTypeData
+{
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory, ParameterSetName='ByType')]
+        [Type] $Type,
+
+        [Parameter(Mandatory, ParameterSetName='ByTypeName')]
+        [String] $TypeName,
+
+        [Parameter(Mandatory)]
+        [ValidateSet('AliasProperty', 'NoteProperty', 'ScriptProperty', 'ScriptMethod')]
+        [Management.Automation.PSMemberTypes] $MemberType,
+
+        [Parameter(Mandatory)]
+        [String] $MemberName,
+
+        [Parameter(Mandatory)]
+        [Object] $Value
+    )
+
+    Set-StrictMode -Version 'Latest'
+
+    $memberTypeMsg = '{0,-14}' -f $MemberType
+
+    if( -not $TypeName )
+    {
+        $TypeName = $Type.FullName
+    }
+
+    if( $Type )
+    {
+        if( $MemberType -like '*Property' )
+        {
+            if( ($Type.GetProperties() | Where-Object Name -EQ $MemberName) )
+            {
+                Write-Debug ("Type        $($memberTypeMsg)  [$($TypeName)]  $($MemberName)")
+                return
+            }
+        }
+        elseif( $MemberType -like '*Method')
+        {
+            if( ($Type.GetMethods() | Where-Object Name -EQ $MemberName) )
+            {
+                Write-Debug ("Type        $($memberTypeMsg)  [$($TypeName)]  $($MemberName)")
+                return
+            }
+        }
+    }
+
+    $typeData = Get-TypeData -TypeName $TypeName
+    if( $typeData -and $typeData.Members.ContainsKey($MemberName) )
+    {
+        Write-Debug ("TypeData    $($memberTypeMsg)  [$($TypeName)]  $($MemberName)")
+        return
+    }
+
+    Write-Debug ("TypeData  + $($memberTypeMsg)  [$($TypeName)]  $($MemberName)")
+    Update-TypeData -TypeName $TypeName -MemberType $MemberType -MemberName $MemberName -Value $Value
+}
+
+# Move to Carbon.Core?
+Add-CTypeData -Type Diagnostics.Process `
+              -MemberName 'ParentProcessID' `
+              -MemberType ScriptProperty `
+              -Value {
+                    $filter = "ProcessID='{0}'" -f $this.Id
+                    if( (Get-Command -Name 'Get-CimInstance' -ErrorAction Ignore) )
+                    {
+                        $process = Get-CimInstance -ClassName 'Win32_Process' -Filter $filter
+                    }
+                    else
+                    {
+                        $process = Get-WmiObject -Class 'Win32_Process' -Filter $filter
+                    }
+                    return $process.ParentProcessID
+                }
+
 Write-Timing ('Dot-sourcing functions.')
 $functionRoot = Join-Path -Path $PSScriptRoot -ChildPath 'Functions' -Resolve