From aed62cdd9f4e0c9e832d17d65cc9e0c5d2480e48 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 5 Jun 2019 15:45:12 -0700 Subject: [PATCH 1/2] Skip model binding test due to environment changes (#10923) --- .../Binders/FloatingPointTypeModelBinderTestOfT.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs index fbcb7e5893..688eb026a5 100644 --- a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs +++ b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs @@ -5,6 +5,7 @@ using System; using System.Globalization; using System.Threading.Tasks; using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders @@ -341,7 +342,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders Assert.True(bindingContext.ModelState.ContainsKey("theModelName")); } - [Theory] + [ConditionalTheory] + [OSSkipCondition(OperatingSystems.Linux, SkipReason = "https://github.com/aspnet/AspNetCore-Internal/issues/2626")] [MemberData(nameof(ConvertableTypeData))] public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_FrenchThirtyTwoThousandPointOne(Type destinationType) { From a8388b4fa481a60cbb0d630d529e15a561468b2d Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 7 Jun 2019 12:58:07 -0700 Subject: [PATCH 2/2] Add TeamName to MicroBuildCleanup@1 (#10959) --- .azure/pipelines/jobs/default-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 7de42c3b98..ae51d10a7d 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -91,12 +91,12 @@ jobs: BuildScriptArgs: ${{ parameters.buildArgs }} BuildConfiguration: ${{ parameters.configuration }} BuildDirectory: ${{ parameters.buildDirectory }} + TeamName: AspNetCore ${{ if eq(parameters.agentOs, 'Windows') }}: JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'PullRequest')) }}: _SignType: ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}: - TeamName: AspNetCore _SignType: real ${{ insert }}: ${{ parameters.variables }} steps: