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

Restore test projects prior to running SDK tests (dotnet/aspnetcore-tooling#1078) 

\n\nCommit migrated from e6bb507271
This commit is contained in:
Ajay Bhargav Baaskaran 2019-09-10 17:45:59 -07:00 committed by GitHub
parent d5c2d17c11
commit 61726ae9df
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
var thumbprintLookup = new Dictionary<string, FileThumbPrint>();
// Act 1
var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
var result = await DotnetMSBuild("Build");
var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
var filesToIgnore = new[]
@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
// We want to make sure nothing changed between multiple incremental builds.
using (var razorGenDirectoryLock = LockDirectory(RazorIntermediateOutputPath))
{
result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
result = await DotnetMSBuild("Build");
}
Assert.BuildPassed(result);

16
src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
View File

@ -69,8 +69,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
bool suppressTimeout = false,
bool suppressBuildServer = false,
string buildServerPipeName = null,
MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet,
bool runRestoreBeforeBuildOrPublish = true)
MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
{
var timeout = suppressTimeout ? (TimeSpan?)Timeout.InfiniteTimeSpan : null;
@ -117,23 +116,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
if (!string.IsNullOrEmpty(target))
{
// Restore before build or publish
if (runRestoreBeforeBuildOrPublish &&
(string.Equals("Build", target, StringComparison.OrdinalIgnoreCase)
|| string.Equals("Publish", target, StringComparison.OrdinalIgnoreCase)))
{
buildArgumentList.Add($"/t:Restore");
}
buildArgumentList.Add($"/t:{target}");
}
else
{
// By default, restore then build
if (runRestoreBeforeBuildOrPublish)
{
buildArgumentList.Add($"/t:Restore");
}
buildArgumentList.Add($"/t:Build");
}

4
src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs
View File

@ -230,10 +230,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
[InitializeTestProject("PackageLibraryDirectDependency", additionalProjects: new[] { "PackageLibraryTransitiveDependency" })]
public async Task Pack_NoBuild_IncludesStaticWebAssets()
{
var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
var result = await DotnetMSBuild("Build");
Assert.BuildPassed(result, allowWarnings: true);
var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true", runRestoreBeforeBuildOrPublish: false);
var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true");
Assert.BuildPassed(pack, allowWarnings: true);
Assert.FileExists(pack, OutputPath, "PackageLibraryDirectDependency.dll");

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

@ -33,6 +33,8 @@
</RestoreSources>
</PropertyGroup>
<Import Project="$(SolutionRoot)..\..\eng\Versions.props" />
<PropertyGroup>
<!-- Working around an issue in XDT transforms -->
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>