From 605cb9652074c31c7e3e5155acbf8f576b3f19c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:41:19 +0000 Subject: [PATCH 1/5] chore(deps): bump the kiota-dependencies group across 3 directories with 4 updates Bumps the kiota-dependencies group with 3 updates in the / directory: [Microsoft.Kiota.Authentication.Azure](https://github.com/microsoft/kiota-dotnet), [Microsoft.Kiota.Http.HttpClientLibrary](https://github.com/microsoft/kiota-dotnet) and [Microsoft.Kiota.Serialization.Json](https://github.com/microsoft/kiota-dotnet). Bumps the kiota-dependencies group with 3 updates in the /src/Microsoft.Graph.Core directory: [Microsoft.Kiota.Authentication.Azure](https://github.com/microsoft/kiota-dotnet), [Microsoft.Kiota.Http.HttpClientLibrary](https://github.com/microsoft/kiota-dotnet) and [Microsoft.Kiota.Serialization.Json](https://github.com/microsoft/kiota-dotnet). Bumps the kiota-dependencies group with 4 updates in the /tests/Microsoft.Graph.DotnetCore.Core.Test directory: [Microsoft.Kiota.Abstractions](https://github.com/microsoft/kiota-dotnet), [Microsoft.Kiota.Authentication.Azure](https://github.com/microsoft/kiota-dotnet), [Microsoft.Kiota.Http.HttpClientLibrary](https://github.com/microsoft/kiota-dotnet) and [Microsoft.Kiota.Serialization.Json](https://github.com/microsoft/kiota-dotnet). Updates `Microsoft.Kiota.Authentication.Azure` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Http.HttpClientLibrary` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Serialization.Json` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Authentication.Azure` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Http.HttpClientLibrary` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Serialization.Json` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Authentication.Azure` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Http.HttpClientLibrary` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Serialization.Json` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) Updates `Microsoft.Kiota.Abstractions` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/microsoft/kiota-dotnet/releases) - [Changelog](https://github.com/microsoft/kiota-dotnet/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoft/kiota-dotnet/compare/v1.10.0...v1.10.1) --- updated-dependencies: - dependency-name: Microsoft.Kiota.Authentication.Azure dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Http.HttpClientLibrary dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Serialization.Json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Authentication.Azure dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Http.HttpClientLibrary dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Serialization.Json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Authentication.Azure dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Http.HttpClientLibrary dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Serialization.Json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies - dependency-name: Microsoft.Kiota.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kiota-dependencies ... Signed-off-by: dependabot[bot] --- src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj index 192cc44bf..fd4a75780 100644 --- a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj +++ b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj @@ -64,12 +64,12 @@ - - - + + + - + From 6b0c46aa94e2f286f8c1af8800f435c8fc3606cc Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 1 Aug 2024 10:43:39 -0400 Subject: [PATCH 2/5] Update src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj --- 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 fd4a75780..4b6fde9d4 100644 --- a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj +++ b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj @@ -67,8 +67,8 @@ - - + + From 8f16353c0f72ca379e379ea5946d9c02eb7b2d03 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 1 Aug 2024 16:07:21 -0400 Subject: [PATCH 3/5] chore: removes extraneous appveyor file Signed-off-by: Vincent Biret --- appveyor.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 0d8117ae3..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: 1.0.{build}-{branch} -branches: - only: - - dev - - master -image: Visual Studio 2017 - -before_build: -- cmd: >- - nuget restore -build: - verbosity: minimal - -test: - assemblies: - only: - - tests/Microsoft.Graph.Core.Test/bin/Debug/Microsoft.Graph.Core.dll - - tests/Microsoft.Graph.Test/bin/Debug/Microsoft.Graph.Test.dll -after_test: -- cmd: >- - cd tests/Microsoft.Graph.DotnetCore.Test - - dotnet test - - cd ../Microsoft.Graph.DotnetCore.Core.Test - - dotnet test - -notifications: - - # Email - - provider: Email - to: - - mmainer@microsoft.com - # - user2@email.com - subject: 'Microsoft.Graph Build {{status}}' # optional - message: "Commit {{commitId}} {{status}}." # optional - on_build_status_changed: true \ No newline at end of file From c1d798bb5bdb26471363c8f34075a45e23ab131f Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 1 Aug 2024 16:10:55 -0400 Subject: [PATCH 4/5] fix: failing unit tests due to missing enum members attributes --- .../TestModels/EnumType.cs | 3 +++ .../TestModels/EnumTypeWithFlags.cs | 5 ++++- .../TestModels/ServiceModels/TestBodyType.cs | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumType.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumType.cs index a91e10082..ce69f97ba 100644 --- a/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumType.cs +++ b/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumType.cs @@ -3,6 +3,8 @@ // ------------------------------------------------------------------------------ +using System.Runtime.Serialization; + namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels { /// @@ -10,6 +12,7 @@ namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels /// public enum EnumType { + [EnumMember(Value = "value")] Value, } } diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumTypeWithFlags.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumTypeWithFlags.cs index ba0bf4c42..8cb8dd0ca 100644 --- a/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumTypeWithFlags.cs +++ b/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/EnumTypeWithFlags.cs @@ -3,6 +3,8 @@ // ------------------------------------------------------------------------------ +using System.Runtime.Serialization; + namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels { /// @@ -11,8 +13,9 @@ namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels [System.Flags] public enum EnumTypeWithFlags { + [EnumMember(Value = "firstValue")] FirstValue = 1, - + [EnumMember(Value = "secondValue")] SecondValue = 2 } } \ No newline at end of file diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/ServiceModels/TestBodyType.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/ServiceModels/TestBodyType.cs index 430e80121..2a9960e0f 100644 --- a/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/ServiceModels/TestBodyType.cs +++ b/tests/Microsoft.Graph.DotnetCore.Core.Test/TestModels/ServiceModels/TestBodyType.cs @@ -2,6 +2,8 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information. // ------------------------------------------------------------------------------ +using System.Runtime.Serialization; + namespace Microsoft.Graph.DotnetCore.Core.Test.TestModels.ServiceModels { /// @@ -13,11 +15,13 @@ public enum TestBodyType /// /// Text /// + [EnumMember(Value = "text")] Text = 0, /// /// Html /// + [EnumMember(Value = "html")] Html = 1, } From 1c4b18d2b45414b8712843b2f5462281bac19a37 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 1 Aug 2024 16:21:23 -0400 Subject: [PATCH 5/5] fix: adds condition to validate version step Signed-off-by: Vincent Biret --- pipelines/productionBuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/pipelines/productionBuild.yml b/pipelines/productionBuild.yml index 0b5bf9eb5..93697f300 100644 --- a/pipelines/productionBuild.yml +++ b/pipelines/productionBuild.yml @@ -65,6 +65,7 @@ extends: echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)" echo "##vso[task.setvariable variable=PATH]$(JAVA_HOME_11_X64)\bin;$(PATH)" - task: PowerShell@2 + condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded()) displayName: 'Validate updated version' inputs: targetType: filePath