Merge branch 'master' of https://github.com/OpenSkywalking/skywalking-netcore

README.md

@@ -50,7 +50,7 @@ sudo dotnet skywalking install
 Set the `ASPNETCORE_HOSTINGSTARTUPASSEMBLIES` and `DOTNET_ADDITIONAL_DEPS` environment variables to support the activation of the SkyWalking .NET Core Agent. 
 
 - Add the assembly name of `SkyWalking.Agent.AspNetCore` to the `ASPNETCORE_HOSTINGSTARTUPASSEMBLIES` environment variable.
-- On Windows, set the `DOTNET_ADDITIONAL_DEPS` environment variable to `%PROGRAMFILES%\dotnet\additionalDeps\skywalking.agent.aspnetcore`. On macOS/Linux, set the `DOTNET_ADDITIONAL_DEPS` environment variable to `/usr/local/share/dotnet/x64/additionalDeps/skywalking.agent.aspnetcore`.
+- On Windows, set the `DOTNET_ADDITIONAL_DEPS` environment variable to `%PROGRAMFILES%\dotnet\x64\additionalDeps\skywalking.agent.aspnetcore`. On macOS/Linux, set the `DOTNET_ADDITIONAL_DEPS` environment variable to `/usr/local/share/dotnet/x64/additionalDeps/skywalking.agent.aspnetcore`.
 
 ### Examples
 - On windows
@@ -61,7 +61,7 @@ cd sampleapp
 
 // enable SkyWalking.Agent.AspNetCore
 set ASPNETCORE_HOSTINGSTARTUPASSEMBLIES=SkyWalking.Agent.AspNetCore
-set DOTNET_ADDITIONAL_DEPS=%PROGRAMFILES%\dotnet\additionalDeps\skywalking.agent.aspnetcore
+set DOTNET_ADDITIONAL_DEPS=%PROGRAMFILES%\dotnet\x64\additionalDeps\skywalking.agent.aspnetcore
 
 // set Application_Code
 set SKYWALKING__APPLICATIONCODE=sample_app
@@ -95,10 +95,6 @@ dotnet skywalking config sample_app 192.168.0.1:11800
 # Contributing
 This section is in progress here: [Contributing to skywalking-netcore](/CONTIBUTING.md)
 
-# Roadmap
-- Expect to release 0.2 compatible in May. 2018
-- Expect to release 0.3 compatible in June. 2018
-
 # Contact Us
 * Submit an issue
 * [Gitter](https://gitter.im/openskywalking/Lobby) English

cli/SkyWalking.DotNet.CLI/Command/InstallCommand.cs

@@ -74,8 +74,9 @@ namespace SkyWalking.DotNet.CLI.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)
                 {

cli/SkyWalking.DotNet.CLI/Utils/DirectoryProvider.cs

@@ -35,7 +35,7 @@ namespace SkyWalking.DotNet.CLI.Utils
             () => "/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"));

src/SkyWalking.Agent.AspNetCore/Extensions/ServiceCollectionExtensions.cs

@@ -36,7 +36,7 @@ using SkyWalking.Transport.Grpc;
 
 namespace SkyWalking.Agent.AspNetCore
 {
-    internal static class ServiceCollectionExtensions
+    public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddSkyWalkingCore(this IServiceCollection services)
         {
@@ -58,7 +58,7 @@ namespace SkyWalking.Agent.AspNetCore
             services.AddSingleton<IHostedService, InstrumentationHostedService>();
             services.AddSingleton<IEnvironmentProvider, HostingEnvironmentProvider>();
             services.AddGrpcTransport().AddLogging();
-            services.AddSkyWalkingExtensions().AddAspNetCoreHosting().AddHttpClient().AddSqlClient().AddEntityFrameworkCore(c => c.AddSqlite().AddPomeloMysql().AddNpgsql());
+            services.AddSkyWalkingExtensions().AddAspNetCoreHosting().AddHttpClient().AddSqlClient().AddEntityFrameworkCore(c => c.AddPomeloMysql().AddNpgsql());
             return services;
         }
 

src/SkyWalking.Agent.AspNetCore/SkyWalking.Agent.AspNetCore.csproj

@@ -20,7 +20,6 @@
         <ProjectReference Include="..\SkyWalking.Diagnostics.AspNetCore\SkyWalking.Diagnostics.AspNetCore.csproj" />
         <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql\SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql.csproj" />
         <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql\SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj" />
-        <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite\SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite.csproj" />
         <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore\SkyWalking.Diagnostics.EntityFrameworkCore.csproj" />
         <ProjectReference Include="..\SkyWalking.Diagnostics.HttpClient\SkyWalking.Diagnostics.HttpClient.csproj" />
         <ProjectReference Include="..\SkyWalking.Diagnostics.SqlClient\SkyWalking.Diagnostics.SqlClient.csproj" />