Skip to content
This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Commit bad9df8

Browse files
calebkiagecalebkiage
authored
Update generated code. (#372)
* Update generated code. Schema version: microsoftgraph/msgraph-metadata@1ca2d6e Generator version: microsoft/kiota@3f35b41a5 * Update graph cli core (#373) * Update graph cli core (#376)
1 parent 5a79695 commit bad9df8

File tree

8,946 files changed

+190969
-154077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,946 files changed

+190969
-154077
lines changed

‎src/generated/Admin/AdminRequestBuilder.cs‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// <auto-generated/>
22
using ApiSdk.Admin.Edge;
3+
using ApiSdk.Admin.People;
34
using ApiSdk.Admin.ServiceAnnouncement;
45
using ApiSdk.Admin.Sharepoint;
56
using ApiSdk.Models.ODataErrors;
@@ -61,25 +62,15 @@ public Command BuildGetCommand() {
6162
};
6263
expandOption.IsRequired = false;
6364
command.AddOption(expandOption);
64-
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON){
65-
IsRequired = true
66-
};
65+
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON);
6766
command.AddOption(outputOption);
6867
var queryOption = new Option<string>("--query");
6968
command.AddOption(queryOption);
70-
var jsonNoIndentOption = new Option<bool>("--json-no-indent", r => {
71-
if (bool.TryParse(r.Tokens.Select(t => t.Value).LastOrDefault(), out var value)) {
72-
return value;
73-
}
74-
return true;
75-
}, description: "Disable indentation for the JSON output formatter.");
76-
command.AddOption(jsonNoIndentOption);
7769
command.SetHandler(async (invocationContext) => {
7870
var select = invocationContext.ParseResult.GetValueForOption(selectOption);
7971
var expand = invocationContext.ParseResult.GetValueForOption(expandOption);
8072
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
8173
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
82-
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
8374
IOutputFilter outputFilter = invocationContext.BindingContext.GetService(typeof(IOutputFilter)) as IOutputFilter ?? throw new ArgumentNullException("outputFilter");
8475
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory ?? throw new ArgumentNullException("outputFormatterFactory");
8576
var cancellationToken = invocationContext.GetCancellationToken();
@@ -94,9 +85,8 @@ public Command BuildGetCommand() {
9485
};
9586
var response = await reqAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
9687
response = (response != Stream.Null) ? await outputFilter.FilterOutputAsync(response, query, cancellationToken) : response;
97-
var formatterOptions = output.GetOutputFormatterOptions(new FormatterOptionsModel(!jsonNoIndent));
9888
var formatter = outputFormatterFactory.GetFormatter(output);
99-
await formatter.WriteOutputAsync(response, formatterOptions, cancellationToken);
89+
await formatter.WriteOutputAsync(response, cancellationToken);
10090
});
10191
return command;
10292
}
@@ -110,32 +100,25 @@ public Command BuildPatchCommand() {
110100
};
111101
bodyOption.IsRequired = true;
112102
command.AddOption(bodyOption);
113-
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON){
114-
IsRequired = true
115-
};
103+
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON);
116104
command.AddOption(outputOption);
117105
var queryOption = new Option<string>("--query");
118106
command.AddOption(queryOption);
119-
var jsonNoIndentOption = new Option<bool>("--json-no-indent", r => {
120-
if (bool.TryParse(r.Tokens.Select(t => t.Value).LastOrDefault(), out var value)) {
121-
return value;
122-
}
123-
return true;
124-
}, description: "Disable indentation for the JSON output formatter.");
125-
command.AddOption(jsonNoIndentOption);
126107
command.SetHandler(async (invocationContext) => {
127108
var body = invocationContext.ParseResult.GetValueForOption(bodyOption) ?? string.Empty;
128109
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
129110
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
130-
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
131111
IOutputFilter outputFilter = invocationContext.BindingContext.GetService(typeof(IOutputFilter)) as IOutputFilter ?? throw new ArgumentNullException("outputFilter");
132112
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory ?? throw new ArgumentNullException("outputFormatterFactory");
133113
var cancellationToken = invocationContext.GetCancellationToken();
134114
var reqAdapter = invocationContext.GetRequestAdapter();
135115
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
136116
var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
137117
var model = parseNode.GetObjectValue<ApiSdk.Models.Admin>(ApiSdk.Models.Admin.CreateFromDiscriminatorValue);
138-
if (model is null) return; // Cannot create a POST request from a null model.
118+
if (model is null) {
119+
Console.Error.WriteLine("No model data to send.");
120+
return;
121+
}
139122
var requestInfo = ToPatchRequestInformation(model, q => {
140123
});
141124
requestInfo.SetContentFromParsable(reqAdapter, "application/json", model);
@@ -145,13 +128,34 @@ public Command BuildPatchCommand() {
145128
};
146129
var response = await reqAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
147130
response = (response != Stream.Null) ? await outputFilter.FilterOutputAsync(response, query, cancellationToken) : response;
148-
var formatterOptions = output.GetOutputFormatterOptions(new FormatterOptionsModel(!jsonNoIndent));
149131
var formatter = outputFormatterFactory.GetFormatter(output);
150-
await formatter.WriteOutputAsync(response, formatterOptions, cancellationToken);
132+
await formatter.WriteOutputAsync(response, cancellationToken);
151133
});
152134
return command;
153135
}
154136
/// <summary>
137+
/// Provides operations to manage the people property of the microsoft.graph.admin entity.
138+
/// </summary>
139+
public Command BuildPeopleNavCommand() {
140+
var command = new Command("people");
141+
command.Description = "Provides operations to manage the people property of the microsoft.graph.admin entity.";
142+
var builder = new PeopleRequestBuilder(PathParameters);
143+
var execCommands = new List<Command>();
144+
var nonExecCommands = new List<Command>();
145+
execCommands.Add(builder.BuildGetCommand());
146+
execCommands.Add(builder.BuildPatchCommand());
147+
nonExecCommands.Add(builder.BuildProfileCardPropertiesNavCommand());
148+
foreach (var cmd in execCommands)
149+
{
150+
command.AddCommand(cmd);
151+
}
152+
foreach (var cmd in nonExecCommands)
153+
{
154+
command.AddCommand(cmd);
155+
}
156+
return command;
157+
}
158+
/// <summary>
155159
/// Provides operations to manage the serviceAnnouncement property of the microsoft.graph.admin entity.
156160
/// </summary>
157161
public Command BuildServiceAnnouncementNavCommand() {
@@ -227,14 +231,14 @@ public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<Ad
227231
UrlTemplate = UrlTemplate,
228232
PathParameters = PathParameters,
229233
};
230-
requestInfo.Headers.Add("Accept", "application/json");
231234
if (requestConfiguration != null) {
232235
var requestConfig = new RequestConfiguration<AdminRequestBuilderGetQueryParameters>();
233236
requestConfiguration.Invoke(requestConfig);
234237
requestInfo.AddQueryParameters(requestConfig.QueryParameters);
235238
requestInfo.AddRequestOptions(requestConfig.Options);
236239
requestInfo.AddHeaders(requestConfig.Headers);
237240
}
241+
requestInfo.Headers.TryAdd("Accept", "application/json;q=1");
238242
return requestInfo;
239243
}
240244
/// <summary>
@@ -255,14 +259,14 @@ public RequestInformation ToPatchRequestInformation(ApiSdk.Models.Admin body, Ac
255259
UrlTemplate = UrlTemplate,
256260
PathParameters = PathParameters,
257261
};
258-
requestInfo.Headers.Add("Accept", "application/json");
259262
if (requestConfiguration != null) {
260263
var requestConfig = new RequestConfiguration<DefaultQueryParameters>();
261264
requestConfiguration.Invoke(requestConfig);
262265
requestInfo.AddQueryParameters(requestConfig.QueryParameters);
263266
requestInfo.AddRequestOptions(requestConfig.Options);
264267
requestInfo.AddHeaders(requestConfig.Headers);
265268
}
269+
requestInfo.Headers.TryAdd("Accept", "application/json;q=1");
266270
return requestInfo;
267271
}
268272
/// <summary>

‎src/generated/Admin/Edge/EdgeRequestBuilder.cs‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,15 @@ public Command BuildGetCommand() {
6363
};
6464
expandOption.IsRequired = false;
6565
command.AddOption(expandOption);
66-
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON){
67-
IsRequired = true
68-
};
66+
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON);
6967
command.AddOption(outputOption);
7068
var queryOption = new Option<string>("--query");
7169
command.AddOption(queryOption);
72-
var jsonNoIndentOption = new Option<bool>("--json-no-indent", r => {
73-
if (bool.TryParse(r.Tokens.Select(t => t.Value).LastOrDefault(), out var value)) {
74-
return value;
75-
}
76-
return true;
77-
}, description: "Disable indentation for the JSON output formatter.");
78-
command.AddOption(jsonNoIndentOption);
7970
command.SetHandler(async (invocationContext) => {
8071
var select = invocationContext.ParseResult.GetValueForOption(selectOption);
8172
var expand = invocationContext.ParseResult.GetValueForOption(expandOption);
8273
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
8374
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
84-
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
8575
IOutputFilter outputFilter = invocationContext.BindingContext.GetService(typeof(IOutputFilter)) as IOutputFilter ?? throw new ArgumentNullException("outputFilter");
8676
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory ?? throw new ArgumentNullException("outputFormatterFactory");
8777
var cancellationToken = invocationContext.GetCancellationToken();
@@ -96,9 +86,8 @@ public Command BuildGetCommand() {
9686
};
9787
var response = await reqAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
9888
response = (response != Stream.Null) ? await outputFilter.FilterOutputAsync(response, query, cancellationToken) : response;
99-
var formatterOptions = output.GetOutputFormatterOptions(new FormatterOptionsModel(!jsonNoIndent));
10089
var formatter = outputFormatterFactory.GetFormatter(output);
101-
await formatter.WriteOutputAsync(response, formatterOptions, cancellationToken);
90+
await formatter.WriteOutputAsync(response, cancellationToken);
10291
});
10392
return command;
10493
}
@@ -135,32 +124,25 @@ public Command BuildPatchCommand() {
135124
};
136125
bodyOption.IsRequired = true;
137126
command.AddOption(bodyOption);
138-
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON){
139-
IsRequired = true
140-
};
127+
var outputOption = new Option<FormatterType>("--output", () => FormatterType.JSON);
141128
command.AddOption(outputOption);
142129
var queryOption = new Option<string>("--query");
143130
command.AddOption(queryOption);
144-
var jsonNoIndentOption = new Option<bool>("--json-no-indent", r => {
145-
if (bool.TryParse(r.Tokens.Select(t => t.Value).LastOrDefault(), out var value)) {
146-
return value;
147-
}
148-
return true;
149-
}, description: "Disable indentation for the JSON output formatter.");
150-
command.AddOption(jsonNoIndentOption);
151131
command.SetHandler(async (invocationContext) => {
152132
var body = invocationContext.ParseResult.GetValueForOption(bodyOption) ?? string.Empty;
153133
var output = invocationContext.ParseResult.GetValueForOption(outputOption);
154134
var query = invocationContext.ParseResult.GetValueForOption(queryOption);
155-
var jsonNoIndent = invocationContext.ParseResult.GetValueForOption(jsonNoIndentOption);
156135
IOutputFilter outputFilter = invocationContext.BindingContext.GetService(typeof(IOutputFilter)) as IOutputFilter ?? throw new ArgumentNullException("outputFilter");
157136
IOutputFormatterFactory outputFormatterFactory = invocationContext.BindingContext.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory ?? throw new ArgumentNullException("outputFormatterFactory");
158137
var cancellationToken = invocationContext.GetCancellationToken();
159138
var reqAdapter = invocationContext.GetRequestAdapter();
160139
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
161140
var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
162141
var model = parseNode.GetObjectValue<ApiSdk.Models.Edge>(ApiSdk.Models.Edge.CreateFromDiscriminatorValue);
163-
if (model is null) return; // Cannot create a POST request from a null model.
142+
if (model is null) {
143+
Console.Error.WriteLine("No model data to send.");
144+
return;
145+
}
164146
var requestInfo = ToPatchRequestInformation(model, q => {
165147
});
166148
requestInfo.SetContentFromParsable(reqAdapter, "application/json", model);
@@ -170,9 +152,8 @@ public Command BuildPatchCommand() {
170152
};
171153
var response = await reqAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
172154
response = (response != Stream.Null) ? await outputFilter.FilterOutputAsync(response, query, cancellationToken) : response;
173-
var formatterOptions = output.GetOutputFormatterOptions(new FormatterOptionsModel(!jsonNoIndent));
174155
var formatter = outputFormatterFactory.GetFormatter(output);
175-
await formatter.WriteOutputAsync(response, formatterOptions, cancellationToken);
156+
await formatter.WriteOutputAsync(response, cancellationToken);
176157
});
177158
return command;
178159
}
@@ -211,6 +192,7 @@ public RequestInformation ToDeleteRequestInformation(Action<RequestConfiguration
211192
requestInfo.AddRequestOptions(requestConfig.Options);
212193
requestInfo.AddHeaders(requestConfig.Headers);
213194
}
195+
requestInfo.Headers.TryAdd("Accept", "application/json, application/json");
214196
return requestInfo;
215197
}
216198
/// <summary>
@@ -229,14 +211,14 @@ public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<Ed
229211
UrlTemplate = UrlTemplate,
230212
PathParameters = PathParameters,
231213
};
232-
requestInfo.Headers.Add("Accept", "application/json");
233214
if (requestConfiguration != null) {
234215
var requestConfig = new RequestConfiguration<EdgeRequestBuilderGetQueryParameters>();
235216
requestConfiguration.Invoke(requestConfig);
236217
requestInfo.AddQueryParameters(requestConfig.QueryParameters);
237218
requestInfo.AddRequestOptions(requestConfig.Options);
238219
requestInfo.AddHeaders(requestConfig.Headers);
239220
}
221+
requestInfo.Headers.TryAdd("Accept", "application/json;q=1");
240222
return requestInfo;
241223
}
242224
/// <summary>
@@ -257,14 +239,14 @@ public RequestInformation ToPatchRequestInformation(ApiSdk.Models.Edge body, Act
257239
UrlTemplate = UrlTemplate,
258240
PathParameters = PathParameters,
259241
};
260-
requestInfo.Headers.Add("Accept", "application/json");
261242
if (requestConfiguration != null) {
262243
var requestConfig = new RequestConfiguration<DefaultQueryParameters>();
263244
requestConfiguration.Invoke(requestConfig);
264245
requestInfo.AddQueryParameters(requestConfig.QueryParameters);
265246
requestInfo.AddRequestOptions(requestConfig.Options);
266247
requestInfo.AddHeaders(requestConfig.Headers);
267248
}
249+
requestInfo.Headers.TryAdd("Accept", "application/json;q=1");
268250
return requestInfo;
269251
}
270252
/// <summary>

0 commit comments

Comments
 (0)