From 160a82ee806c11fe23c74c8e996d8666fc4d81ec Mon Sep 17 00:00:00 2001 From: Eddy Nakamura Date: Tue, 5 May 2020 18:41:41 -0300 Subject: [PATCH] Adding sourcelink adding debugtype as portable to check symbols removing os condition update changelog for removing netstandard 1.x (#1858) since we are using msbuild, we have to set deterministic reverting updating Product.props and removing reference from all projects adding sourceroot based on github issue (https://github.com/dotnet/roslyn/issues/37379) including pdbs in output folder commenting deterministic properties and sourceroot removing cibuild from nugetprops undoing nupkg and sourceroot from directory.build --- .props/Product.props | 27 ++++++++++++++++++- .props/_Nupkg.props | 10 ++++--- .../Microsoft.ApplicationInsights.csproj | 23 ---------------- .../TelemetryChannel.csproj | 23 ---------------- CHANGELOG.md | 1 + Directory.Build.props | 5 ++-- .../DiagnosticSourceListener.csproj | 23 ---------------- LOGGING/src/EtwCollector/EtwCollector.csproj | 23 ---------------- .../EventSourceListener.csproj | 23 ---------------- LOGGING/src/ILogger/ILogger.csproj | 27 ------------------- .../Log4NetAppender/Log4NetAppender.csproj | 23 ---------------- LOGGING/src/NLogTarget/NLogTarget.csproj | 27 ------------------- .../src/TraceListener/TraceListener.csproj | 23 ---------------- ...soft.ApplicationInsights.AspNetCore.csproj | 23 ---------------- ...t.ApplicationInsights.WorkerService.csproj | 23 ---------------- .../DependencyCollector.csproj | 23 ---------------- .../EventCounterCollector.csproj | 23 ---------------- .../HostingStartup/HostingStartup.csproj | 23 ---------------- .../PerformanceCollector/Perf.csproj | 23 ---------------- WEB/Src/Web/Web/Web.csproj | 23 ---------------- .../WindowsServer/WindowsServer.csproj | 23 ---------------- 21 files changed, 36 insertions(+), 406 deletions(-) diff --git a/.props/Product.props b/.props/Product.props index 331c526dd6..8e893e024d 100644 --- a/.props/Product.props +++ b/.props/Product.props @@ -7,8 +7,33 @@ - + + + + + All + + + All + + + All + + + All + + + + + All + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + \ No newline at end of file diff --git a/.props/_Nupkg.props b/.props/_Nupkg.props index 0301b03469..1d6ccf700a 100644 --- a/.props/_Nupkg.props +++ b/.props/_Nupkg.props @@ -16,7 +16,7 @@ True snupkg - + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb @@ -39,10 +39,14 @@ For the release notes please follow http://go.microsoft.com/fwlink/?LinkId=535037 Analytics Azure ApplicationInsights Telemetry Monitoring SDK + + true + + true - + @@ -67,7 +71,7 @@ - + diff --git a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj index 22f1774bbb..86987d47b5 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj +++ b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj @@ -21,29 +21,6 @@ - - - - All - - - All - - - All - - - All - - - - - - - All - - - All diff --git a/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj b/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj index bbbc46f482..577f6c43c6 100644 --- a/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj +++ b/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj @@ -27,29 +27,6 @@ True - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c3a0ae221..658d231fe4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## VNext - [End support for NetStandard 1.x, Add support for NetStandard 2.0](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1160) +- [Add support for SourceLink.Github to all SDKs.](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1760) ## Version 2.15.0-beta1 - [WorkerService package is modified to depend on 2.1.1 on Microsoft.Extensions.DependencyInjection so that it can be used in .NET Core 2.1 projects without nuget errors.](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1677) diff --git a/Directory.Build.props b/Directory.Build.props index 524f6f1c3f..53106e49c8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,7 +26,7 @@ $(EnlistmentRoot)\..\bin $([System.IO.Path]::GetFullPath( $(BinRoot) )) - + $(EnlistmentRoot)\..\obj $([System.IO.Path]::GetFullPath( $(ObjRoot) )) @@ -43,10 +43,9 @@ $(ObjRoot)\$(Configuration)\$(RelativeOutputPathBase) $([System.IO.Path]::GetFullPath( $(IntermediateOutputPath) ))\ - - true + \ No newline at end of file diff --git a/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj b/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj index 5c0672689a..a8cc418c05 100644 --- a/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj +++ b/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj @@ -22,29 +22,6 @@ - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/LOGGING/src/EtwCollector/EtwCollector.csproj b/LOGGING/src/EtwCollector/EtwCollector.csproj index a2097502fb..c93a498c89 100644 --- a/LOGGING/src/EtwCollector/EtwCollector.csproj +++ b/LOGGING/src/EtwCollector/EtwCollector.csproj @@ -26,29 +26,6 @@ - - - - All - - - All - - - All - - - All - - - - - - - All - - - All diff --git a/LOGGING/src/EventSourceListener/EventSourceListener.csproj b/LOGGING/src/EventSourceListener/EventSourceListener.csproj index 09e8b3aa80..278038a89f 100644 --- a/LOGGING/src/EventSourceListener/EventSourceListener.csproj +++ b/LOGGING/src/EventSourceListener/EventSourceListener.csproj @@ -26,29 +26,6 @@ - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/LOGGING/src/ILogger/ILogger.csproj b/LOGGING/src/ILogger/ILogger.csproj index 3c984cdec3..1e9a4b9202 100644 --- a/LOGGING/src/ILogger/ILogger.csproj +++ b/LOGGING/src/ILogger/ILogger.csproj @@ -25,35 +25,8 @@ $(PackageTags) ILogger ILoggerBuilder ILoggerProvider - - - - All - - - All - - - All - - - All - - - - - - - All - - - - - all - runtime; build; native; contentfiles; analyzers - diff --git a/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj b/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj index 0b7e00807f..134bf0f578 100644 --- a/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj +++ b/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj @@ -17,29 +17,6 @@ $(PackageTags) Log4Net - - - - All - - - All - - - All - - - All - - - - - - - All - - - All diff --git a/LOGGING/src/NLogTarget/NLogTarget.csproj b/LOGGING/src/NLogTarget/NLogTarget.csproj index b08ed4158c..9ca7c360c9 100644 --- a/LOGGING/src/NLogTarget/NLogTarget.csproj +++ b/LOGGING/src/NLogTarget/NLogTarget.csproj @@ -17,33 +17,6 @@ $(PackageTags) NLog - - - - All - - - All - - - All - - - All - - - - - - - All - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/LOGGING/src/TraceListener/TraceListener.csproj b/LOGGING/src/TraceListener/TraceListener.csproj index 4ca26a51e3..cd8f6e2f62 100644 --- a/LOGGING/src/TraceListener/TraceListener.csproj +++ b/LOGGING/src/TraceListener/TraceListener.csproj @@ -17,29 +17,6 @@ $(PackageTags) TraceListener - - - - All - - - All - - - All - - - All - - - - - - - All - - - All diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index 8d21d3ed5f..f958e68181 100644 --- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -34,29 +34,6 @@ 1701;1702 - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj index cf2467e258..cc7dc2456f 100644 --- a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj +++ b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj @@ -28,29 +28,6 @@ $(PackageTags)worker;console;backgroundtasks; - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj index 358d403ecc..04e78cd264 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj +++ b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj @@ -25,29 +25,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj index 41b21c0298..d230b8925a 100644 --- a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj +++ b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj @@ -17,29 +17,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry ASP.NET aspnetcore Web Azure Server Services ASPX Websites Event Counters Performance Collection - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj b/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj index 899a4ebddc..5734385e6e 100644 --- a/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj +++ b/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj @@ -19,29 +19,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj index 01b35fa2b3..91f2c8e17d 100644 --- a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj @@ -18,29 +18,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry ASP.NET ASMX Web Azure Server Services ASPX Websites Performance Counters Performance Collection - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/Web/Web/Web.csproj b/WEB/Src/Web/Web/Web.csproj index f304f2dc68..53c6e09c54 100644 --- a/WEB/Src/Web/Web/Web.csproj +++ b/WEB/Src/Web/Web/Web.csproj @@ -19,29 +19,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj index 15efb4539d..93d680da9d 100644 --- a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj +++ b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj @@ -22,29 +22,6 @@ $(DefineConstants);NETSTANDARD; - - - - All - - - All - - - All - - - All - - - - - - - All - - -