Change how we resolve dotnet in tests (#16934)
This commit is contained in:
parent
22dedcb2f0
commit
2b2153afe6
|
|
@ -5,6 +5,7 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.Extensions.CommandLineUtils;
|
||||
|
|
@ -88,15 +89,19 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
|
|||
};
|
||||
args.AddRange(arguments);
|
||||
|
||||
var dotnetPath = typeof(WatchableApp).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
|
||||
.Single(s => s.Key == "DotnetPath").Value;
|
||||
|
||||
var spec = new ProcessSpec
|
||||
{
|
||||
Executable = DotNetMuxer.MuxerPathOrDefault(),
|
||||
Executable = dotnetPath,
|
||||
Arguments = args,
|
||||
WorkingDirectory = SourceDirectory,
|
||||
EnvironmentVariables =
|
||||
{
|
||||
["DOTNET_CLI_CONTEXT_VERBOSE"] = bool.TrueString,
|
||||
["DOTNET_USE_POLLING_FILE_WATCHER"] = UsePollingWatcher.ToString(),
|
||||
["DOTNET_ROOT"] = Directory.GetParent(dotnetPath).FullName,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,13 @@
|
|||
<ProjectReference Include="..\src\dotnet-watch.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
|
||||
<_Parameter1>DotnetPath</_Parameter1>
|
||||
<_Parameter2>$(DotNetTool)</_Parameter2>
|
||||
</AssemblyAttribute>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="CleanTestProjects" BeforeTargets="CoreCompile">
|
||||
<RemoveDir Directories="$(TargetDir)TestProjects" Condition="Exists('$(TargetDir)TestProjects')" />
|
||||
</Target>
|
||||
|
|
|
|||
Loading…
Reference in New Issue