Skip to content

Commit 563d055

Browse files
authored
Merge pull request #866 from microsoftgraph/dev
Release 3.1.15
2 parents ebfc678 + b146d37 commit 563d055

8 files changed

Lines changed: 39 additions & 51 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ and this project does adheres to [Semantic Versioning](https://semver.org/spec/v
77

88
## [Unreleased]
99

10+
## [3.1.15] - 2024-08-09
11+
12+
### Changed
13+
14+
- Updates the Kiota dependencies to the latest version
15+
- Enabled Continuous Access evaluation by default.
16+
1017
## [3.1.14] - 2024-07-23
1118

1219
### Changed

appveyor.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

pipelines/productionBuild.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ extends:
6565
echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
6666
echo "##vso[task.setvariable variable=PATH]$(JAVA_HOME_11_X64)\bin;$(PATH)"
6767
- task: PowerShell@2
68+
condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded())
6869
displayName: 'Validate updated version'
6970
inputs:
7071
targetType: filePath

src/Microsoft.Graph.Core/Authentication/AzureIdentityAccessTokenProvider.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using Azure.Core;
66
using Microsoft.Kiota.Abstractions.Authentication;
7+
using System;
78
using System.Linq;
89

910
namespace Microsoft.Graph.Authentication;
@@ -12,10 +13,17 @@ namespace Microsoft.Graph.Authentication;
1213
/// An overload of the Access Token Provider that has the defaults for Microsoft Graph.
1314
/// </summary>
1415
public class AzureIdentityAccessTokenProvider : Microsoft.Kiota.Authentication.Azure.AzureIdentityAccessTokenProvider {
15-
/// <inheritdoc/>
16-
public AzureIdentityAccessTokenProvider(TokenCredential credential, string [] allowedHosts = null, Microsoft.Kiota.Authentication.Azure.ObservabilityOptions observabilityOptions = null, params string[] scopes)
17-
: base(credential, allowedHosts, observabilityOptions, scopes) {
18-
if(!allowedHosts?.Any() ?? true)
16+
/// <inheritdoc/>
17+
public AzureIdentityAccessTokenProvider(TokenCredential credential, string [] allowedHosts = null, Microsoft.Kiota.Authentication.Azure.ObservabilityOptions observabilityOptions = null, bool isCaeEnabled = true, params string[] scopes)
18+
: base(credential, allowedHosts, observabilityOptions, isCaeEnabled, scopes) {
19+
if(!allowedHosts?.Any() ?? true)
1920
AllowedHostsValidator = new AllowedHostsValidator(new string[] { "graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn", "canary.graph.microsoft.com", "graph.microsoft-ppe.com" });
2021
}
22+
23+
/// <inheritdoc/>
24+
[Obsolete("This constructor is obsolete and will be removed in a future version. Use the constructor that takes an isCaeEnabled parameter instead.")]
25+
public AzureIdentityAccessTokenProvider(TokenCredential credential, string[] allowedHosts = null, Microsoft.Kiota.Authentication.Azure.ObservabilityOptions observabilityOptions = null, params string[] scopes)
26+
: this(credential, allowedHosts, observabilityOptions, true, scopes)
27+
{
28+
}
2129
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
2222
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2323
<!-- x-release-please-start-version -->
24-
<VersionPrefix>3.1.14</VersionPrefix>
24+
<VersionPrefix>3.1.15</VersionPrefix>
2525
<!-- x-release-please-end -->
2626
<!-- VersionPrefix minor version should not be set when the change comes from the generator. It will be updated automatically. -->
2727
<!-- VersionPrefix minor version must be manually set when making manual changes to code. -->
@@ -64,13 +64,13 @@
6464
<ItemGroup>
6565
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.0.1" />
6666
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
67-
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.9.11" />
68-
<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.9.11" />
69-
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.9.11" />
70-
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.9.11" />
71-
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.9.11" />
72-
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.9.11" />
73-
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.9.11" />
67+
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.11.0" />
68+
<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.11.0" />
69+
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.11.0" />
70+
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.11.0" />
71+
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.11.0" />
72+
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.11.0" />
73+
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.11.0" />
7474
</ItemGroup>
7575
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
7676
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="[6.0,9.0)" />

tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumType.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
// ------------------------------------------------------------------------------
44

55

6+
using System.Runtime.Serialization;
7+
68
namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels
79
{
810
/// <summary>
911
/// Enum for testing enum serialization and deserialization.
1012
/// </summary>
1113
public enum EnumType
1214
{
15+
[EnumMember(Value = "value")]
1316
Value,
1417
}
1518
}

tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumTypeWithFlags.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// ------------------------------------------------------------------------------
44

55

6+
using System.Runtime.Serialization;
7+
68
namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels
79
{
810
/// <summary>
@@ -11,8 +13,9 @@ namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels
1113
[System.Flags]
1214
public enum EnumTypeWithFlags
1315
{
16+
[EnumMember(Value = "firstValue")]
1417
FirstValue = 1,
15-
18+
[EnumMember(Value = "secondValue")]
1619
SecondValue = 2
1720
}
1821
}

tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/ServiceModels/TestBodyType.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
33
// ------------------------------------------------------------------------------
44

5+
using System.Runtime.Serialization;
6+
57
namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels.ServiceModels
68
{
79
/// <summary>
@@ -13,11 +15,13 @@ public enum TestBodyType
1315
/// <summary>
1416
/// Text
1517
/// </summary>
18+
[EnumMember(Value = "text")]
1619
Text = 0,
1720

1821
/// <summary>
1922
/// Html
2023
/// </summary>
24+
[EnumMember(Value = "html")]
2125
Html = 1,
2226

2327
}

0 commit comments

Comments
 (0)