huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6807 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2 

[automated] Merge branch 'release/2.1' => 'release/2.2'
This commit is contained in:
Pranav K 2019-01-31 10:24:34 -08:00 committed by GitHub
parent 93214b465c 62d27bcd3e
commit dbc4aaa298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
View File

@ -2,7 +2,11 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks> <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
<TestGroupName>Identity.FunctionalTest</TestGroupName>
<PlatformTarget Condition=" '$(TargetFramework)' == 'netcoreapp2.2' "></PlatformTarget> <PlatformTarget Condition=" '$(TargetFramework)' == 'netcoreapp2.2' "></PlatformTarget>
<!-- These tests are completely busted in Azure Pipelines due to OutOfMemoryExceptions caused by https://github.com/aspnet/Extensions/issues/844 -->
<SkipTests Condition=" '$(BUILD_REASON)' == 'PullRequest' ">true</SkipTests>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj
View File

@ -13,6 +13,7 @@
<!-- Copy references locally so that we can use them in the test. --> <!-- Copy references locally so that we can use them in the test. -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<BuildVariablesGeneratedFile>$(MSBuildProjectDirectory)\obj\BuildVariables.generated.cs</BuildVariablesGeneratedFile> <BuildVariablesGeneratedFile>$(MSBuildProjectDirectory)\obj\BuildVariables.generated.cs</BuildVariablesGeneratedFile>
<TestGroupName>RazorTests</TestGroupName>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
View File

@ -4,6 +4,7 @@
<TargetFrameworks>netcoreapp2.2;net46</TargetFrameworks> <TargetFrameworks>netcoreapp2.2;net46</TargetFrameworks>
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
<DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants> <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
<TestGroupName>RazorTests</TestGroupName>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>