Merge pull request #720 from microsoftgraph/dev

Release 3.0.11

Author: andrueastman

.github/workflows/projectbot.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        uses: tibdex/github-app-token@0d49dd721133f900ebd5e0dff2810704e8defbc6
         with:
           app_id: ${{ secrets.GRAPHBOT_APP_ID }}
           private_key: ${{ secrets.GRAPHBOT_APP_PEM }}

.github/workflows/validatePullRequest.yml

@@ -15,7 +15,7 @@ jobs:
       solutionName: Microsoft.Graph.Core.sln
       relativePath: ./src/Microsoft.Graph.Core
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.0.0
 
       - name: Setup .NET
         uses: actions/[email protected]

src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj

@@ -21,10 +21,10 @@
     <DelaySign>false</DelaySign>
     <AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <VersionPrefix>3.0.10</VersionPrefix>
+    <VersionPrefix>3.0.11</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <PackageReleaseNotes>
-- Fixes a bug where BatchRequestContentCollection.NewBatchWithFailedRequests would fail when more than 20 requests had been sent.  
+- Fixes a bug where large file uploads would not complete due to different cased properties.  
     </PackageReleaseNotes>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -56,14 +56,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.32.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.32.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.3.1" />
     <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.0.3" />
     <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.0.8" />
     <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.0.3" />
     <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.0.1" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.0.6" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.1.1" />
     <PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">

src/Microsoft.Graph.Core/Models/UploadSession.cs

@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
@@ -39,7 +39,7 @@ internal class UploadSession : IUploadSession
         /// </summary>
         public IDictionary<string, Action<IParseNode>> GetFieldDeserializers()
         {
-            return new Dictionary<string, Action<IParseNode>> 
+            return new Dictionary<string, Action<IParseNode>> (StringComparer.OrdinalIgnoreCase)
             {
                 {"expirationDateTime", (n) => { ExpirationDateTime = n.GetDateTimeOffsetValue(); } },
                 {"nextExpectedRanges", (n) => { NextExpectedRanges = n.GetCollectionOfPrimitiveValues<string>().ToList(); } },

tests/Microsoft.Graph.DotnetCore.Core.Test/Microsoft.Graph.DotnetCore.Core.Test.csproj

@@ -23,8 +23,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="xunit" Version="2.5.0" />
     <ProjectReference Include="..\..\src\Microsoft.Graph.Core\Microsoft.Graph.Core.csproj" />
   </ItemGroup>

tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/GraphClientFactoryTests.cs

@@ -73,18 +73,21 @@ public void Should_CreatePipeline_Without_HttpMessageHandlerInput()
             using RedirectHandler redirectHandler = (RedirectHandler)retryHandler.InnerHandler;
             using ParametersNameDecodingHandler odataQueryHandler = (ParametersNameDecodingHandler)redirectHandler.InnerHandler;
             using UserAgentHandler userAgentHandler = (UserAgentHandler)odataQueryHandler.InnerHandler;
-            using GraphTelemetryHandler telemetryHandler = (GraphTelemetryHandler)userAgentHandler.InnerHandler;
+            using HeadersInspectionHandler headersInspectionHandler = (HeadersInspectionHandler)userAgentHandler.InnerHandler;
+            using GraphTelemetryHandler telemetryHandler = (GraphTelemetryHandler)headersInspectionHandler.InnerHandler;
             using MockRedirectHandler innerMost = (MockRedirectHandler)telemetryHandler.InnerHandler;
 
             Assert.NotNull(telemetryHandler);
             Assert.NotNull(userAgentHandler);
+            Assert.NotNull(headersInspectionHandler);
             Assert.NotNull(odataQueryHandler);
             Assert.NotNull(compressionHandler);
             Assert.NotNull(retryHandler);
             Assert.NotNull(redirectHandler);
             Assert.NotNull(innerMost);
             Assert.IsType<GraphTelemetryHandler>(telemetryHandler);
             Assert.IsType<ParametersNameDecodingHandler>(odataQueryHandler);
+            Assert.IsType<HeadersInspectionHandler>(headersInspectionHandler);
             Assert.IsType<CompressionHandler>(compressionHandler);
             Assert.IsType<UserAgentHandler>(userAgentHandler);
             Assert.IsType<RetryHandler>(retryHandler);
@@ -101,18 +104,21 @@ public void CreatePipelineWithHttpMessageHandlerInput()
             using RedirectHandler redirectHandler = (RedirectHandler)retryHandler.InnerHandler;
             using ParametersNameDecodingHandler odataQueryHandler = (ParametersNameDecodingHandler)redirectHandler.InnerHandler;
             using UserAgentHandler userAgentHandler = (UserAgentHandler)odataQueryHandler.InnerHandler;
-            using GraphTelemetryHandler telemetryHandler = (GraphTelemetryHandler)userAgentHandler.InnerHandler;
+            using HeadersInspectionHandler headersInspectionHandler = (HeadersInspectionHandler)userAgentHandler.InnerHandler;
+            using GraphTelemetryHandler telemetryHandler = (GraphTelemetryHandler)headersInspectionHandler.InnerHandler;
             using MockRedirectHandler innerMost = (MockRedirectHandler)telemetryHandler.InnerHandler;
 
             Assert.NotNull(telemetryHandler);
             Assert.NotNull(userAgentHandler);
+            Assert.NotNull(headersInspectionHandler);
             Assert.NotNull(odataQueryHandler);
             Assert.NotNull(compressionHandler);
             Assert.NotNull(retryHandler);
             Assert.NotNull(redirectHandler);
             Assert.NotNull(innerMost);
             Assert.IsType<GraphTelemetryHandler>(telemetryHandler);
             Assert.IsType<ParametersNameDecodingHandler>(odataQueryHandler);
+            Assert.IsType<HeadersInspectionHandler>(headersInspectionHandler);
             Assert.IsType<CompressionHandler>(compressionHandler);
             Assert.IsType<RetryHandler>(retryHandler);
             Assert.IsType<UserAgentHandler>(userAgentHandler);

tests/Microsoft.Graph.DotnetCore.Core.Test/Serialization/SerializerTests.cs

@@ -528,6 +528,30 @@ public void SerializeUploadSessionValues()
             // Expect the string to be ISO 8601-1:2019 format
             Assert.Equal(expectedString, serializedJsonString);
         }
+        
+        [Fact]
+        public void DeserializeUploadSessionValues()
+        {
+            // Act 1
+            const string camelCasedPayload = @"{""expirationDateTime"":""2016-11-20T18:23:45.9356913+00:00"",""nextExpectedRanges"":[""0 - 1000""],""uploadUrl"":""http://localhost""}";
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(camelCasedPayload));
+            var parseNode = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, memoryStream);
+            var uploadSession = parseNode.GetObjectValue(UploadSession.CreateFromDiscriminatorValue);
+            Assert.NotNull(uploadSession);
+            Assert.NotNull(uploadSession.ExpirationDateTime);
+            Assert.NotNull(uploadSession.NextExpectedRanges);
+            Assert.Single(uploadSession.NextExpectedRanges);
+            
+            // Act 1
+            const string pascalCasedPayload = @"{""ExpirationDateTime"":""2016-11-20T18:23:45.9356913+00:00"",""NextExpectedRanges"":[""0 - 1000""],""uploadUrl"":""http://localhost""}";
+            var memoryStream2 = new MemoryStream(Encoding.UTF8.GetBytes(pascalCasedPayload));
+            var parseNode2 = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, memoryStream2);
+            var uploadSession2 = parseNode2.GetObjectValue(UploadSession.CreateFromDiscriminatorValue);
+            Assert.NotNull(uploadSession2);
+            Assert.NotNull(uploadSession2.ExpirationDateTime);
+            Assert.NotNull(uploadSession2.NextExpectedRanges);
+            Assert.Single(uploadSession2.NextExpectedRanges);
+        }
 
         [Fact]
         public void SerializeServiceExceptionValues()