Fix tests when running on non-Windows, add more CI debugging

Author: dsplaisted

test/Microsoft.DotNet.PackageInstall.Tests/ToolPackageDownloaderTests.cs

@@ -304,6 +304,9 @@ public void GivenASourceInstallSucceeds(bool testMockBehaviorIsInSync)
         [InlineData(true)]
         public void GivenARelativeSourcePathInstallSucceeds(bool testMockBehaviorIsInSync)
         {
+            new RunExeCommand(Log, "dotnet", "nuget", "locals", "all", "--list")
+                .Execute().Should().Pass();
+
             var source = GetTestLocalFeedPath();
 
             var (store, storeQuery, downloader, uninstaller, reporter, fileSystem) = Setup(

test/dotnet.Tests/CommandTests/Tool/Install/ToolInstallGlobalOrToolPathCommandTests.cs

@@ -862,7 +862,10 @@ public void WhenInstallItDoesNotSkipNuGetPackageVerfication()
         [Fact]
         public void AndPackagedShimIsProvidedWhenRunWithPackageIdItCreateShimUsingPackagedShim()
         {
-            var tokenToIdentifyPackagedShim = "win64-tool";
+
+            string toolTargetRuntimeIdentifier = OperatingSystem.IsWindows() ? "win-x64" : RuntimeInformation.RuntimeIdentifier;
+
+            var tokenToIdentifyPackagedShim = $"{toolTargetRuntimeIdentifier}-tool";
 
             var result = Parser.Instance.Parse($"dotnet tool install --tool-path /tmp/folder {PackageId}");
 
@@ -874,7 +877,7 @@ public void AndPackagedShimIsProvidedWhenRunWithPackageIdItCreateShimUsingPackag
                 ToolCommandName = ToolCommandName
             };
 
-            mockPackage.AdditionalFiles[$"tools/{ToolPackageDownloaderMock2.DefaultTargetFramework}/any/shims/win-x64/{ToolCommandName}.exe"] = tokenToIdentifyPackagedShim;
+            mockPackage.AdditionalFiles[$"tools/{ToolPackageDownloaderMock2.DefaultTargetFramework}/any/shims/{toolTargetRuntimeIdentifier}/{ToolCommandName}.exe"] = tokenToIdentifyPackagedShim;
 
             _toolPackageDownloader.AddMockPackage(mockPackage);
 

test/dotnet.Tests/CommandTests/Tool/Update/ToolUpdateGlobalOrToolPathCommandTests.cs

@@ -19,7 +19,7 @@
 
 namespace Microsoft.DotNet.Tests.Commands.Tool
 {
-    public class ToolUpdateGlobalOrToolPathCommandTests
+    public class ToolUpdateGlobalOrToolPathCommandTests : SdkTest
     {
         private readonly BufferedReporter _reporter;
         private readonly IFileSystem _fileSystem;
@@ -36,7 +36,7 @@ public class ToolUpdateGlobalOrToolPathCommandTests
         private readonly string _tempDirectory;
         private readonly ToolPackageDownloaderMock2 _toolPackageDownloader;
 
-        public ToolUpdateGlobalOrToolPathCommandTests()
+        public ToolUpdateGlobalOrToolPathCommandTests(ITestOutputHelper log) : base(log)
         {
             _reporter = new BufferedReporter();
             _fileSystem = new FileSystemMockBuilder().UseCurrentSystemTemporaryDirectory().Build();
@@ -411,10 +411,15 @@ public void GivenAnExistedLowerversionWhenReinstallThrowsItRollsBack()
         [Fact]
         public void GivenPackagedShimIsProvidedWhenRunWithPackageIdItCreatesShimUsingPackagedShim()
         {
+
+            Log.WriteLine($"Current RuntimeIdentifier: {RuntimeInformation.RuntimeIdentifier}");
+
+            string toolTargetRuntimeIdentifier = OperatingSystem.IsWindows() ? "win-x64" : RuntimeInformation.RuntimeIdentifier;
+
             var extension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty;
             var tokenToIdentifyPackagedShim = "packagedShim";
             var mockPackage = _mockFeeds[0].Packages.Single(p => p.PackageId == _packageId.ToString() && p.Version == HigherPackageVersion);
-            mockPackage.AdditionalFiles[$"tools/{ToolPackageDownloaderMock2.DefaultTargetFramework}/any/shims/win-x64/{mockPackage.ToolCommandName}{extension}"] = tokenToIdentifyPackagedShim;
+            mockPackage.AdditionalFiles[$"tools/{ToolPackageDownloaderMock2.DefaultTargetFramework}/any/shims/{toolTargetRuntimeIdentifier}/{mockPackage.ToolCommandName}{extension}"] = tokenToIdentifyPackagedShim;
 
             CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute();
             _reporter.Lines.Clear();
@@ -444,14 +449,11 @@ string ExpectedCommandPath()
         private ToolInstallGlobalOrToolPathCommand CreateInstallCommand(string options, string packageId = null)
         {
             ParseResult result = Parser.Instance.Parse("dotnet tool install " + options);
-            var store = new ToolPackageStoreMock(
-                    new DirectoryPath(_toolsDirectory),
-                    _fileSystem);
 
             return new ToolInstallGlobalOrToolPathCommand(
                 result,
                 packageId is null ? _packageId : new PackageId(packageId) ,
-                (location, forwardArguments, currentWorkingDirectory) => (_store, _store, _toolPackageDownloader, new ToolPackageUninstallerMock(_fileSystem, store)),
+                (location, forwardArguments, currentWorkingDirectory) => (_store, _store, _toolPackageDownloader, new ToolPackageUninstallerMock(_fileSystem, _store)),
                 (_, _) => GetMockedShellShimRepository(),
                 _environmentPathInstructionMock,
                 _reporter);