Merge pull request #6 from webmd-health-services/feature/reduce-nesting

Reducing directory depth of internal, private nested module dependencies
webmd-health-services · Dec 3, 2024 · 62b6dc0 · 62b6dc0
2 parents dcb2a9c + bc25d60
commit 62b6dc0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,14 @@
 
 # Carbon.FileSystem Changelog
 
+## 1.1.1
+
+Reducing directory nesting of internal, private, nested modules.
+
 ## 1.1.0
 
+> Released 10 Jun 2024
+
 ### Upgrade Instructions
 
 Added `Get-CNtfsPermission`, `Grant-CNtfsPermission`, `Revoke-CNtfsPermission`, and `Test-CNtfsPermission`, migrated
@@ -15,6 +21,7 @@ from Carbon to Carbon.FileSystem, do the following:
 * Replace usages of the `Test-CNtfsPermission` function's `-Exact` switch to `-Strict`.
 * Using the table below, replace usages of `Grant-CNtfsPermission` and `Test-CNtfsPermission` arguments in the left
   column with the new arguments from the right column.
+
   | Old Argument                                         | New Argument(s)
   |------------------------------------------------------|---------------------------------------------------------------------
   | `-ApplyTo Container`                                 | `-ApplyTo FolderOnly`

diff --git a/Carbon.FileSystem/Carbon.FileSystem.psd1 b/Carbon.FileSystem/Carbon.FileSystem.psd1
@@ -18,7 +18,7 @@
     RootModule = 'Carbon.FileSystem.psm1'
 
     # Version number of this module.
-    ModuleVersion = '1.1.0'
+    ModuleVersion = '1.1.1'
 
     # ID used to uniquely identify this module
     GUID = '84e0a546-5791-4c7e-a05b-29d592029398'

diff --git a/Carbon.FileSystem/prism.json b/Carbon.FileSystem/prism.json
@@ -2,9 +2,7 @@
   "PSModules": [
     {
       "Name": "Carbon.Security",
-      "Version": "1.*-*"
+      "Version": "1.*"
     }
-  ],
-
-  "PSModulesDirectoryName": "Modules"
+  ]
 }
diff --git a/Carbon.FileSystem/prism.lock.json b/Carbon.FileSystem/prism.lock.json
@@ -2,7 +2,7 @@
   "PSModules": [
     {
       "name": "Carbon.Security",
-      "version": "1.0.0-rc6",
+      "version": "1.0.3",
       "repositorySourceLocation": "https://www.powershellgallery.com/api/v2"
     }
   ]

diff --git a/Tests/Grant-CNtfsPermission.Tests.ps1 b/Tests/Grant-CNtfsPermission.Tests.ps1
@@ -125,7 +125,7 @@ BeforeAll {
                                         @optionalParams
         $result = $result | Select-Object -Last 1
         $result | Should -Not -BeNullOrEmpty
-        $result.IdentityReference | Should -Be (Resolve-CIdentityName $Identity)
+        $result.IdentityReference | Should -Be (Resolve-CPrincipalName $Identity)
         $result | Should -BeOfType $expectedRuleType
         if( -not $ExpectedPermission )
         {

diff --git a/Tests/Initialize-Test.ps1 b/Tests/Initialize-Test.ps1
@@ -56,7 +56,7 @@ try
                   -Function @('Install-CDirectory')
 
     Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath '..\PSModules\Carbon.Accounts' -Resolve) `
-                  -Function @('Resolve-CIdentityName')
+                  -Function @('Resolve-CPrincipalName')
 }
 finally
 {

diff --git a/prism.json b/prism.json
@@ -6,7 +6,7 @@
     },
     {
       "Name": "Carbon.Accounts",
-      "Version": "1.*-*"
+      "Version": "2.*"
     }
   ]
 }
diff --git a/prism.lock.json b/prism.lock.json
@@ -7,7 +7,7 @@
     },
     {
       "name": "Carbon.Accounts",
-      "version": "1.0.0-rc3",
+      "version": "2.0.2",
       "repositorySourceLocation": "https://www.powershellgallery.com/api/v2"
     }
   ]