Skip to content

Commit

Permalink
Hotfix/dotnet store (#88)
Browse files Browse the repository at this point in the history
* Set up CI with Azure Pipelines

* Clean up solution structure

* Delete SkyWalking.NetworkProtocol

* remove HostingStartup

* Rename "SkyWalking.AspNetCore" to "SkyWalking.Agent.AspNetCore"

* Add SkyWalking.DotNet.CLI for SkyWalking dotnet global tool

* Fix CI:  DotnetTool does not support target framework lower than netcoreapp2.1.

* Add SkyWalking.DotNet.CLI.Command parser

* Implement the "dotnet sw install" command to install the SkyWalking .NET Core Agent.

* Add SkyWalking additonalDeps

* Generate config file for SkyWalking .NET Core Agent

* Update DirectoryProvider.cs

* Fix : Access to the path is denied in windows

* Fix : Access to the path is denied in windows

* Change tmp directory log

* Fix Information log level

* Rename SkyWalking.DotNet.CLI tool command

* Update README.md

* Fix : An assembly specified in the application dependencies manifest was not found

* Update README.md

* Fix install SkyWalking DotNet CLI

* Fix dotnet store error on windows
  • Loading branch information
liuhaoyang authored and yang-xiaodong committed Oct 8, 2018
1 parent 4ad292c commit d1c59b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions cli/SkyWalking.DotNet.CLI/Command/InstallCommand.cs
Expand Up @@ -74,8 +74,9 @@ public void Execute(CommandLineApplication command)
var shell = _processFactory.Create(Shell);
shell.Exec($"git clone {git_hosting_startup} {hostingStartupDir}");
shell.Exec($"cd {Path.Combine(hostingStartupDir, "manifest")}");
shell.Exec("dotnet build --configuration Release -nowarn:NU1701");
shell.Exec($"dotnet store --manifest {manifest_proj} --framework netcoreapp2.1 --output {_directoryProvider.StoreDirectory} --runtime {Runtime} -nowarn:NU1701");
shell.Exec("dotnet build --configuration Release --verbosity q -nowarn:NU1701");
shell.Exec($"dotnet store --manifest {manifest_proj} --framework netcoreapp2.1 --output {_directoryProvider.StoreDirectory} --runtime {Runtime} --skip-symbols --verbosity q -nowarn:NU1701");
var code = _processFactory.Release(shell);
if (code != 0)
{
Expand Down
2 changes: 1 addition & 1 deletion cli/SkyWalking.DotNet.CLI/Utils/DirectoryProvider.cs
Expand Up @@ -35,7 +35,7 @@ public class DirectoryProvider
() => "/tmp");

public string DotnetDirectory => _platformInformation.GetValue(
() => Path.Combine(Environment.GetEnvironmentVariable("PROGRAMFILES"), "dotnet"),
() => Path.Combine("C:\\Progra~1", "dotnet"),
() => Path.Combine("/usr/local/share", "dotnet"),
() => Path.Combine("/usr/local/share", "dotnet"),
() => Path.Combine("/usr/local/share", "dotnet"));
Expand Down

0 comments on commit d1c59b4

Please sign in to comment.