From 0354989de52473018db58b55756b31c2c6193a15 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 5 Jun 2023 16:19:26 -0700 Subject: [PATCH 1/5] Fix cache path --- .../FSharp.DependencyManager.fs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs index 90193a2f57..f204b7eb98 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs @@ -312,7 +312,19 @@ type FSharpDependencyManager(outputDirectory: string option, useResultsCache: bo // if a path was supplied if it was rooted then use the rooted path as the root // if the path wasn't supplied or not rooted use the temp directory as the root. let specialDir = - Path.Combine(Environment.GetFolderPath(System.Environment.SpecialFolder.UserProfile), ".packagemanagement", "nuget") + let getProfilePath = + // If it has a directory seperator remove it + let path = Environment.GetFolderPath(System.Environment.SpecialFolder.UserProfile) + + if + (path.EndsWith(Path.DirectorySeparatorChar.ToString())) + && not (path.EndsWith(Path.AltDirectorySeparatorChar.ToString())) + then + path.Substring(0, path.Length) + else + path + // Build path to cache root + $"{getProfilePath}\\.packagemanagement\\nuget" let path = Path.Combine(Process.GetCurrentProcess().Id.ToString() + "--" + Guid.NewGuid().ToString()) From 8e30ccab2750d111302a7a8e4a1a95509c1e6247 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Mon, 5 Jun 2023 18:53:33 -0700 Subject: [PATCH 2/5] Update FSharp.DependencyManager.fs --- src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs index f204b7eb98..3625f8e135 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs @@ -324,7 +324,7 @@ type FSharpDependencyManager(outputDirectory: string option, useResultsCache: bo else path // Build path to cache root - $"{getProfilePath}\\.packagemanagement\\nuget" + $"{getProfilePath}/.packagemanagement/nuget" let path = Path.Combine(Process.GetCurrentProcess().Id.ToString() + "--" + Guid.NewGuid().ToString()) From d112620cbf0bf7ee06b8b954b0ad4db7ccc2a5ca Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Tue, 6 Jun 2023 01:29:45 -0700 Subject: [PATCH 3/5] Update src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs Co-authored-by: Tomas Grosup --- src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs index 3625f8e135..4e792f4d8d 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs @@ -318,7 +318,7 @@ type FSharpDependencyManager(outputDirectory: string option, useResultsCache: bo if (path.EndsWith(Path.DirectorySeparatorChar.ToString())) - && not (path.EndsWith(Path.AltDirectorySeparatorChar.ToString())) + || (path.EndsWith(Path.AltDirectorySeparatorChar.ToString())) then path.Substring(0, path.Length) else From 1e25c9d55524b47c0eb80eaaf9f76153d825c936 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Tue, 6 Jun 2023 01:30:13 -0700 Subject: [PATCH 4/5] Update src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs Co-authored-by: Tomas Grosup --- src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs index 4e792f4d8d..604f6bc53c 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs @@ -320,7 +320,7 @@ type FSharpDependencyManager(outputDirectory: string option, useResultsCache: bo (path.EndsWith(Path.DirectorySeparatorChar.ToString())) || (path.EndsWith(Path.AltDirectorySeparatorChar.ToString())) then - path.Substring(0, path.Length) + path.Substring(0, path.Length - 1) else path // Build path to cache root From 0c06a7acec418706eaf613b8bb4edd57a1821cce Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Tue, 6 Jun 2023 09:34:48 -0700 Subject: [PATCH 5/5] fantomas --- src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs index 604f6bc53c..cae76f9cbf 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs @@ -318,7 +318,7 @@ type FSharpDependencyManager(outputDirectory: string option, useResultsCache: bo if (path.EndsWith(Path.DirectorySeparatorChar.ToString())) - || (path.EndsWith(Path.AltDirectorySeparatorChar.ToString())) + || (path.EndsWith(Path.AltDirectorySeparatorChar.ToString())) then path.Substring(0, path.Length - 1) else