Fix FunctionalTests on fresh system

This commit is contained in:
Ryan Brandenburg 2018-01-09 11:10:29 -08:00
parent 9f5b1aa18a
commit 74229e57db
5 changed files with 46 additions and 15 deletions

1
.gitignore vendored
View File

@ -36,3 +36,4 @@ testWorkDir/
.dotnet/
global.json
*.binlog
test/dotnet-watch.FunctionalTests/TestProjects/NuGet.config

View File

@ -35,7 +35,10 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
CreateTestDirectory();
}
public string TempFolder { get; } = Path.Combine(Path.GetDirectoryName(FindNugetConfig()), "testWorkDir", Guid.NewGuid().ToString("N"));
public static string TestWorkFolder { get; } = Path.Combine(AppContext.BaseDirectory, "testWorkDir");
public string TempFolder { get; } = Path.Combine(TestWorkFolder, Guid.NewGuid().ToString("N"));
public string WorkFolder { get; }
@ -154,7 +157,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
private static string FindNugetConfig()
{
var currentDirPath = AppContext.BaseDirectory;
var currentDirPath = TestWorkFolder;
string nugetConfigFile;
while (true)

View File

@ -21,6 +21,32 @@
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
</ItemGroup>
<Target Name="GenerateRestoreSourcesFile" BeforeTargets="Compile">
<PropertyGroup>
<RestoreSourcesFile>$(MSBuildThisFileDirectory)/TestProjects/NuGet.config</RestoreSourcesFile>
</PropertyGroup>
<CreateItem Include="$(RestoreSources)">
<Output TaskParameter="Include" ItemName="RestoreSourcesItems"/>
</CreateItem>
<ItemGroup>
<NuGetConfigLines Include="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;" />
<NuGetConfigLines Include="&lt;configuration&gt;" />
<NuGetConfigLines Include="&lt;packageSources&gt;" />
<NuGetConfigLines Include="&lt;clear/&gt;" />
<NuGetConfigLines Include="&lt;add key=&quot;%(RestoreSourcesItems.Identity)&quot; value=&quot;%(RestoreSourcesItems.Identity)&quot; /&gt;" />
<NuGetConfigLines Include="&lt;/packageSources&gt;" />
<NuGetConfigLines Include="&lt;/configuration&gt;" />
</ItemGroup>
<WriteLinesToFile
File="$(RestoreSourcesFile)"
Lines="@(NuGetConfigLines)"
Overwrite="true"
Encoding="UTF-8" />
</Target>
<Target Name="CleanTestProjects" BeforeTargets="CoreCompile">
<RemoveDir Directories="$(TargetDir)TestProjects" Condition="Exists('$(TargetDir)TestProjects')" />
</Target>

View File

@ -83,6 +83,7 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
.SubDir("src")
.SubDir("Project1")
.WithCSharpProject("Project1", out var target)
.WithProperty("BaseIntermediateOutputPath", "obj")
.WithTargetFrameworks("netcoreapp1.0")
.Dir()
.WithFile("Program.cs")