Skip to content

allow DOTNET_SCRIPT_CACHE_LOCATION to be relative #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seesharper merged 3 commits into from
Jan 31, 2023
Merged

allow DOTNET_SCRIPT_CACHE_LOCATION to be relative #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5b2d03
allow DOTNET_SCRIPT_CACHE_LOCATION to be relative
filipw Jan 31, 2023
92a605e
extra comment
filipw Jan 31, 2023
7ee51b0
Merge branch 'master' into bugfix/cache-path
seesharper Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Dotnet.Script.DependencyModel/ProjectSystem/FileUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Dotnet.Script.DependencyModel.Environment;
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using Dotnet.Script.DependencyModel.Environment;
using SysEnvironment = System.Environment;

namespace Dotnet.Script.DependencyModel.ProjectSystem
Expand Down Expand Up @@ -51,8 +51,14 @@ public static string GetTempPath()
{
// prefer the custom env variable if set
var cachePath = SysEnvironment.GetEnvironmentVariable("DOTNET_SCRIPT_CACHE_LOCATION");

if (!string.IsNullOrEmpty(cachePath))
{
// if the path is not absolute, make it relative to the current folder
if (!Path.IsPathRooted(cachePath))
{
cachePath = Path.Combine(Directory.GetCurrentDirectory(), cachePath);
}
return cachePath;
}

Expand Down
42 changes: 42 additions & 0 deletions src/Dotnet.Script.Tests/FileUtilsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
using System;
using System.IO;
using Dotnet.Script.DependencyModel.ProjectSystem;
using Xunit;

namespace Dotnet.Script.Tests
{
public class FileUtilsTests
{
[Fact]
public void GetTempPathCanBeOverridenWithAbsolutePathViaEnvVar()
{
var path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
try
{
Environment.SetEnvironmentVariable("DOTNET_SCRIPT_CACHE_LOCATION", path);
var tempPath = FileUtils.GetTempPath();
Assert.Equal(path, tempPath);
}
finally
{
Environment.SetEnvironmentVariable("DOTNET_SCRIPT_CACHE_LOCATION", null);
}
}

[Fact]
public void GetTempPathCanBeOverridenWithRelativePathViaEnvVar()
{
var path = "foo";
try
{
Environment.SetEnvironmentVariable("DOTNET_SCRIPT_CACHE_LOCATION", path);
var tempPath = FileUtils.GetTempPath();
Assert.Equal(Path.Combine(Directory.GetCurrentDirectory(), path), tempPath);
}
finally
{
Environment.SetEnvironmentVariable("DOTNET_SCRIPT_CACHE_LOCATION", null);
}
}
}
}
3 changes: 1 addition & 2 deletions src/Dotnet.Script.Tests/NuGetSourceReferenceResolverTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO;
using System.Text;
Expand Down