Skip to content

Commit a042823

Browse files
KevinRansombaronfel
authored andcommitted
slight cleanup (#9686)
1 parent 951f2f9 commit a042823

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,22 @@ module FSharpDependencyManager =
103103
type ResolveDependenciesResult (success: bool, stdOut: string array, stdError: string array, resolutions: string seq, sourceFiles: string seq, roots: string seq) =
104104

105105
/// Succeded?
106-
member __.Success = success
106+
member _.Success = success
107107

108108
/// The resolution output log
109-
member __.StdOut = stdOut
109+
member _.StdOut = stdOut
110110

111111
/// The resolution error log (* process stderror *)
112-
member __.StdError = stdError
112+
member _.StdError = stdError
113113

114114
/// The resolution paths
115-
member __.Resolutions = resolutions
115+
member _.Resolutions = resolutions
116116

117117
/// The source code file paths
118-
member __.SourceFiles = sourceFiles
118+
member _.SourceFiles = sourceFiles
119119

120120
/// The roots to package directories
121-
member __.Roots = roots
121+
member _.Roots = roots
122122

123123
[<DependencyManagerAttribute>]
124124
type FSharpDependencyManager (outputDir:string option) =
@@ -159,11 +159,11 @@ type FSharpDependencyManager (outputDir:string option) =
159159

160160
do if deleteAtExit then AppDomain.CurrentDomain.ProcessExit |> Event.add(fun _ -> deleteScripts () )
161161

162-
member __.Name = name
162+
member _.Name = name
163163

164-
member __.Key = key
164+
member _.Key = key
165165

166-
member __.ResolveDependencies(scriptExt:string, packageManagerTextLines:string seq, tfm: string, rid: string) : obj =
166+
member _.ResolveDependencies(scriptExt:string, packageManagerTextLines:string seq, tfm: string, rid: string) : obj =
167167

168168
let scriptExt, poundRprefix =
169169
match scriptExt with

src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -128,37 +128,37 @@ type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyIn
128128
static member MakeResultFromObject(result: obj) = {
129129
new IResolveDependenciesResult with
130130
/// Succeded?
131-
member __.Success =
131+
member _.Success =
132132
match getInstanceProperty<bool> (result.GetType()) "Success" with
133133
| None -> false
134134
| Some p -> p.GetValue(result) :?> bool
135135

136136
/// The resolution output log
137-
member __.StdOut =
137+
member _.StdOut =
138138
match getInstanceProperty<string array> (result.GetType()) "StdOut" with
139139
| None -> Array.empty<string>
140140
| Some p -> p.GetValue(result) :?> string array
141141

142142
/// The resolution error log (* process stderror *)
143-
member __.StdError =
143+
member _.StdError =
144144
match getInstanceProperty<string array> (result.GetType()) "StdError" with
145145
| None -> Array.empty<string>
146146
| Some p -> p.GetValue(result) :?> string array
147147

148148
/// The resolution paths
149-
member __.Resolutions =
149+
member _.Resolutions =
150150
match getInstanceProperty<string seq> (result.GetType()) "Resolutions" with
151151
| None -> Seq.empty<string>
152152
| Some p -> p.GetValue(result) :?> string seq
153153

154154
/// The source code file paths
155-
member __.SourceFiles =
155+
member _.SourceFiles =
156156
match getInstanceProperty<string seq> (result.GetType()) "SourceFiles" with
157157
| None -> Seq.empty<string>
158158
| Some p -> p.GetValue(result) :?> string seq
159159

160160
/// The roots to package directories
161-
member __.Roots =
161+
member _.Roots =
162162
match getInstanceProperty<string seq> (result.GetType()) "Roots" with
163163
| None -> Seq.empty<string>
164164
| Some p -> p.GetValue(result) :?> string seq
@@ -167,32 +167,32 @@ type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyIn
167167
static member MakeResultFromFields(success: bool, stdOut: string array, stdError: string array, resolutions: string seq, sourceFiles: string seq, roots: string seq) = {
168168
new IResolveDependenciesResult with
169169
/// Succeded?
170-
member __.Success = success
170+
member _.Success = success
171171

172172
/// The resolution output log
173-
member __.StdOut = stdOut
173+
member _.StdOut = stdOut
174174

175175
/// The resolution error log (* process stderror *)
176-
member __.StdError = stdError
176+
member _.StdError = stdError
177177

178178
/// The resolution paths
179-
member __.Resolutions = resolutions
179+
member _.Resolutions = resolutions
180180

181181
/// The source code file paths
182-
member __.SourceFiles = sourceFiles
182+
member _.SourceFiles = sourceFiles
183183

184184
/// The roots to package directories
185-
member __.Roots = roots
185+
member _.Roots = roots
186186
}
187187

188188

189189
interface IDependencyManagerProvider with
190190

191191
/// Name of dependency Manager
192-
member __.Name = instance |> nameProperty
192+
member _.Name = instance |> nameProperty
193193

194194
/// Key of dependency Manager: used for #r "key: ... " E.g nuget
195-
member __.Key = instance |> keyProperty
195+
member _.Key = instance |> keyProperty
196196

197197
/// Resolve the dependencies for the given arguments
198198
member this.ResolveDependencies(scriptDir, mainScriptName, scriptName, scriptExt, packageManagerTextLines, tfm, rid): IResolveDependenciesResult =
@@ -302,7 +302,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr
302302
new DependencyProvider(Unchecked.defaultof<AssemblyResolutionProbe>, nativeProbingRoots)
303303

304304
/// Returns a formatted error message for the host to present
305-
member __.CreatePackageManagerUnknownError (compilerTools: string seq, outputDir: string, packageManagerKey: string, reportError: ResolvingErrorReport) =
305+
member _.CreatePackageManagerUnknownError (compilerTools: string seq, outputDir: string, packageManagerKey: string, reportError: ResolvingErrorReport) =
306306
let registeredKeys = String.Join(", ", RegisteredDependencyManagers compilerTools (Option.ofString outputDir) reportError |> Seq.map (fun kv -> kv.Value.Key))
307307
let searchPaths = assemblySearchPaths.Force()
308308
DependencyManager.SR.packageManagerUnknown(packageManagerKey, String.Join(", ", searchPaths, compilerTools), registeredKeys)
@@ -330,12 +330,12 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr
330330
null, Unchecked.defaultof<IDependencyManagerProvider>
331331

332332
/// Remove the dependency mager with the specified key
333-
member __.RemoveDependencyManagerKey(packageManagerKey:string, path:string): string =
333+
member _.RemoveDependencyManagerKey(packageManagerKey:string, path:string): string =
334334

335335
path.Substring(packageManagerKey.Length + 1).Trim()
336336

337337
/// Fetch a dependencymanager that supports a specific key
338-
member __.TryFindDependencyManagerByKey (compilerTools: string seq, outputDir: string, reportError: ResolvingErrorReport, key: string): IDependencyManagerProvider =
338+
member _.TryFindDependencyManagerByKey (compilerTools: string seq, outputDir: string, reportError: ResolvingErrorReport, key: string): IDependencyManagerProvider =
339339

340340
try
341341
RegisteredDependencyManagers compilerTools (Option.ofString outputDir) reportError
@@ -350,7 +350,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr
350350
Unchecked.defaultof<IDependencyManagerProvider>
351351

352352
/// Resolve reference for a list of package manager lines
353-
member __.Resolve (packageManager:IDependencyManagerProvider,
353+
member _.Resolve (packageManager:IDependencyManagerProvider,
354354
scriptExt: string,
355355
packageManagerTextLines: string seq,
356356
reportError: ResolvingErrorReport,
@@ -376,7 +376,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr
376376

377377
interface IDisposable with
378378

379-
member __.Dispose() =
379+
member _.Dispose() =
380380

381381
// Unregister everything
382382
registeredDependencyManagers <- None

0 commit comments

Comments
 (0)