Merge efeedaa0ba into 5d1464d5da

dist/setup/index.js

@@ -93630,6 +93630,13 @@ class DotnetInstallScript {
         this.scriptArguments.push(...args);
         return this;
     }
+    useInstallPath(installPath) {
+        if (installPath == null) {
+            installPath = DotnetInstallDir.dirPath;
+        }
+        this.useArguments(utils_1.IS_WINDOWS ? '-Install-Dir' : '--install-dir', installPath);
+        return this;
+    }
     useVersion(dotnetVersion, quality) {
         if (dotnetVersion.type) {
             this.useArguments(dotnetVersion.type, dotnetVersion.value);
@@ -93655,6 +93662,15 @@ class DotnetInstallScript {
 }
 exports.DotnetInstallScript = DotnetInstallScript;
 class DotnetInstallDir {
+    static getInstallDirectory() {
+        if (process.env['DOTNET_INSTALL_DIR'] != null) {
+            return process.env['DOTNET_INSTALL_DIR'];
+        }
+        if (process.env['RUNNER_TOOL_CACHE'] != null) {
+            return path_1.default.join(process.env['RUNNER_TOOL_CACHE'], 'dotnet');
+        }
+        return DotnetInstallDir.default[utils_1.PLATFORM];
+    }
     static convertInstallPathToAbsolute(installDir) {
         if (path_1.default.isAbsolute(installDir))
             return path_1.default.normalize(installDir);
@@ -93677,9 +93693,7 @@ DotnetInstallDir.default = {
     mac: path_1.default.join(process.env['HOME'] + '', '.dotnet'),
     windows: path_1.default.join(process.env['PROGRAMFILES'] + '', 'dotnet')
 };
-DotnetInstallDir.dirPath = process.env['DOTNET_INSTALL_DIR']
+DotnetInstallDir.dirPath = DotnetInstallDir.convertInstallPathToAbsolute(DotnetInstallDir.getInstallDirectory());
-    ? DotnetInstallDir.convertInstallPathToAbsolute(process.env['DOTNET_INSTALL_DIR'])
-    : DotnetInstallDir.default[utils_1.PLATFORM];
 class DotnetCoreInstaller {
     constructor(version, quality) {
         this.version = version;
@@ -93700,6 +93714,8 @@ class DotnetCoreInstaller {
                 .useArguments(utils_1.IS_WINDOWS ? '-Runtime' : '--runtime', 'dotnet')
                 // Use latest stable version
                 .useArguments(utils_1.IS_WINDOWS ? '-Channel' : '--channel', 'LTS')
+                // Explicitly set the install path (see https://github.com/actions/setup-dotnet/issues/360)
+                .useInstallPath(DotnetInstallDir.dirPath)
                 .execute();
             if (runtimeInstallOutput.exitCode) {
                 /**
@@ -93717,6 +93733,8 @@ class DotnetCoreInstaller {
                 .useArguments(utils_1.IS_WINDOWS ? '-SkipNonVersionedFiles' : '--skip-non-versioned-files')
                 // Use version provided by user
                 .useVersion(dotnetVersion, this.quality)
+                // Explicitly set the install path (see https://github.com/actions/setup-dotnet/issues/360)
+                .useInstallPath(DotnetInstallDir.dirPath)
                 .execute();
             if (dotnetInstallOutput.exitCode) {
                 throw new Error(`Failed to install dotnet, exit code: ${dotnetInstallOutput.exitCode}. ${dotnetInstallOutput.stderr}`);

src/installer.ts

@@ -182,6 +182,17 @@ export class DotnetInstallScript {
     return this;
   }
 
+  public useInstallPath(installPath: string) {
+    if (installPath == null) {
+      installPath = DotnetInstallDir.dirPath;
+    }
+    this.useArguments(
+      IS_WINDOWS ? '-Install-Dir' : '--install-dir',
+      installPath
+    );
+    return this;
+  }
+
   public useVersion(dotnetVersion: DotnetVersion, quality?: QualityOptions) {
     if (dotnetVersion.type) {
       this.useArguments(dotnetVersion.type, dotnetVersion.value);
@@ -222,11 +233,20 @@ export abstract class DotnetInstallDir {
     windows: path.join(process.env['PROGRAMFILES'] + '', 'dotnet')
   };
 
-  public static readonly dirPath = process.env['DOTNET_INSTALL_DIR']
+  private static getInstallDirectory() {
-    ? DotnetInstallDir.convertInstallPathToAbsolute(
+    if (process.env['DOTNET_INSTALL_DIR'] != null) {
-        process.env['DOTNET_INSTALL_DIR']
+      return process.env['DOTNET_INSTALL_DIR'];
-      )
+    }
-    : DotnetInstallDir.default[PLATFORM];
+    if (process.env['RUNNER_TOOL_CACHE'] != null) {
+      return path.join(process.env['RUNNER_TOOL_CACHE'], 'dotnet');
+    }
+    return DotnetInstallDir.default[PLATFORM];
+  }
+
+  public static readonly dirPath =
+    DotnetInstallDir.convertInstallPathToAbsolute(
+      DotnetInstallDir.getInstallDirectory()
+    );
 
   private static convertInstallPathToAbsolute(installDir: string): string {
     if (path.isAbsolute(installDir)) return path.normalize(installDir);
@@ -275,6 +295,8 @@ export class DotnetCoreInstaller {
       .useArguments(IS_WINDOWS ? '-Runtime' : '--runtime', 'dotnet')
       // Use latest stable version
       .useArguments(IS_WINDOWS ? '-Channel' : '--channel', 'LTS')
+      // Explicitly set the install path (see https://github.com/actions/setup-dotnet/issues/360)
+      .useInstallPath(DotnetInstallDir.dirPath)
       .execute();
 
     if (runtimeInstallOutput.exitCode) {
@@ -298,6 +320,8 @@ export class DotnetCoreInstaller {
       )
       // Use version provided by user
       .useVersion(dotnetVersion, this.quality)
+      // Explicitly set the install path (see https://github.com/actions/setup-dotnet/issues/360)
+      .useInstallPath(DotnetInstallDir.dirPath)
       .execute();
 
     if (dotnetInstallOutput.exitCode) {