Fix gallery functional tests now that CPM is enabled (#10080)

* Delete unused files
* Use repo-level tools list
* Use NuGet.Services.Configuration 2.94.0 to avoid assembly load issues

The functional test runner does not support binding redirects in all cases (web UI tests). Therefore we need this version to pull in properly aligned dependencies.

Author: joelverhagen

.editorconfig

@@ -409,7 +409,8 @@ nuget.exe
 
 # Functional test results
 tests/functionaltests.*.xml
-tests/Scripts/TestResults[*].trx
+*.trx
+*.g.txt
 
 # The applicationhost.config is ignored, but already comitted on purpose
 # Reason: The localtest.me setting needs to be configured in the <sites>-section. 

.gitignore

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-    <EnablePackageVersionOverride>false</EnablePackageVersionOverride>
+    <EnablePackageVersionOverride>true</EnablePackageVersionOverride>
 
     <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
     <ServerCommonPackageVersion>2.120.0</ServerCommonPackageVersion>

Directory.Packages.props

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <config>
-    <add key="repositorypath" value="..\packages" />
-  </config>
   <packageSourceMapping>
     <clear />
     <!--

tests/.nuget/packages.config

@@ -74,11 +74,10 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
     <PackageReference Include="Microsoft.Web.Xdt" />
     <PackageReference Include="NuGet.Core" />
-    <PackageReference Include="NuGet.Services.Configuration" />
+    <PackageReference Include="NuGet.Services.Configuration" VersionOverride="2.94.0" />
     <PackageReference Include="NuGet.Versioning" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio">
-      <Version>2.8.2</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

tests/NuGet.Config tests/NuGet.configtests/NuGet.Config renamed to tests/NuGet.config

@@ -14,8 +14,11 @@ $msBuild = Join-Path $VsInstallationPath "MSBuild\Current\Bin\msbuild"
 $nuget = "$rootName\nuget.exe"
 & "$rootName\Scripts\DownloadLatestNuGetExeRelease.ps1" $rootName
 
+Write-Host "Restoring solution tools"
+& $nuget install (Join-Path $PSScriptRoot "..\..\packages.config") -SolutionDirectory (Join-Path $PSScriptRoot "..\..") -NonInteractive -ExcludeVersion
+
 # Restore packages
-Write-Host "Restoring packages"
+Write-Host "Restoring solution"
 $fullSolutionPath = "$rootName\$SolutionPath"
 & $nuget "restore" $fullSolutionPath "-NonInteractive"
 if ($LastExitCode) {

tests/NuGetGallery.FunctionalTests.Core/NuGetGallery.FunctionalTests.Core.csproj

@@ -10,8 +10,8 @@ if (Test-Path $targetNugetExePath) {
     return
 }
 
-Write-Host "nuget.exe not found in $Directory"
-
 $sourceNugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v6.10.1/nuget.exe"
 Write-Host "Downloading nuget.exe from $sourceNugetExeUrl"
+$ProgressPreference = 'SilentlyContinue'
 Invoke-WebRequest $sourceNugetExeUrl -OutFile $targetNugetExePath
+$ProgressPreference = 'Continue'

tests/Scripts/AutoDeploy.ps1

@@ -10,11 +10,10 @@ $rootName = $root.FullName
 $rootRootName = $root.parent.FullName
 
 # Required tools
-$nuget = "$rootName\nuget.exe"
 $BuiltInVsWhereExe = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
 $VsInstallationPath = & $BuiltInVsWhereExe -latest -prerelease -property installationPath
 $vsTest = Join-Path $VsInstallationPath "Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"
-$xunit = "$rootRootName\packages\xunit.runner.console.2.3.1\tools\net452\xunit.console.exe"
+$xunit = "$rootRootName\packages\xunit.runner.console\tools\net472\xunit.console.exe"
 
 # Test results files
 $functionalTestsResults = "$rootName/functionaltests.$TestCategory.xml"