From fb061929a2348755accd9dd625d605de232a3b92 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 15 Nov 2024 09:34:06 -0500 Subject: [PATCH 1/3] feat: upgrades to kiota bundle to simplify dependencies management Signed-off-by: Vincent Biret --- src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj | 9 ++------- .../Requests/BaseGraphRequestAdapter.cs | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj index 5648a634f..fed39e097 100644 --- a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj +++ b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj @@ -65,13 +65,8 @@ - - - - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Microsoft.Graph.Core/Requests/BaseGraphRequestAdapter.cs b/src/Microsoft.Graph.Core/Requests/BaseGraphRequestAdapter.cs index cf33717bd..c4f0634f2 100644 --- a/src/Microsoft.Graph.Core/Requests/BaseGraphRequestAdapter.cs +++ b/src/Microsoft.Graph.Core/Requests/BaseGraphRequestAdapter.cs @@ -8,12 +8,12 @@ namespace Microsoft.Graph using Microsoft.Kiota.Abstractions; using Microsoft.Kiota.Abstractions.Authentication; using Microsoft.Kiota.Abstractions.Serialization; - using Microsoft.Kiota.Http.HttpClientLibrary; + using Microsoft.Kiota.Bundle; /// /// The instance for use with microsoft graph /// - public class BaseGraphRequestAdapter : HttpClientRequestAdapter + public class BaseGraphRequestAdapter : DefaultRequestAdapter { /// /// The public constructor for From abc44e2549c13a9cb668f236ee1b1d79df8b7484 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 16 Dec 2024 08:31:04 -0500 Subject: [PATCH 2/3] chore: bumps bundle to latest --- src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj index 82418ea69..cdf1feb63 100644 --- a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj +++ b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj @@ -65,7 +65,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive From 13b570e34228df5aaa21268c4f0bca40e97a9194 Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Tue, 28 Jan 2025 11:41:29 +0300 Subject: [PATCH 3/3] resolve merge conflicts. --- src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj index 013acef13..ea72ae451 100644 --- a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj +++ b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj @@ -65,8 +65,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all