diff --git a/src/DirectoryObjects/DirectoryObjects.md b/src/DirectoryObjects/DirectoryObjects.md
index b25dd87fafc..185d74985ef 100644
--- a/src/DirectoryObjects/DirectoryObjects.md
+++ b/src/DirectoryObjects/DirectoryObjects.md
@@ -15,73 +15,102 @@ require:
> see https://github.com/Azure/autorest/blob/master/docs/powershell/directives.md
+Wrapper migration audit: all 17 shared cmdlet groups are accounted for in
+`wrapper/DirectoryObjects_directiveMigrationMap.json`. Neither compatible profile
+contains PKI routes; v1.0 has none in its legacy source either, while the ledger
+records the exact legacy beta methods, paths, and operation IDs. No speculative
+suppression overrides are needed. `DirectoryObjectsDirectiveMigrationTests`
+pins the evidence and preserves the live directoryObjects neighbors.
+
+Profile-local readmes and `src/readme.graph.md` are intentionally excluded.
+There are no shared parameter/schema directives here; those classes remain
+deferred. Keep every original AutoRest directive active until that pipeline is
+retired.
+
``` yaml
directive:
# Remove duplicate cmdlets.
+# Wrapper audit group 1: beta certificate-authority DELETE is absent in compatible specs.
- where:
verb: Remove
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$
remove: true
+# Wrapper audit group 2: beta configuration PATCH is absent in compatible specs.
- where:
verb: Update
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$
remove: true
+# Wrapper audit group 3: beta PKI PATCH is absent in compatible specs.
- where:
verb: Update
subject: ^DirectoryPublicKeyInfrastructure$
remove: true
+# Wrapper audit group 4: exact duplicate of group 1; retained and audited separately.
- where:
verb: Remove
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$
remove: true
+# Wrapper audit group 5: beta certificate-authority POST is absent in compatible specs.
- where:
verb: New
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$
remove: true
+# Wrapper audit group 6: literal Mg-prefixed subject matches no legacy subject.
- where:
verb: New
subject: ^MgDirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$
remove: true
+# Wrapper audit group 7: beta qualified upload action is absent in compatible specs.
- where:
verb: Invoke
subject: ^UploadDirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$
remove: true
+# Wrapper audit group 8: beta configuration count GET is absent in compatible specs.
- where:
verb: Get
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCount$
remove: true
+# Wrapper audit group 9: literal MgBeta-prefixed subject matches no legacy subject.
- where:
verb: Get
subject: ^MgBetaDirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthorityCount$
remove: true
+# Wrapper audit group 10: beta certificate-authority collection/item GETs are absent.
- where:
verb: Get
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$
remove: true
+# Wrapper audit group 11: beta configuration collection/item GETs are absent.
- where:
verb: Get
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$
remove: true
+# Wrapper audit group 12: beta PKI GET is absent in compatible specs.
- where:
verb: Get
subject: ^DirectoryPublicKeyInfrastructure$
remove: true
+# Wrapper audit group 13: beta certificate-authority count GET is absent.
- where:
verb: Get
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthorityCount$
remove: true
+# Wrapper audit group 14: beta configuration POST is absent in compatible specs.
- where:
verb: New
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$
remove: true
+# Wrapper audit group 15: beta PKI DELETE is absent in compatible specs.
- where:
verb: Remove
subject: ^DirectoryPublicKeyInfrastructure$
remove: true
+# Wrapper audit group 16: beta configuration DELETE is absent in compatible specs.
- where:
verb: Remove
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$
remove: true
+# Wrapper audit group 17: beta certificate-authority PATCH is absent.
- where:
verb: Update
subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$
diff --git a/src/DirectoryObjects/wrapper/Beta/Client/kiota-lock.json b/src/DirectoryObjects/wrapper/Beta/Client/kiota-lock.json
index bbad103bb0e..1a5475775d0 100644
--- a/src/DirectoryObjects/wrapper/Beta/Client/kiota-lock.json
+++ b/src/DirectoryObjects/wrapper/Beta/Client/kiota-lock.json
@@ -1,8 +1,8 @@
{
- "descriptionHash": "A8D4B32B478CA08226B4BA393220FC34848F38C0E01F430B9482B15DCABDED3AD23517259CE0552B2C2521155D0676C898EBE2F69BC7CD9B37462535983ADC17",
- "descriptionLocation": "../../../../../openApiDocs_KiotaCompat/Beta/DirectoryObjects.yml",
+ "descriptionHash": "DB394F6B45206251D450DD0E19F05AEA848AE0EEBF351C9D496E2DAD84D7306BE0E4D9D3E0841F5DDBC03896A6D0568C83EE658A47E81E0569739C776478D6E0",
+ "descriptionLocation": "../../../../../openApiDocs_KiotaCompat/beta/DirectoryObjects.yml",
"lockFileVersion": "1.0.0",
- "kiotaVersion": "1.34.1",
+ "kiotaVersion": "1.36.1",
"clientClassName": "ApiClient",
"typeAccessModifier": "Public",
"clientNamespaceName": "Microsoft.Graph.PowerShell.DirectoryObjects.Client",
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject.g.cs
index 66d83103e40..82e572a52e4 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject.g.cs
@@ -19,6 +19,7 @@ public class GetMgDirectoryObjectCommand : GraphClientCmdlet
+
[Parameter(Mandatory = false)]
[Alias("Select")]
public string[]? Property { get; set; }
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObjectCount.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObjectCount.g.cs
index 0e6db065d1b..47a79246fe3 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObjectCount.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObjectCount.g.cs
@@ -35,7 +35,7 @@ public class GetMgDirectoryObjectCountCommand : GraphClientCmdlet
protected override void ProcessRecord()
{
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
int? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObjectDelta.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObjectDelta.g.cs
index 7542b220c24..44b28ffd7fb 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObjectDelta.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObjectDelta.g.cs
@@ -71,7 +71,7 @@ public class GetMgDirectoryObjectDeltaCommand : GraphClientCmdlet
protected override void ProcessRecord()
{
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
// Cleared before the request so a failed or interrupted run cannot leave the previous
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject_Get.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject_Get.g.cs
index 6745ad6ca19..bc76ee6b781 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject_Get.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject_Get.g.cs
@@ -34,7 +34,7 @@ public class GetMgDirectoryObject_GetCommand : GraphClientCmdlet
protected override void ProcessRecord()
{
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObject? result;
@@ -50,6 +50,7 @@ protected override void ProcessRecord()
+
AddRequestHeaders(requestConfiguration.Headers);
}).GetAwaiter().GetResult();
}
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject_List.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject_List.g.cs
index 20233c27379..8bf61b6eaba 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject_List.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/GetMgDirectoryObject_List.g.cs
@@ -63,7 +63,7 @@ public class GetMgDirectoryObject_ListCommand : GraphClientCmdlet
protected override void ProcessRecord()
{
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObjectCollectionResponse? result;
@@ -96,6 +96,7 @@ protected override void ProcessRecord()
requestConfiguration.QueryParameters.Count = true;
+
if (this.IsParameterBound(nameof(ConsistencyLevel)))
requestConfiguration.Headers.Add("ConsistencyLevel", ConsistencyLevel!);
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectCheckMemberGroups.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectCheckMemberGroups.g.cs
index 3121aa448eb..e17286a800a 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectCheckMemberGroups.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectCheckMemberGroups.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(GroupIds)))
body.GroupIds = GroupIds!.ToList();
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.Item.CheckMemberGroups.CheckMemberGroupsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectCheckMemberObjects.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectCheckMemberObjects.g.cs
index f214977f160..1cc2725090c 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectCheckMemberObjects.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectCheckMemberObjects.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(Ids)))
body.Ids = Ids!.ToList();
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.Item.CheckMemberObjects.CheckMemberObjectsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetByIds.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetByIds.g.cs
index 76249cfaf9c..85b77f2edd3 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetByIds.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetByIds.g.cs
@@ -46,7 +46,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(Types)))
body.Types = Types!.ToList();
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.GetByIds.GetByIdsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetMemberGroups.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetMemberGroups.g.cs
index a6ae9064c6b..41dcd4e26fd 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetMemberGroups.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetMemberGroups.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(SecurityEnabledOnly)))
body.SecurityEnabledOnly = SecurityEnabledOnly;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.Item.GetMemberGroups.GetMemberGroupsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetMemberObjects.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetMemberObjects.g.cs
index 7d4081450e5..9c5a9d20fb0 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetMemberObjects.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetMemberObjects.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(SecurityEnabledOnly)))
body.SecurityEnabledOnly = SecurityEnabledOnly;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.Item.GetMemberObjects.GetMemberObjectsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetUserOwnedObjects.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetUserOwnedObjects.g.cs
index 5c28844be57..b52814cbdad 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetUserOwnedObjects.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectGetUserOwnedObjects.g.cs
@@ -46,7 +46,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(Type)))
body.Type = Type;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObject? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectRestore.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectRestore.g.cs
index 2824348e97b..bf4849f0cb2 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectRestore.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectRestore.g.cs
@@ -35,7 +35,7 @@ protected override void ProcessRecord()
return;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObject? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectValidateProperties.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectValidateProperties.g.cs
index 8881349944d..2a37ec6e820 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectValidateProperties.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/InvokeMgDirectoryObjectValidateProperties.g.cs
@@ -58,7 +58,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(OnBehalfOfUserId)))
body.OnBehalfOfUserId = OnBehalfOfUserId;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/NewMgDirectoryObject.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/NewMgDirectoryObject.g.cs
index b3fca506bff..cbdcd40e968 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/NewMgDirectoryObject.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/NewMgDirectoryObject.g.cs
@@ -40,7 +40,7 @@ protected override void ProcessRecord()
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObject? result;
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/RemoveMgDirectoryObject.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/RemoveMgDirectoryObject.g.cs
index 3b6915e096a..61e877560b3 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/RemoveMgDirectoryObject.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/RemoveMgDirectoryObject.g.cs
@@ -30,7 +30,7 @@ protected override void ProcessRecord()
if (!ShouldProcess(DirectoryObjectId, "Remove"))
return;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
// DeleteAsync returns a plain Task: a standard delete response has no body.
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/UpdateMgDirectoryObject.g.cs b/src/DirectoryObjects/wrapper/Beta/Cmdlets/UpdateMgDirectoryObject.g.cs
index 0d3c1f86578..0997a0a1f72 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/UpdateMgDirectoryObject.g.cs
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/UpdateMgDirectoryObject.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("beta");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObject? result;
@@ -59,20 +59,6 @@ protected override void ProcessRecord()
return;
}
-
- if (result is null)
- {
- WriteVerbose("PATCH succeeded with no response body, re-fetching the updated resource.");
- try
- {
- result = client.DirectoryObjects[DirectoryObjectId].GetAsync().GetAwaiter().GetResult();
- }
- catch (Exception ex) when (ex is not PipelineStoppedException && ex is not OperationCanceledException)
- {
- ThrowGraphRequestFailed(ex, DirectoryObjectId);
- return;
- }
- }
if (result is not null)
WriteObject(result);
}
diff --git a/src/DirectoryObjects/wrapper/Beta/Cmdlets/kiota-lock.json b/src/DirectoryObjects/wrapper/Beta/Cmdlets/kiota-lock.json
index bf6e72a3462..05261305c4e 100644
--- a/src/DirectoryObjects/wrapper/Beta/Cmdlets/kiota-lock.json
+++ b/src/DirectoryObjects/wrapper/Beta/Cmdlets/kiota-lock.json
@@ -1,3 +1,3 @@
{
- "descriptionLocation": "../../../../../openApiDocs_KiotaCompat/Beta/DirectoryObjects.yml"
+ "descriptionLocation": "../../../../../openApiDocs_KiotaCompat/beta/DirectoryObjects.yml"
}
\ No newline at end of file
diff --git a/src/DirectoryObjects/wrapper/Beta/Microsoft.Graph.Wrapper.DirectoryObjects.csproj b/src/DirectoryObjects/wrapper/Beta/Microsoft.Graph.Wrapper.DirectoryObjects.csproj
index be5857bf2c6..0aeb51ad95a 100644
--- a/src/DirectoryObjects/wrapper/Beta/Microsoft.Graph.Wrapper.DirectoryObjects.csproj
+++ b/src/DirectoryObjects/wrapper/Beta/Microsoft.Graph.Wrapper.DirectoryObjects.csproj
@@ -48,18 +48,16 @@
-
+ Removal is by package identity, not filename. -->
+ Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != ''" />
diff --git a/src/DirectoryObjects/wrapper/DirectoryObjects_cmdletConfigurations.cs b/src/DirectoryObjects/wrapper/DirectoryObjects_cmdletConfigurations.cs
index 13b09e756ce..ba9d2d34037 100644
--- a/src/DirectoryObjects/wrapper/DirectoryObjects_cmdletConfigurations.cs
+++ b/src/DirectoryObjects/wrapper/DirectoryObjects_cmdletConfigurations.cs
@@ -1,3 +1,11 @@
using System.Collections.Generic;
+
namespace WrapperGenerator;
-public static partial class CmdletConfigurator { private static readonly List DirectoryObjectsCmdletConfigurations = []; }
+
+public static partial class CmdletConfigurator
+{
+ // DirectoryObjects.md's PKI routes are absent from both compatible specs.
+ // The adjacent migration ledger audits all 17 groups; do not prune live
+ // /directoryObjects operations or invent overrides for absent routes.
+ private static readonly List DirectoryObjectsCmdletConfigurations = [];
+}
diff --git a/src/DirectoryObjects/wrapper/DirectoryObjects_directiveMigrationMap.json b/src/DirectoryObjects/wrapper/DirectoryObjects_directiveMigrationMap.json
new file mode 100644
index 00000000000..af3672faa47
--- /dev/null
+++ b/src/DirectoryObjects/wrapper/DirectoryObjects_directiveMigrationMap.json
@@ -0,0 +1,338 @@
+{
+ "reviewScope": {
+ "source": "src/DirectoryObjects/DirectoryObjects.md",
+ "sharedCmdletGroups": 17,
+ "ignoredSources": [
+ "src/DirectoryObjects/v1.0/readme.md",
+ "src/DirectoryObjects/beta/readme.md",
+ "src/readme.graph.md"
+ ],
+ "deferredClasses": ["DeferredParameter", "DeferredSchema"],
+ "deferredGroups": 0,
+ "coverage": "No curated DirectoryObjects overrides exist. Preserve all seven live v1.0 derived action renames and the existing v1.0 restore suppression; neither is introduced by these shared directives. The derived v1.0 upload rename names an absent route and is left unchanged; no derived entry restores PKI paths. No additional compatible operation requires suppression for this migration.",
+ "evidence": "Every original verb and anchored subject is retained, with no variant restriction. Literal Mg/MgBeta prefixes are not stripped. Legacy evidence is module audit metadata, not Legacy operation-ID translation: these are where/subject directives, not operation-ID regex selectors. Revalidated after the normal powershell-v3 merge including #3849; compatible IDs were aligned by #3861/#3863, while the actual PKI absence and all original selector dispositions are unchanged. Oracle profile is passed separately from shared GeneratorConfig in tests and generation.",
+ "specs": [
+ { "path": "openApiDocs/v1.0/DirectoryObjects.yml", "operations": 15, "pkiOperations": 0 },
+ { "path": "openApiDocs/beta/DirectoryObjects.yml", "operations": 31, "pkiOperations": 16 },
+ { "path": "openApiDocs_KiotaCompat/v1.0/DirectoryObjects.yml", "blob": "6d237252fa7ac6b410321be9e84e6eefeb675909", "operations": 15, "pkiOperations": 0 },
+ { "path": "openApiDocs_KiotaCompat/beta/DirectoryObjects.yml", "blob": "25d21d2e462cd6cba6d27f0938af0f11540018d6", "operations": 15, "pkiOperations": 0 }
+ ]
+ },
+ "mappings": [
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 1,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$",
+ "sourceSelector": { "verb": "Remove", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Remove subject selects legacy beta authority-item DELETE. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations. Group 4 repeats this selector.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "DELETE", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}/certificateAuthorities/{certificateAuthorityDetail-id}", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration_DeleteCertificateAuthority" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 2,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$",
+ "sourceSelector": { "verb": "Update", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Update subject selects legacy beta configuration-item PATCH. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "PATCH", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}", "operationId": "directory.publicKeyInfrastructure_UpdateCertificateBasedAuthConfiguration" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 3,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructure$",
+ "sourceSelector": { "verb": "Update", "subject": "^DirectoryPublicKeyInfrastructure$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Update subject selects legacy beta PKI PATCH. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "PATCH", "path": "/directory/publicKeyInfrastructure", "operationId": "directory_UpdatePublicKeyInfrastructure" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 4,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$",
+ "sourceSelector": { "verb": "Remove", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Exact duplicate of group 1, not a new variant or operation. Retained separately; its legacy beta authority-item DELETE path is absent from both compatible specs.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "DELETE", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}/certificateAuthorities/{certificateAuthorityDetail-id}", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration_DeleteCertificateAuthority" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 5,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$",
+ "sourceSelector": { "verb": "New", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted New subject selects legacy beta authority-collection POST. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "POST", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}/certificateAuthorities", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration_CreateCertificateAuthority" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 6,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^MgDirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$",
+ "sourceSelector": { "verb": "New", "subject": "^MgDirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$", "variant": null },
+ "implementation": "LiteralSelectorNoMatch",
+ "notes": "Literal Mg prefix is not part of the AutoRest subject, so this selector matches no legacy operation in either profile. Do not silently repair it. The unprefixed configuration POST (directory.publicKeyInfrastructure_CreateCertificateBasedAuthConfiguration) is covered by group 14; its path is also absent from both compatible specs.",
+ "legacyEvidence": { "v1.0": [], "beta": [] },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 7,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^UploadDirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$",
+ "sourceSelector": { "verb": "Invoke", "subject": "^UploadDirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Invoke subject selects the actual legacy beta microsoft.graph.upload action POST. Neither its qualified source path nor an unqualified upload successor exists in either compatible module. The existing derived v1.0 upload rename is not a live operation and is not removed or duplicated.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "POST", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}/microsoft.graph.upload", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration_upload" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 8,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCount$",
+ "sourceSelector": { "verb": "Get", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCount$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Get Count subject selects legacy beta configuration count GET, not collection/item GET. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "GET", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/$count", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration_GetCount" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 9,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^MgBetaDirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthorityCount$",
+ "sourceSelector": { "verb": "Get", "subject": "^MgBetaDirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthorityCount$", "variant": null },
+ "implementation": "LiteralSelectorNoMatch",
+ "notes": "Literal MgBeta prefix is not part of the AutoRest subject, so this selector matches no legacy operation in either profile. Do not silently repair it. The unprefixed authority count GET (directory.publicKeyInfrastructure.certificateBasedAuthConfiguration.certificateAuthority_GetCount) is covered by group 13; its path is absent from both compatible specs.",
+ "legacyEvidence": { "v1.0": [], "beta": [] },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 10,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$",
+ "sourceSelector": { "verb": "Get", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "No variant restriction: account for BOTH legacy beta authority collection and item GETs, not the separately named Count route. Both paths are absent from both compatible specs.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "GET", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}/certificateAuthorities", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration_ListCertificateAuthority" },
+ { "method": "GET", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}/certificateAuthorities/{certificateAuthorityDetail-id}", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration_GetCertificateAuthority" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 11,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$",
+ "sourceSelector": { "verb": "Get", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "No variant restriction: account for BOTH legacy beta configuration collection and item GETs, not the separately named Count route. Both paths are absent from both compatible specs.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "GET", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations", "operationId": "directory.publicKeyInfrastructure_ListCertificateBasedAuthConfiguration" },
+ { "method": "GET", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}", "operationId": "directory.publicKeyInfrastructure_GetCertificateBasedAuthConfiguration" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 12,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructure$",
+ "sourceSelector": { "verb": "Get", "subject": "^DirectoryPublicKeyInfrastructure$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Get subject selects legacy beta PKI GET. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "GET", "path": "/directory/publicKeyInfrastructure", "operationId": "directory_GetPublicKeyInfrastructure" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 13,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthorityCount$",
+ "sourceSelector": { "verb": "Get", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthorityCount$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Get Count subject selects legacy beta authority count GET, not collection/item GET. Exact path is absent from both compatible specs; this is the valid unprefixed counterpart to group 9.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "GET", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}/certificateAuthorities/$count", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration.certificateAuthority_GetCount" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 14,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$",
+ "sourceSelector": { "verb": "New", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted New subject selects legacy beta configuration-collection POST. Exact path is absent from both compatible specs; this is the valid unprefixed counterpart to group 6.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "POST", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations", "operationId": "directory.publicKeyInfrastructure_CreateCertificateBasedAuthConfiguration" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 15,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructure$",
+ "sourceSelector": { "verb": "Remove", "subject": "^DirectoryPublicKeyInfrastructure$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Remove subject selects legacy beta PKI DELETE. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "DELETE", "path": "/directory/publicKeyInfrastructure", "operationId": "directory_DeletePublicKeyInfrastructure" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 16,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$",
+ "sourceSelector": { "verb": "Remove", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfiguration$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Remove subject selects legacy beta configuration-item DELETE. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "DELETE", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}", "operationId": "directory.publicKeyInfrastructure_DeleteCertificateBasedAuthConfiguration" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ },
+ {
+ "module": "DirectoryObjects",
+ "directiveIndex": 17,
+ "classification": "CmdletSuppression",
+ "sourceContains": "subject: ^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$",
+ "sourceSelector": { "verb": "Update", "subject": "^DirectoryPublicKeyInfrastructureCertificateBasedAuthConfigurationCertificateAuthority$", "variant": null },
+ "implementation": "NoCompatibleOperation",
+ "notes": "Unrestricted Update subject selects legacy beta authority-item PATCH. Exact path is absent from both compatible specs; legacy v1.0 contains no PKI operations.",
+ "legacyEvidence": {
+ "v1.0": [],
+ "beta": [
+ { "method": "PATCH", "path": "/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPki-id}/certificateAuthorities/{certificateAuthorityDetail-id}", "operationId": "directory.publicKeyInfrastructure.certificateBasedAuthConfiguration_UpdateCertificateAuthority" }
+ ]
+ },
+ "profiles": {
+ "v1.0": { "absenceExpected": true, "operations": [] },
+ "beta": { "absenceExpected": true, "operations": [] }
+ }
+ }
+ ]
+}
diff --git a/src/DirectoryObjects/wrapper/v1.0/Client/kiota-lock.json b/src/DirectoryObjects/wrapper/v1.0/Client/kiota-lock.json
index 2beeb0a5566..5ba81144b83 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Client/kiota-lock.json
+++ b/src/DirectoryObjects/wrapper/v1.0/Client/kiota-lock.json
@@ -1,8 +1,8 @@
{
- "descriptionHash": "AF25131E2BB975E19A26F4BD8E5C4107F9AE894C88EA32662D91DC9CA0DF54CA4B0664B0C5D9097BFED289736AB17B772CA09E1AB351B05303A0E39D6B8F79B3",
+ "descriptionHash": "3AF5F347DC07FACFDE40503C04F8D864864A00181F6D6B91CC25606E82D0A1ABB1F1B38591E9E5BAFF619A5A25599A11B1A0B074E8990C2C509B18B1E18040B8",
"descriptionLocation": "../../../../../openApiDocs_KiotaCompat/v1.0/DirectoryObjects.yml",
"lockFileVersion": "1.0.0",
- "kiotaVersion": "1.34.1",
+ "kiotaVersion": "1.36.1",
"clientClassName": "ApiClient",
"typeAccessModifier": "Public",
"clientNamespaceName": "Microsoft.Graph.PowerShell.DirectoryObjects.Client",
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/ConfirmMgDirectoryObjectMemberGroup.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/ConfirmMgDirectoryObjectMemberGroup.g.cs
index 59f5d6f6a4d..e577f9706b0 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/ConfirmMgDirectoryObjectMemberGroup.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/ConfirmMgDirectoryObjectMemberGroup.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(GroupIds)))
body.GroupIds = GroupIds!.ToList();
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.Item.CheckMemberGroups.CheckMemberGroupsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/ConfirmMgDirectoryObjectMemberObject.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/ConfirmMgDirectoryObjectMemberObject.g.cs
index 693fbc54602..c95b7dd1c61 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/ConfirmMgDirectoryObjectMemberObject.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/ConfirmMgDirectoryObjectMemberObject.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(Ids)))
body.Ids = Ids!.ToList();
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.Item.CheckMemberObjects.CheckMemberObjectsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject.g.cs
index 66d83103e40..82e572a52e4 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject.g.cs
@@ -19,6 +19,7 @@ public class GetMgDirectoryObjectCommand : GraphClientCmdlet
+
[Parameter(Mandatory = false)]
[Alias("Select")]
public string[]? Property { get; set; }
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectAvailableExtensionProperty.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectAvailableExtensionProperty.g.cs
index 06aefe7c14e..49c1d54936a 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectAvailableExtensionProperty.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectAvailableExtensionProperty.g.cs
@@ -40,7 +40,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(IsSyncedFromOnPremises)))
body.IsSyncedFromOnPremises = IsSyncedFromOnPremises;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.GetAvailableExtensionProperties.GetAvailableExtensionPropertiesPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectById.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectById.g.cs
index 71ce16d120e..2d11deb81ad 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectById.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectById.g.cs
@@ -46,7 +46,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(Types)))
body.Types = Types!.ToList();
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.GetByIds.GetByIdsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectCount.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectCount.g.cs
index 0e6db065d1b..88421926c6b 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectCount.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectCount.g.cs
@@ -35,7 +35,7 @@ public class GetMgDirectoryObjectCountCommand : GraphClientCmdlet
protected override void ProcessRecord()
{
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
int? result;
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectDelta.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectDelta.g.cs
index 7542b220c24..996d9478c54 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectDelta.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectDelta.g.cs
@@ -71,7 +71,7 @@ public class GetMgDirectoryObjectDeltaCommand : GraphClientCmdlet
protected override void ProcessRecord()
{
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
// Cleared before the request so a failed or interrupted run cannot leave the previous
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectMemberGroup.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectMemberGroup.g.cs
index 8b9f26572b0..f2bfaf0be7e 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectMemberGroup.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectMemberGroup.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(SecurityEnabledOnly)))
body.SecurityEnabledOnly = SecurityEnabledOnly;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.Item.GetMemberGroups.GetMemberGroupsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectMemberObject.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectMemberObject.g.cs
index 831bc174439..0b74b93938b 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectMemberObject.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObjectMemberObject.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(SecurityEnabledOnly)))
body.SecurityEnabledOnly = SecurityEnabledOnly;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
global::Microsoft.Graph.PowerShell.DirectoryObjects.Client.DirectoryObjects.Item.GetMemberObjects.GetMemberObjectsPostResponse? result;
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject_Get.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject_Get.g.cs
index 6745ad6ca19..3367c9372b9 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject_Get.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject_Get.g.cs
@@ -34,7 +34,7 @@ public class GetMgDirectoryObject_GetCommand : GraphClientCmdlet
protected override void ProcessRecord()
{
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObject? result;
@@ -50,6 +50,7 @@ protected override void ProcessRecord()
+
AddRequestHeaders(requestConfiguration.Headers);
}).GetAwaiter().GetResult();
}
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject_List.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject_List.g.cs
index 20233c27379..5e645764ee0 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject_List.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/GetMgDirectoryObject_List.g.cs
@@ -63,7 +63,7 @@ public class GetMgDirectoryObject_ListCommand : GraphClientCmdlet
protected override void ProcessRecord()
{
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObjectCollectionResponse? result;
@@ -96,6 +96,7 @@ protected override void ProcessRecord()
requestConfiguration.QueryParameters.Count = true;
+
if (this.IsParameterBound(nameof(ConsistencyLevel)))
requestConfiguration.Headers.Add("ConsistencyLevel", ConsistencyLevel!);
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/NewMgDirectoryObject.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/NewMgDirectoryObject.g.cs
index b3fca506bff..adc03335ec7 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/NewMgDirectoryObject.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/NewMgDirectoryObject.g.cs
@@ -40,7 +40,7 @@ protected override void ProcessRecord()
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObject? result;
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/RemoveMgDirectoryObject.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/RemoveMgDirectoryObject.g.cs
index 3b6915e096a..649e8ef1059 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/RemoveMgDirectoryObject.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/RemoveMgDirectoryObject.g.cs
@@ -30,7 +30,7 @@ protected override void ProcessRecord()
if (!ShouldProcess(DirectoryObjectId, "Remove"))
return;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
// DeleteAsync returns a plain Task: a standard delete response has no body.
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/TestMgDirectoryObjectProperty.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/TestMgDirectoryObjectProperty.g.cs
index cafaadf7ee4..68139a2419f 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/TestMgDirectoryObjectProperty.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/TestMgDirectoryObjectProperty.g.cs
@@ -58,7 +58,7 @@ protected override void ProcessRecord()
if (this.IsParameterBound(nameof(OnBehalfOfUserId)))
body.OnBehalfOfUserId = OnBehalfOfUserId;
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
diff --git a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/UpdateMgDirectoryObject.g.cs b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/UpdateMgDirectoryObject.g.cs
index 0d3c1f86578..8c33511476c 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Cmdlets/UpdateMgDirectoryObject.g.cs
+++ b/src/DirectoryObjects/wrapper/v1.0/Cmdlets/UpdateMgDirectoryObject.g.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
- var requestAdapter = GetRequestAdapter();
+ var requestAdapter = GetRequestAdapter("v1.0");
var client = new ApiClient(requestAdapter);
Microsoft.Graph.PowerShell.DirectoryObjects.Client.Models.DirectoryObject? result;
@@ -59,20 +59,6 @@ protected override void ProcessRecord()
return;
}
-
- if (result is null)
- {
- WriteVerbose("PATCH succeeded with no response body, re-fetching the updated resource.");
- try
- {
- result = client.DirectoryObjects[DirectoryObjectId].GetAsync().GetAwaiter().GetResult();
- }
- catch (Exception ex) when (ex is not PipelineStoppedException && ex is not OperationCanceledException)
- {
- ThrowGraphRequestFailed(ex, DirectoryObjectId);
- return;
- }
- }
if (result is not null)
WriteObject(result);
}
diff --git a/src/DirectoryObjects/wrapper/v1.0/Microsoft.Graph.Wrapper.DirectoryObjects.csproj b/src/DirectoryObjects/wrapper/v1.0/Microsoft.Graph.Wrapper.DirectoryObjects.csproj
index be5857bf2c6..0aeb51ad95a 100644
--- a/src/DirectoryObjects/wrapper/v1.0/Microsoft.Graph.Wrapper.DirectoryObjects.csproj
+++ b/src/DirectoryObjects/wrapper/v1.0/Microsoft.Graph.Wrapper.DirectoryObjects.csproj
@@ -48,18 +48,16 @@
-
+ Removal is by package identity, not filename. -->
+ Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != ''" />
diff --git a/tools/WrapperGenerator.Tests/DirectoryObjectsDirectiveMigrationTests.cs b/tools/WrapperGenerator.Tests/DirectoryObjectsDirectiveMigrationTests.cs
new file mode 100644
index 00000000000..3dc3a11ceec
--- /dev/null
+++ b/tools/WrapperGenerator.Tests/DirectoryObjectsDirectiveMigrationTests.cs
@@ -0,0 +1,307 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.OpenApi;
+using Microsoft.OpenApi.Reader;
+using WrapperGenerator;
+using Xunit;
+
+namespace WrapperGenerator.Tests;
+
+public sealed class DirectoryObjectsDirectiveMigrationTests
+{
+ private const string PkiPath = "/directory/publicKeyInfrastructure";
+ private const string PkiSubject = "DirectoryPublicKeyInfrastructure";
+ private const string ConfigurationSubject = PkiSubject + "CertificateBasedAuthConfiguration";
+ private const string AuthoritySubject = ConfigurationSubject + "CertificateAuthority";
+
+ [Fact]
+ public void LedgerAccountsForEveryOriginalSelectorWithoutRepairingTyposOrDroppingDuplicates()
+ {
+ (string Verb, string Subject)[] expected =
+ [
+ ("Remove", AuthoritySubject),
+ ("Update", ConfigurationSubject),
+ ("Update", PkiSubject),
+ ("Remove", AuthoritySubject),
+ ("New", AuthoritySubject),
+ ("New", "Mg" + ConfigurationSubject),
+ ("Invoke", "Upload" + ConfigurationSubject),
+ ("Get", ConfigurationSubject + "Count"),
+ ("Get", "MgBeta" + AuthoritySubject + "Count"),
+ ("Get", AuthoritySubject),
+ ("Get", ConfigurationSubject),
+ ("Get", PkiSubject),
+ ("Get", AuthoritySubject + "Count"),
+ ("New", ConfigurationSubject),
+ ("Remove", PkiSubject),
+ ("Remove", ConfigurationSubject),
+ ("Update", AuthoritySubject),
+ ];
+ var source = File.ReadAllText(Path.Combine(RepoRoot(), "src", "DirectoryObjects", "DirectoryObjects.md"));
+ var directives = Regex.Matches(source,
+ @"(?m)^ - where:\r?\n verb: (?\w+)\r?\n subject: (?[^\r\n]+)\r?\n remove: true\s*$");
+ using var ledger = ReadLedger();
+ var mappings = ledger.RootElement.GetProperty("mappings").EnumerateArray().ToArray();
+
+ Assert.Equal(17, directives.Count);
+ Assert.Equal(17, mappings.Length);
+ Assert.DoesNotContain("remove-path-by-operation:", source);
+ Assert.Equal(0, ledger.RootElement.GetProperty("reviewScope").GetProperty("deferredGroups").GetInt32());
+ for (var i = 0; i < mappings.Length; i++)
+ {
+ var mapping = mappings[i];
+ var selector = mapping.GetProperty("sourceSelector");
+ Assert.Equal(i + 1, mapping.GetProperty("directiveIndex").GetInt32());
+ Assert.Equal("CmdletSuppression", mapping.GetProperty("classification").GetString());
+ Assert.Equal(expected[i].Verb, directives[i].Groups["verb"].Value);
+ Assert.Equal("^" + expected[i].Subject + "$", directives[i].Groups["subject"].Value);
+ Assert.Equal(expected[i].Verb, selector.GetProperty("verb").GetString());
+ Assert.Equal(directives[i].Groups["subject"].Value, selector.GetProperty("subject").GetString());
+ Assert.Equal(JsonValueKind.Null, selector.GetProperty("variant").ValueKind);
+ Assert.Contains(mapping.GetProperty("sourceContains").GetString()!, directives[i].Value);
+ Assert.Equal(i is 5 or 8 ? "LiteralSelectorNoMatch" : "NoCompatibleOperation",
+ mapping.GetProperty("implementation").GetString());
+ Assert.False(mapping.TryGetProperty("operationIdSource", out _));
+ }
+ }
+
+ [Theory]
+ [InlineData("v1.0", 0)]
+ [InlineData("beta", 16)]
+ public void ReviewedLegacyEvidenceCoversActualOperationsAndProvesCompatibleAbsence(string profile, int pkiCount)
+ {
+ var legacy = ReadOperations("openApiDocs", profile);
+ var compatible = ReadOperations("openApiDocs_KiotaCompat", profile);
+ var pki = legacy.Where(operation => operation.Path.StartsWith(PkiPath, StringComparison.Ordinal)).ToArray();
+ Assert.Equal(pkiCount, pki.Length);
+ Assert.Equal(15 + pkiCount, legacy.Length);
+ Assert.Equal(15, compatible.Length);
+ Assert.DoesNotContain(compatible, operation => operation.Path.StartsWith(PkiPath, StringComparison.OrdinalIgnoreCase));
+
+ using var ledger = ReadLedger();
+ var reviewed = new HashSet();
+ foreach (var mapping in ledger.RootElement.GetProperty("mappings").EnumerateArray())
+ {
+ var selector = mapping.GetProperty("sourceSelector");
+ var verb = selector.GetProperty("verb").GetString();
+ var subject = new Regex(selector.GetProperty("subject").GetString()!);
+ var selected = pki.Where(operation =>
+ {
+ var name = LegacyPkiName(operation);
+ return name.Verb == verb && subject.IsMatch(name.Subject);
+ }).ToArray();
+ var evidence = mapping.GetProperty("legacyEvidence").GetProperty(profile).EnumerateArray()
+ .Select(operation => new Operation(
+ operation.GetProperty("method").GetString()!,
+ operation.GetProperty("path").GetString()!,
+ operation.GetProperty("operationId").GetString()!)).ToArray();
+ Assert.Equal(selected.OrderBy(Key), evidence.OrderBy(Key));
+ reviewed.UnionWith(evidence);
+ foreach (var operation in evidence)
+ {
+ Assert.DoesNotContain(compatible, candidate =>
+ candidate.Method == operation.Method && candidate.Path == operation.Path);
+ // Upload is the only action in this selected family. Check its actual final
+ // unqualified successor too, rather than mistaking namespace removal for absence.
+ if (operation.Path.EndsWith("/microsoft.graph.upload", StringComparison.Ordinal))
+ Assert.DoesNotContain(compatible, candidate =>
+ candidate.Method == operation.Method &&
+ candidate.Path == operation.Path.Replace("/microsoft.graph.upload", "/upload", StringComparison.Ordinal));
+ }
+
+ var profileMap = mapping.GetProperty("profiles").GetProperty(profile);
+ Assert.True(profileMap.GetProperty("absenceExpected").GetBoolean());
+ Assert.Equal(0, profileMap.GetProperty("operations").GetArrayLength());
+ Assert.False(profileMap.TryGetProperty("excluded", out _));
+ Assert.False(profileMap.TryGetProperty("removedLegacyOperations", out _));
+ }
+ Assert.Equal(pki.OrderBy(Key), reviewed.OrderBy(Key));
+ }
+
+ [Theory]
+ [InlineData("v1.0", false)]
+ [InlineData("v1.0", true)]
+ [InlineData("beta", false)]
+ [InlineData("beta", true)]
+ public void LiveCompatibleNeighborsRetainExistingSuppressionAndResourceNames(string profile, bool useDerivedData)
+ {
+ var config = new GeneratorConfig("Test.Client", "unused", UseCollisionData: useDerivedData);
+ foreach (var operation in ReadOperations("openApiDocs_KiotaCompat", profile))
+ {
+ var method = new HttpMethod(operation.Method);
+ var existingRestoreSuppression = useDerivedData && profile == "v1.0" &&
+ operation.Method == "POST" && operation.Path == "/directoryObjects/{directoryObject-id}/restore";
+ Assert.Equal(existingRestoreSuppression,
+ CmdletConfigurator.IsSuppressed(method, operation.Path, config, apiVersion: profile));
+
+ if (operation.Path is "/directoryObjects" or "/directoryObjects/{directoryObject-id}" or "/directoryObjects/$count")
+ {
+ var naming = Naming.Resolve(new OperationInfo(method, operation.Path), config, apiVersion: profile);
+ Assert.Equal(operation.Method switch
+ {
+ "GET" => "Get",
+ "POST" => "New",
+ "PATCH" => "Update",
+ "DELETE" => "Remove",
+ _ => throw new InvalidOperationException(operation.Method),
+ }, naming.VerbName);
+ Assert.Equal(operation.Path.EndsWith("/$count", StringComparison.Ordinal)
+ ? "MgDirectoryObjectCount" : "MgDirectoryObject", naming.Noun);
+ }
+ }
+ }
+
+ [Theory]
+ [InlineData("/directoryObjects/{directoryObject-id}/checkMemberGroups", "Confirm", "DirectoryObjectMemberGroup")]
+ [InlineData("/directoryObjects/{directoryObject-id}/checkMemberObjects", "Confirm", "DirectoryObjectMemberObject")]
+ [InlineData("/directoryObjects/{directoryObject-id}/getMemberGroups", "Get", "DirectoryObjectMemberGroup")]
+ [InlineData("/directoryObjects/{directoryObject-id}/getMemberObjects", "Get", "DirectoryObjectMemberObject")]
+ [InlineData("/directoryObjects/getAvailableExtensionProperties", "Get", "DirectoryObjectAvailableExtensionProperty")]
+ [InlineData("/directoryObjects/getByIds", "Get", "DirectoryObjectById")]
+ [InlineData("/directoryObjects/validateProperties", "Test", "DirectoryObjectProperty")]
+ public void ExistingDerivedActionRenamesRemainAuthoritative(string path, string verb, string noun)
+ {
+ var operation = new OperationInfo(HttpMethod.Post, path, Kind: OperationKind.Action);
+ var config = new GeneratorConfig("Test.Client", "unused");
+ var naming = Naming.Resolve(operation, config, apiVersion: "v1.0");
+ Assert.Equal(verb, naming.VerbName);
+ Assert.Equal("Mg" + noun, naming.Noun);
+ Assert.False(CmdletConfigurator.IsSuppressed(HttpMethod.Post, path, config, apiVersion: "v1.0"));
+ }
+
+ [Theory]
+ [InlineData(false)]
+ [InlineData(true)]
+ public void BetaActionNeighborsNeverConsumeV1OracleRenames(bool useDerivedData)
+ {
+ (string Path, string Noun)[] actions =
+ [
+ ("/directoryObjects/{directoryObject-id}/checkMemberGroups", "DirectoryObjectCheckMemberGroups"),
+ ("/directoryObjects/{directoryObject-id}/checkMemberObjects", "DirectoryObjectCheckMemberObjects"),
+ ("/directoryObjects/{directoryObject-id}/getMemberGroups", "DirectoryObjectGetMemberGroups"),
+ ("/directoryObjects/{directoryObject-id}/getMemberObjects", "DirectoryObjectGetMemberObjects"),
+ ("/directoryObjects/{directoryObject-id}/restore", "DirectoryObjectRestore"),
+ ("/directoryObjects/getByIds", "DirectoryObjectGetByIds"),
+ ("/directoryObjects/getUserOwnedObjects", "DirectoryObjectGetUserOwnedObjects"),
+ ("/directoryObjects/validateProperties", "DirectoryObjectValidateProperties"),
+ ];
+ var operations = ReadOperations("openApiDocs_KiotaCompat", "beta");
+ var config = new GeneratorConfig("Test.Client", "unused", UseCollisionData: useDerivedData);
+ foreach (var (path, noun) in actions)
+ {
+ Assert.Contains(operations, operation => operation.Method == "POST" && operation.Path == path);
+ var naming = Naming.Resolve(new OperationInfo(HttpMethod.Post, path, Kind: OperationKind.Action),
+ config, apiVersion: "beta");
+ Assert.Equal("Invoke", naming.VerbName);
+ Assert.Equal("Mg" + noun, naming.Noun);
+ Assert.Null(CmdletConfigurator.TryGetOverriddenVerb(HttpMethod.Post, path, config, apiVersion: "beta"));
+ Assert.Equal(noun, CmdletConfigurator.ApplyNounOverrides(HttpMethod.Post, path, noun, config, apiVersion: "beta"));
+ Assert.False(CmdletConfigurator.IsSuppressed(HttpMethod.Post, path, config, apiVersion: "beta"));
+ }
+ }
+
+ [Theory]
+ [InlineData("v1.0")]
+ [InlineData("beta")]
+ public async Task RealProfilePatchKeepsOneMutationWithoutReadbackOrGetOnlyBindings(string profile)
+ {
+ var document = await ReadDocumentAsync("openApiDocs_KiotaCompat", profile);
+ foreach (var path in document.Paths!)
+ {
+ Assert.DoesNotContain(path.Value.Parameters ?? [],
+ parameter => parameter.In == ParameterLocation.Query && parameter.Required);
+ foreach (var operation in path.Value.Operations!.Values)
+ Assert.DoesNotContain(operation.Parameters ?? [],
+ parameter => parameter.In == ParameterLocation.Query && parameter.Required);
+ }
+
+ var output = Path.Combine(Path.GetTempPath(), "directoryobjects-patch-tests", Guid.NewGuid().ToString("N"));
+ Directory.CreateDirectory(output);
+ try
+ {
+ var config = new GeneratorConfig("Microsoft.Graph.PowerShell.DirectoryObjects.Client", output);
+ var service = new PowerShellWrapperGenerationService(document, config, NullLogger.Instance, apiVersion: profile);
+ await service.GenerateAsync(CancellationToken.None);
+
+ var patch = File.ReadAllText(Path.Combine(output, "UpdateMgDirectoryObject.g.cs"));
+ Assert.Single(Regex.Matches(patch, @"\.PatchAsync\("));
+ Assert.DoesNotContain(".GetAsync(", patch);
+ Assert.DoesNotContain("re-fetch", patch);
+ Assert.DoesNotContain("Refetch", patch);
+ Assert.DoesNotContain("ReadBack", patch);
+ Assert.DoesNotContain("PassThru", patch);
+ Assert.DoesNotContain("QueryParameters.", patch);
+ Assert.DoesNotContain("public string[]? Property", patch);
+ Assert.Contains($"GetRequestAdapter(\"{profile}\")", patch);
+ Assert.Contains("ShouldProcess(DirectoryObjectId", patch);
+ Assert.Contains("AddRequestHeaders(requestConfiguration.Headers)", patch);
+ Assert.Contains("body.DeletedDateTime = DeletedDateTime", patch);
+ Assert.Contains("if (result is not null)", patch);
+ }
+ finally
+ {
+ Directory.Delete(output, recursive: true);
+ }
+ }
+
+ private sealed record Operation(string Method, string Path, string OperationId);
+
+ private static string Key(Operation operation) => $"{operation.Method} {operation.Path} [{operation.OperationId}]";
+
+ // These legacy resource IDs encode the old subject explicitly. Do not run modern
+ // structural naming over them: upload's published subject places the action first.
+ private static (string Verb, string Subject) LegacyPkiName(Operation operation)
+ {
+ var parts = operation.OperationId.Split('_');
+ Assert.Equal(2, parts.Length);
+ var prefix = string.Concat(parts[0].Split('.').Select(segment => char.ToUpperInvariant(segment[0]) + segment[1..]));
+ foreach (var (legacyVerb, verb) in new[]
+ {
+ ("List", "Get"), ("Get", "Get"), ("Create", "New"), ("Update", "Update"), ("Delete", "Remove"),
+ })
+ {
+ if (parts[1].StartsWith(legacyVerb, StringComparison.Ordinal))
+ return (verb, prefix + parts[1][legacyVerb.Length..]);
+ }
+ Assert.Equal("upload", parts[1]);
+ return ("Invoke", "Upload" + prefix);
+ }
+
+ private static JsonDocument ReadLedger() => JsonDocument.Parse(File.ReadAllText(Path.Combine(
+ RepoRoot(), "src", "DirectoryObjects", "wrapper", "DirectoryObjects_directiveMigrationMap.json")));
+
+ private static Operation[] ReadOperations(string specRoot, string profile)
+ {
+ var document = ReadDocumentAsync(specRoot, profile).GetAwaiter().GetResult();
+ return document.Paths!.SelectMany(path => path.Value.Operations!.Select(operation =>
+ new Operation(operation.Key.Method.ToUpperInvariant(), path.Key, operation.Value.OperationId!))).ToArray();
+ }
+
+ private static async Task ReadDocumentAsync(string specRoot, string profile)
+ {
+ var settings = new OpenApiReaderSettings();
+ settings.AddYamlReader();
+ using var stream = File.OpenRead(Path.Combine(RepoRoot(), specRoot, profile, "DirectoryObjects.yml"));
+ var result = await OpenApiDocument.LoadAsync(stream, settings: settings, cancellationToken: CancellationToken.None)
+ .ConfigureAwait(false);
+ var document = result.Document;
+ Assert.NotNull(document);
+ return document;
+ }
+
+ private static string RepoRoot()
+ {
+ var directory = new DirectoryInfo(AppContext.BaseDirectory);
+ while (directory is not null && !File.Exists(Path.Combine(directory.FullName, "tools", "WrapperGenerator", "WrapperGenerator.csproj")))
+ directory = directory.Parent;
+ return directory?.FullName ?? throw new InvalidOperationException("Could not locate repository root.");
+ }
+}