Skip to content

Commit b749651

Browse files
committed
Revert "Merge pull request #26764 from dotnet/marcpopMSFT-changenugetcacheconfig"
This reverts commit ddde088, reversing changes made to 72bb603.
1 parent e75ece6 commit b749651

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

build/RunTestsOnHelix.cmd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ REM call dotnet new so the first run message doesn't interfere with the first te
2929
dotnet new --debug:ephemeral-hive
3030
REM avoid potetial cocurrency issues when nuget is creating nuget.config
3131
dotnet nuget list source
32-
dir /B %DOTNET_ROOT%\.nuget
32+
REM We downloaded a special zip of files to the .nuget folder so add that as a source
33+
dotnet nuget add source %DOTNET_ROOT%\.nuget
34+
dir /B %DOTNET_ROOT%\.nuget

src/Tests/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@ private async Task<List<ITaskItem>> PrepareWorkItem(ITaskItem xunitProject)
130130

131131
string msbuildAdditionalSdkResolverFolder = netFramework ? "-e DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\\r" : IsPosixShell ? "" : "-msbuildAdditionalSdkResolverFolder %HELIX_CORRELATION_PAYLOAD%\\r";
132132

133-
// We want to add a nuget cache for predownloaded runtime packages but this appears to break the packageinstall tests. For now only enable on windows
134-
string localNugetCache = IsPosixShell || assemblyName.Contains("Microsoft.DotNet.PackageInstall.Tests") ? "" : "dotnet nuget add source %DOTNET_ROOT%\\.nuget & ";
135-
136133
var scheduler = new AssemblyScheduler(methodLimit: 32);
137134
var assemblyPartitionInfos = scheduler.Schedule(targetPath, netFramework: netFramework);
138135

@@ -146,8 +143,6 @@ private async Task<List<ITaskItem>> PrepareWorkItem(ITaskItem xunitProject)
146143
command = $"{driver} test {assemblyName} {testExecutionDirectory} {msbuildAdditionalSdkResolverFolder} {(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .\\ --logger trx {testFilter}";
147144
}
148145

149-
command = localNugetCache + command;
150-
151146
Log.LogMessage($"Creating work item with properties Identity: {assemblyName}, PayloadDirectory: {publishDirectory}, Command: {command}");
152147

153148
TimeSpan timeout = TimeSpan.FromMinutes(5);

0 commit comments

Comments
 (0)