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 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 diff --git a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj index 192cc44bf..4b6fde9d4 100644 --- a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj +++ b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj @@ -64,12 +64,12 @@ - - - - - - + + + + + + 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, }