Skip to content
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

Fixed a Few Compiler Warnings #4290

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed a Few Compiler Warnings #4290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion integrationtests/Paket.IntegrationTests/PackSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ let ``#4004 dotnet pack using different versions``() =
let ``#3599 dotnet pack should work with build metadata``() =
let project = "lib1"
let scenario = "i003599-pack-build-meta"
prepareSdk scenario
prepareSdk scenario |> ignore

let rootPath = scenarioTempPath scenario
let outPath = Path.Combine(rootPath, "out")
Expand Down
2 changes: 0 additions & 2 deletions src/Paket.Core/Dependencies/DependenciesFileParser.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ module DependenciesFileParser =
| name :: version :: rest when isVersion version ->
Some (Package(name,version,String.Join(" ",rest) |> removeComment))
| name :: rest -> Some (Package(name,">= 0", String.Join(" ",rest) |> removeComment))
| [name] -> Some (Package(name,">= 0",""))
| _ -> failwithf "could not retrieve NuGet package from %s" trimmed
| _ -> None

Expand All @@ -278,7 +277,6 @@ module DependenciesFileParser =
| name :: version :: rest when isVersion version ->
Some (CliTool(name,version,String.Join(" ",rest) |> removeComment))
| name :: rest -> Some (CliTool(name,">= 0", String.Join(" ",rest) |> removeComment))
| [name] -> Some (CliTool(name,">= 0",""))
| _ -> failwithf "could not retrieve cli tool from %s" trimmed
| _ -> None

Expand Down
2 changes: 0 additions & 2 deletions src/Paket.Core/Dependencies/NuGetV3.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,6 @@ let calculateNuGet2Path(nugetUrl:string) =
match nugetUrl.TrimEnd([|'/'|]) with
| "http://api.nuget.org/v3/index.json" -> Some "http://nuget.org/api/v2"
| "https://api.nuget.org/v3/index.json" -> Some "https://nuget.org/api/v2"
| "http://api.nuget.org/v3/index.json" -> Some "http://www.nuget.org/api/v2"
| "https://api.nuget.org/v3/index.json" -> Some "https://www.nuget.org/api/v2"
| url when url.EndsWith("/nuget/v3/index.json") -> Some (url.Replace("/nuget/v3/index.json","/nuget/v2"))
| url when url.EndsWith("/api/v3/index.json") && url.Contains("visualstudio.com") -> Some (url.Replace("/api/v3/index.json",""))
| url when url.EndsWith("/api/v3/index.json") && url.Contains("myget.org") -> Some (url.Replace("/api/v3/index.json",""))
Expand Down
12 changes: 6 additions & 6 deletions src/Paket/Commands.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ with
| Username _ -> "provide username"
| Password _ -> "provide password"
| AuthType _ -> "specify authentication type: basic|ntlm (default: basic)"
| Verify _ -> "specify in case you want to verify the credentials"
| Verify -> "specify in case you want to verify the credentials"

type ConvertFromNugetArgs =
| [<Unique;AltCommandLine("-f")>] Force
Expand Down Expand Up @@ -563,21 +563,21 @@ with
| Release_Notes_Legacy _ -> "[obsolete]"

| Lock_Dependencies -> "use version constraints from paket.lock instead of paket.dependencies"
| Lock_Dependencies_Legacy _ -> "[obsolete]"
| Lock_Dependencies_Legacy -> "[obsolete]"

| Lock_Dependencies_To_Minimum -> "use version constraints from paket.lock instead of paket.dependencies and add them as a minimum version; --lock-dependencies overrides this option"
| Lock_Dependencies_To_Minimum_Legacy _ -> "[obsolete]"
| Lock_Dependencies_To_Minimum_Legacy -> "[obsolete]"

| Pin_Project_References -> "pin dependencies generated from project references to exact versions (=) instead of using minimum versions (>=); with --lock-dependencies project references will be pinned even if this option is not specified"
| Pin_Project_References_Legacy _ -> "[obsolete]"
| Pin_Project_References_Legacy -> "[obsolete]"

| Interproject_References _ -> "set constraints for referenced project versions"

| Symbols -> "create symbol and source packages in addition to library and content packages"
| Symbols_Legacy _ -> "[obsolete]"
| Symbols_Legacy -> "[obsolete]"

| Include_Referenced_Projects -> "include symbols and source from referenced projects"
| Include_Referenced_Projects_Legacy _ -> "[obsolete]"
| Include_Referenced_Projects_Legacy -> "[obsolete]"

| Project_Url _ -> "homepage URL for the package"
| Project_Url_Legacy _ -> "[obsolete]"
Expand Down
12 changes: 6 additions & 6 deletions tests/Paket.Tests/InstallModel/PaketPropsTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ group Other1
yield! packagesInGroup ]

let outPath = System.IO.Path.GetTempFileName()
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath)
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath) |> ignore

let doc = XDocument.Load(outPath, LoadOptions.PreserveWhitespace)

Expand Down Expand Up @@ -198,7 +198,7 @@ group Other1
yield! packagesInGroup ]

let outPath = System.IO.Path.GetTempFileName()
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath)
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath) |> ignore

let doc = XDocument.Load(outPath, LoadOptions.PreserveWhitespace)

Expand Down Expand Up @@ -254,7 +254,7 @@ group Other1
yield! packagesInGroup ]

let outPath = System.IO.Path.GetTempFileName()
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath)
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath) |> ignore

let doc = XDocument.Load(outPath, LoadOptions.PreserveWhitespace)

Expand Down Expand Up @@ -344,7 +344,7 @@ group Other1
yield! packagesInGroup ]

let outPath = System.IO.Path.GetTempFileName()
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath)
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath) |> ignore

let doc = XDocument.Load(outPath, LoadOptions.PreserveWhitespace)

Expand Down Expand Up @@ -401,7 +401,7 @@ group Other2
yield! packagesInGroup ]

let outPath = System.IO.Path.GetTempFileName()
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath)
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath) |> ignore

let doc = XDocument.Load(outPath, LoadOptions.PreserveWhitespace)

Expand Down Expand Up @@ -448,7 +448,7 @@ Newtonsoft.Json
yield! packagesInGroup ]

let outPath = System.IO.Path.GetTempFileName()
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath)
Paket.RestoreProcess.createPaketPropsFile lockFile Seq.empty refFile packages (FileInfo outPath) |> ignore

let doc = XDocument.Load(outPath, LoadOptions.PreserveWhitespace)

Expand Down