Merge pull request #26 from swissbuechi/dev

Added graph depencies
swissbuechi · Apr 17, 2023 · 55356bf · 55356bf
2 parents 87b5317 + 57cf6a5
commit 55356bf
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,7 +12,12 @@ jobs:
       - name: Install dependencies
         shell: pwsh
         run: | 
-          # Install-Module -Name Microsoft.Graph -MinimumVersion 1.22.0 -Force
+          Install-Module -Name Microsoft.Graph.Authentication -MinimumVersion 1.25.0 -Force
+          Install-Module -Name Microsoft.Graph.Users -MinimumVersion 1.25.0 -Force
+          Install-Module -Name Microsoft.Graph.Identity.DirectoryManagement -MinimumVersion 1.25.0 -Force
+          Install-Module -Name Microsoft.Graph.DeviceManagement.Enrolment -MinimumVersion 1.25.0 -Force
+          Install-Module -Name Microsoft.Graph.Identity.SignIns -MinimumVersion 1.25.0 -Force
+          Install-Module -Name Microsoft.Graph.Devices.CorporateManagement -MinimumVersion 1.25.0 -Force
           Install-Module -Name PnP.PowerShell -MinimumVersion 2.1.1 -Force
           Install-Module -Name ExchangeOnlineManagement -MinimumVersion 3.1.0 -Force
           Install-Module -Name DnsClient-PS -MinimumVersion 1.1.0 -Force

diff --git a/AzureAdDeployer.psd1 b/AzureAdDeployer.psd1
@@ -11,7 +11,7 @@
     RootModule           = 'AzureAdDeployer.psm1'
 
     # Version number of this module.
-    ModuleVersion        = '2.16.1'
+    ModuleVersion        = '2.16.2'
 
     # Supported PSEditions
     CompatiblePSEditions = @("Core")
@@ -51,6 +51,30 @@
 
     # Modules that must be imported into the global environment prior to importing this module
     RequiredModules      = @( @{
+            ModuleName    = "Microsoft.Graph.Authentication"; 
+            ModuleVersion = "1.25.0"; 
+            Guid          = "883916f2-9184-46ee-b1f8-b6a2fb784cee"
+        }, @{
+            ModuleName    = "Microsoft.Graph.Users"; 
+            ModuleVersion = "1.25.0"; 
+            Guid          = "71150504-37a3-48c6-82c7-7a00a12168db"
+        }, @{
+            ModuleName    = "Microsoft.Graph.Identity.DirectoryManagement"; 
+            ModuleVersion = "1.25.0"; 
+            Guid          = "c767240d-585c-42cb-bb2f-6e76e6d639d4"
+        }, @{
+            ModuleName    = "Microsoft.Graph.DeviceManagement.Enrolment"; 
+            ModuleVersion = "1.25.0"; 
+            Guid          = "447dd5b5-a01b-45bb-a55c-c9ecce3e820f"
+        }, @{
+            ModuleName    = "Microsoft.Graph.Identity.SignIns"; 
+            ModuleVersion = "1.25.0"; 
+            Guid          = "60f889fa-f873-43ad-b7d3-b7fc1273a44f"
+        }, @{
+            ModuleName    = "Microsoft.Graph.Devices.CorporateManagement"; 
+            ModuleVersion = "1.25.0"; 
+            Guid          = "39dbb3bc-1a84-424a-9efe-683be70a1810"
+        }, @{
             ModuleName    = "PnP.PowerShell"; 
             ModuleVersion = "2.1.1"; 
             Guid          = "0b0430ce-d799-4f3b-a565-f0dca1f31e17"
@@ -63,8 +87,6 @@
             ModuleVersion = "1.1.0"; 
             Guid          = "698438cc-f80d-4b88-aa04-16e302c1f326"
         })
-
-    # RequiredModules      = @( 'Microsoft.Graph.Authentication', 'Microsoft.Graph.Users', 'Microsoft.Graph.Identity.DirectoryManagement', 'Microsoft.Graph.DeviceManagement.Enrolment', 'Microsoft.Graph.Identity.SignIns', 'Microsoft.Graph.Devices.CorporateManagement', 'ExchangeOnlineManagement', 'PnP.PowerShell')
 
     # Assemblies that must be loaded prior to importing this module
     # RequiredAssemblies = @()

diff --git a/README.md b/README.md
@@ -31,8 +31,6 @@ The module is published on the PowerShellGallery. You can install this module di
 
 `Install-Module -Name AzureAdDeployer -Scope CurrentUser -Force`
 
-Make sure you also install the required [dependencies](#install-dependencies)
-
 ### Create Desktop icon (Windows only)
 
 You need to recreate the Desktop icon after every update
@@ -49,20 +47,6 @@ Update-Module -Name AzureAdDeployer -Force
 
 `Uninstall-Module -Name AzureAdDeployer -Scope CurrentUser`
 
-## Dependencies
-
-### Install dependencies
-
-```PowerShell
-Install-Module -Name Microsoft.Graph -MinimumVersion 1.25.0 -Scope CurrentUser -Force
-```
-
-### Update dependencies
-
-```PowerShell
-Update-Module -Name Microsoft.Graph -Force
-```
-
 ## Usage
 
 ### Interactive GUI