You've already forked setup-dotnet
							
							
				mirror of
				https://github.com/actions/setup-dotnet.git
				synced 2025-11-04 17:06:35 +07:00 
			
		
		
		
	Merge pull request #34 from rojepp/fix_dotnet_root
Include version/architecture in DOTNET_ROOT Fixes #40 and #29.
This commit is contained in:
		@ -73,7 +73,7 @@ class DotnetCoreInstaller {
 | 
			
		||||
                console.log('Using cached tool');
 | 
			
		||||
            }
 | 
			
		||||
            // Need to set this so that .NET Core global tools find the right locations.
 | 
			
		||||
            core.exportVariable('DOTNET_ROOT', path.join(toolPath, '../..'));
 | 
			
		||||
            core.exportVariable('DOTNET_ROOT', toolPath);
 | 
			
		||||
            // Prepend the tools path. instructs the agent to prepend for future tasks
 | 
			
		||||
            core.addPath(toolPath);
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
@ -59,7 +59,7 @@ export class DotnetCoreInstaller {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // Need to set this so that .NET Core global tools find the right locations.
 | 
			
		||||
    core.exportVariable('DOTNET_ROOT', path.join(toolPath, '../..'));
 | 
			
		||||
    core.exportVariable('DOTNET_ROOT', toolPath);
 | 
			
		||||
 | 
			
		||||
    // Prepend the tools path. instructs the agent to prepend for future tasks
 | 
			
		||||
    core.addPath(toolPath);
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user