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

Move to 3.0 Preview 6 SDK and 2.1.11 runtime (dotnet/aspnetcore-tooling#695) 

- add feeds that SDK no longer provides automatically when building test apps
- add another allowed build warning in some integration tests\n\nCommit migrated from cfd4698381
This commit is contained in:
Doug Bunting 2019-06-24 10:51:23 -07:00 committed by GitHub
parent ef4773a2d5
commit adfe6f09e4
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
View File

@ -23,6 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
private static readonly string[] AllowedBuildWarnings = new[] private static readonly string[] AllowedBuildWarnings = new[]
{ {
"MSB3491" , // The process cannot access the file. As long as the build succeeds, we're ok. "MSB3491" , // The process cannot access the file. As long as the build succeeds, we're ok.
"NETSDK1071", // "A PackageReference to 'Microsoft.NETCore.App' specified a Version ..."
}; };
public static void BuildPassed(MSBuildResult result, bool allowWarnings = false) public static void BuildPassed(MSBuildResult result, bool allowWarnings = false)

8
src/Razor/test/testassets/Directory.Build.props
View File

@ -11,6 +11,14 @@
<RazorSdkCurrentVersionProps>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps> <RazorSdkCurrentVersionProps>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
<RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets> <RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
<!-- Necessary while testing with unreleased packages. -->
<RestoreSources>
$(RestoreSources);
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
https://api.nuget.org/v3/index.json;
</RestoreSources>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>