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

Commit 058442e

Browse files
calebkiagecalebkiage
committed
Update generated code
1 parent 9e2b478 commit 058442e

File tree

5,763 files changed

+43139
-116665
lines changed

Some content is hidden

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

5,763 files changed

+43139
-116665
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "msgraph-cli-core"]
22
path = msgraph-cli-core
33
url = https://github.com/microsoftgraph/msgraph-cli-core.git
4-
branch = main
4+
branch = chore/dependency_refactor

‎msgraph-cli-core‎

‎src/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.Graph.Cli.Core.Configuration;
99
using Microsoft.Graph.Cli.Core.IO;
1010
using Microsoft.Graph.Cli.Core.Utils;
11+
using Microsoft.Kiota.Abstractions;
1112
using Microsoft.Kiota.Authentication.Azure;
1213
using Microsoft.Kiota.Http.HttpClientLibrary;
1314
using Microsoft.Kiota.Http.HttpClientLibrary.Middleware;
@@ -113,6 +114,7 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
113114
var authSection = ctx.Configuration.GetSection(Constants.AuthenticationSection);
114115
services.Configure<AuthenticationOptions>(authSection);
115116
services.AddSingleton<IPathUtility, PathUtility>();
117+
services.AddSingleton<IOutputFormatterFactory, OutputFormatterFactory>();
116118
});
117119

118120
static void ConfigureAppConfiguration(IConfigurationBuilder builder) {

‎src/generated/Admin/AdminRequestBuilder.cs‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,15 @@ public Command BuildGetCommand() {
4242
IsRequired = true
4343
};
4444
command.AddOption(outputOption);
45-
command.SetHandler(async (string[] select, string[] expand, FormatterType output, IServiceProvider serviceProvider, IConsole console) => {
46-
var responseHandler = serviceProvider.GetService(typeof(IResponseHandler)) as IResponseHandler;
45+
command.SetHandler(async (string[] select, string[] expand, FormatterType output, IOutputFormatterFactory outputFormatterFactory, IConsole console) => {
4746
var requestInfo = CreateGetRequestInformation(q => {
4847
q.Select = select;
4948
q.Expand = expand;
5049
});
51-
await RequestAdapter.SendNoContentAsync(requestInfo, responseHandler);
52-
// Print request output. What if the request has no return?
53-
var responseProcessor = serviceProvider.GetService(typeof(IResponseProcessor)) as IResponseProcessor;
54-
var factory = serviceProvider.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory;
55-
var formatter = factory.GetFormatter(output);
56-
if (responseProcessor.IsResponseSuccessful(responseHandler)) {
57-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
58-
formatter.WriteOutput(content, console);
59-
}
60-
else {
61-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
62-
console.WriteLine(content);
63-
}
64-
}, selectOption, expandOption, outputOption, new ServiceProviderBinder());
50+
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo);
51+
var formatter = outputFormatterFactory.GetFormatter(output);
52+
formatter.WriteOutput(response, console);
53+
}, selectOption, expandOption, outputOption, new OutputFormatterFactoryBinder());
6554
return command;
6655
}
6756
/// <summary>
@@ -75,17 +64,15 @@ public Command BuildPatchCommand() {
7564
};
7665
bodyOption.IsRequired = true;
7766
command.AddOption(bodyOption);
78-
command.SetHandler(async (string body, IServiceProvider serviceProvider, IConsole console) => {
79-
var responseHandler = serviceProvider.GetService(typeof(IResponseHandler)) as IResponseHandler;
67+
command.SetHandler(async (string body, IOutputFormatterFactory outputFormatterFactory, IConsole console) => {
8068
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
8169
var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
8270
var model = parseNode.GetObjectValue<ApiSdk.Models.Microsoft.Graph.Admin>();
8371
var requestInfo = CreatePatchRequestInformation(model, q => {
8472
});
85-
await RequestAdapter.SendNoContentAsync(requestInfo, responseHandler);
86-
// Print request output. What if the request has no return?
73+
await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo);
8774
console.WriteLine("Success");
88-
}, bodyOption, new ServiceProviderBinder());
75+
}, bodyOption, new OutputFormatterFactoryBinder());
8976
return command;
9077
}
9178
public Command BuildServiceAnnouncementCommand() {

‎src/generated/Admin/ServiceAnnouncement/HealthOverviews/HealthOverviewsRequestBuilder.cs‎

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,16 @@ public Command BuildCreateCommand() {
4545
IsRequired = true
4646
};
4747
command.AddOption(outputOption);
48-
command.SetHandler(async (string body, FormatterType output, IServiceProvider serviceProvider, IConsole console) => {
49-
var responseHandler = serviceProvider.GetService(typeof(IResponseHandler)) as IResponseHandler;
48+
command.SetHandler(async (string body, FormatterType output, IOutputFormatterFactory outputFormatterFactory, IConsole console) => {
5049
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
5150
var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
5251
var model = parseNode.GetObjectValue<ServiceHealth>();
5352
var requestInfo = CreatePostRequestInformation(model, q => {
5453
});
55-
await RequestAdapter.SendNoContentAsync(requestInfo, responseHandler);
56-
// Print request output. What if the request has no return?
57-
var responseProcessor = serviceProvider.GetService(typeof(IResponseProcessor)) as IResponseProcessor;
58-
var factory = serviceProvider.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory;
59-
var formatter = factory.GetFormatter(output);
60-
if (responseProcessor.IsResponseSuccessful(responseHandler)) {
61-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
62-
formatter.WriteOutput(content, console);
63-
}
64-
else {
65-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
66-
console.WriteLine(content);
67-
}
68-
}, bodyOption, outputOption, new ServiceProviderBinder());
54+
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo);
55+
var formatter = outputFormatterFactory.GetFormatter(output);
56+
formatter.WriteOutput(response, console);
57+
}, bodyOption, outputOption, new OutputFormatterFactoryBinder());
6958
return command;
7059
}
7160
/// <summary>
@@ -114,8 +103,7 @@ public Command BuildListCommand() {
114103
IsRequired = true
115104
};
116105
command.AddOption(outputOption);
117-
command.SetHandler(async (int? top, int? skip, string search, string filter, bool? count, string[] orderby, string[] select, string[] expand, FormatterType output, IServiceProvider serviceProvider, IConsole console) => {
118-
var responseHandler = serviceProvider.GetService(typeof(IResponseHandler)) as IResponseHandler;
106+
command.SetHandler(async (int? top, int? skip, string search, string filter, bool? count, string[] orderby, string[] select, string[] expand, FormatterType output, IOutputFormatterFactory outputFormatterFactory, IConsole console) => {
119107
var requestInfo = CreateGetRequestInformation(q => {
120108
q.Top = top;
121109
q.Skip = skip;
@@ -126,20 +114,10 @@ public Command BuildListCommand() {
126114
q.Select = select;
127115
q.Expand = expand;
128116
});
129-
await RequestAdapter.SendNoContentAsync(requestInfo, responseHandler);
130-
// Print request output. What if the request has no return?
131-
var responseProcessor = serviceProvider.GetService(typeof(IResponseProcessor)) as IResponseProcessor;
132-
var factory = serviceProvider.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory;
133-
var formatter = factory.GetFormatter(output);
134-
if (responseProcessor.IsResponseSuccessful(responseHandler)) {
135-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
136-
formatter.WriteOutput(content, console);
137-
}
138-
else {
139-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
140-
console.WriteLine(content);
141-
}
142-
}, topOption, skipOption, searchOption, filterOption, countOption, orderbyOption, selectOption, expandOption, outputOption, new ServiceProviderBinder());
117+
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo);
118+
var formatter = outputFormatterFactory.GetFormatter(output);
119+
formatter.WriteOutput(response, console);
120+
}, topOption, skipOption, searchOption, filterOption, countOption, orderbyOption, selectOption, expandOption, outputOption, new OutputFormatterFactoryBinder());
143121
return command;
144122
}
145123
/// <summary>

‎src/generated/Admin/ServiceAnnouncement/HealthOverviews/Item/Issues/IssuesRequestBuilder.cs‎

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -48,27 +48,16 @@ public Command BuildCreateCommand() {
4848
IsRequired = true
4949
};
5050
command.AddOption(outputOption);
51-
command.SetHandler(async (string serviceHealthId, string body, FormatterType output, IServiceProvider serviceProvider, IConsole console) => {
52-
var responseHandler = serviceProvider.GetService(typeof(IResponseHandler)) as IResponseHandler;
51+
command.SetHandler(async (string serviceHealthId, string body, FormatterType output, IOutputFormatterFactory outputFormatterFactory, IConsole console) => {
5352
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
5453
var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
5554
var model = parseNode.GetObjectValue<ServiceHealthIssue>();
5655
var requestInfo = CreatePostRequestInformation(model, q => {
5756
});
58-
await RequestAdapter.SendNoContentAsync(requestInfo, responseHandler);
59-
// Print request output. What if the request has no return?
60-
var responseProcessor = serviceProvider.GetService(typeof(IResponseProcessor)) as IResponseProcessor;
61-
var factory = serviceProvider.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory;
62-
var formatter = factory.GetFormatter(output);
63-
if (responseProcessor.IsResponseSuccessful(responseHandler)) {
64-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
65-
formatter.WriteOutput(content, console);
66-
}
67-
else {
68-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
69-
console.WriteLine(content);
70-
}
71-
}, serviceHealthIdOption, bodyOption, outputOption, new ServiceProviderBinder());
57+
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo);
58+
var formatter = outputFormatterFactory.GetFormatter(output);
59+
formatter.WriteOutput(response, console);
60+
}, serviceHealthIdOption, bodyOption, outputOption, new OutputFormatterFactoryBinder());
7261
return command;
7362
}
7463
/// <summary>
@@ -121,8 +110,7 @@ public Command BuildListCommand() {
121110
IsRequired = true
122111
};
123112
command.AddOption(outputOption);
124-
command.SetHandler(async (string serviceHealthId, int? top, int? skip, string search, string filter, bool? count, string[] orderby, string[] select, string[] expand, FormatterType output, IServiceProvider serviceProvider, IConsole console) => {
125-
var responseHandler = serviceProvider.GetService(typeof(IResponseHandler)) as IResponseHandler;
113+
command.SetHandler(async (string serviceHealthId, int? top, int? skip, string search, string filter, bool? count, string[] orderby, string[] select, string[] expand, FormatterType output, IOutputFormatterFactory outputFormatterFactory, IConsole console) => {
126114
var requestInfo = CreateGetRequestInformation(q => {
127115
q.Top = top;
128116
q.Skip = skip;
@@ -133,20 +121,10 @@ public Command BuildListCommand() {
133121
q.Select = select;
134122
q.Expand = expand;
135123
});
136-
await RequestAdapter.SendNoContentAsync(requestInfo, responseHandler);
137-
// Print request output. What if the request has no return?
138-
var responseProcessor = serviceProvider.GetService(typeof(IResponseProcessor)) as IResponseProcessor;
139-
var factory = serviceProvider.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory;
140-
var formatter = factory.GetFormatter(output);
141-
if (responseProcessor.IsResponseSuccessful(responseHandler)) {
142-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
143-
formatter.WriteOutput(content, console);
144-
}
145-
else {
146-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
147-
console.WriteLine(content);
148-
}
149-
}, serviceHealthIdOption, topOption, skipOption, searchOption, filterOption, countOption, orderbyOption, selectOption, expandOption, outputOption, new ServiceProviderBinder());
124+
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo);
125+
var formatter = outputFormatterFactory.GetFormatter(output);
126+
formatter.WriteOutput(response, console);
127+
}, serviceHealthIdOption, topOption, skipOption, searchOption, filterOption, countOption, orderbyOption, selectOption, expandOption, outputOption, new OutputFormatterFactoryBinder());
150128
return command;
151129
}
152130
/// <summary>

‎src/generated/Admin/ServiceAnnouncement/HealthOverviews/Item/Issues/Item/IncidentReport/IncidentReportRequestBuilder.cs‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,20 @@ public Command BuildGetCommand() {
4040
IsRequired = true
4141
};
4242
command.AddOption(outputOption);
43-
command.SetHandler(async (string serviceHealthId, string serviceHealthIssueId, FileInfo file, FormatterType output, IServiceProvider serviceProvider, IConsole console) => {
44-
var responseHandler = serviceProvider.GetService(typeof(IResponseHandler)) as IResponseHandler;
43+
command.SetHandler(async (string serviceHealthId, string serviceHealthIssueId, FileInfo file, FormatterType output, IOutputFormatterFactory outputFormatterFactory, IConsole console) => {
4544
var requestInfo = CreateGetRequestInformation(q => {
4645
});
47-
await RequestAdapter.SendNoContentAsync(requestInfo, responseHandler);
48-
// Print request output. What if the request has no return?
49-
var responseProcessor = serviceProvider.GetService(typeof(IResponseProcessor)) as IResponseProcessor;
50-
var factory = serviceProvider.GetService(typeof(IOutputFormatterFactory)) as IOutputFormatterFactory;
51-
var formatter = factory.GetFormatter(output);
52-
if (responseProcessor.IsResponseSuccessful(responseHandler)) {
53-
var content = await responseProcessor.ExtractStreamResponseAsync(responseHandler);
54-
if (file == null) {
55-
formatter.WriteOutput(content, console);
56-
}
57-
else {
58-
using var writeStream = file.OpenWrite();
59-
await content.CopyToAsync(writeStream);
60-
console.WriteLine($"Content written to {file.FullName}.");
61-
}
46+
var response = await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo);
47+
var formatter = outputFormatterFactory.GetFormatter(output);
48+
if (file == null) {
49+
formatter.WriteOutput(response, console);
6250
}
6351
else {
64-
var content = await responseProcessor.ExtractStringResponseAsync(responseHandler);
65-
console.WriteLine(content);
52+
using var writeStream = file.OpenWrite();
53+
await response.CopyToAsync(writeStream);
54+
console.WriteLine($"Content written to {file.FullName}.");
6655
}
67-
}, serviceHealthIdOption, serviceHealthIssueIdOption, fileOption, outputOption, new ServiceProviderBinder());
56+
}, serviceHealthIdOption, serviceHealthIssueIdOption, fileOption, outputOption, new OutputFormatterFactoryBinder());
6857
return command;
6958
}
7059
/// <summary>

0 commit comments

Comments
 (0)