Skip to content

Commit

Permalink
Merge pull request #365 from LoopPerfect/fix/ssh
Browse files Browse the repository at this point in the history
remove ssh prefix and update nuget.config
  • Loading branch information
nikhedonia authored Jan 19, 2020
2 parents 98daf11 + 184d78c commit 6e7ff66
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion buckaroo-cli/buckaroo-cli.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-alpha-*" />
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-*" />
<PackageReference Include="LibGit2Sharp" Version="0.25.2" />
<ProjectReference Include="../buckaroo/buckaroo.fsproj" />
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions buckaroo-cli/nuget.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>
</configuration>
6 changes: 3 additions & 3 deletions buckaroo/PackageLocation.fs
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,21 @@ module PackageLocation =
then
"https://github.com/" + x.Owner + "/" + x.Project + ".git"
else
"ssh://[email protected]:" + x.Owner + "/" + x.Project + ".git"
"[email protected]:" + x.Owner + "/" + x.Project + ".git"

let bitBucketUrl (x : AdhocPackageIdentifier) =
if Environment.GetEnvironmentVariable "BUCKAROO_BITBUCKET_SSH" |> isNull
then
"https://bitbucket.org/" + x.Owner + "/" + x.Project + ".git"
else
"ssh://[email protected]:" + x.Owner + "/" + x.Project + ".git"
"[email protected]:" + x.Owner + "/" + x.Project + ".git"

let gitLabUrl (x : GitLabPackageIdentifier) =
if Environment.GetEnvironmentVariable "BUCKAROO_GITLAB_SSH" |> isNull
then
"https://gitlab.com/" + (x.Groups |> String.concat "/") + "/" + x.Project + ".git"
else
"ssh://[email protected]:" + (x.Groups |> String.concat "/") + "/" + x.Project + ".git"
"[email protected]:" + (x.Groups |> String.concat "/") + "/" + x.Project + ".git"

let versionSetFromLocation location =
match location with
Expand Down

0 comments on commit 6e7ff66

Please sign in to comment.