projects / platform / core / dotnet / diagnostics.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bc07707)
Cleaning up dotnet-counters build proj files (#139)
authorSung Yoon Whang <suwhang@microsoft.com>
Sat, 16 Mar 2019 03:35:12 +0000 (20:35 -0700)
committerGitHub <noreply@github.com>
Sat, 16 Mar 2019 03:35:12 +0000 (20:35 -0700)
* cleanup build proj files for dotnet-counters, add dotnet-counters to diagnostics.sln

* Update dotnet-counters.csproj to enable it to be signed properly

* fix toolcommandname

diagnostics.sln patch | blob | history
src/Tools/dotnet-counters/dotnet-counters.csproj patch | blob | history

diff --git a/diagnostics.sln b/diagnostics.sln
index 14376379494a5a59c3ca284e67d598bd6708c6dc..d5da8fd2ac45fedbe5386f33b2d9739b05b6cfca 100644 (file)
--- a/diagnostics.sln
+++ b/diagnostics.sln
@@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SOS.Hosting", "src\SOS\SOS.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostic.Repl", "src\Microsoft.Diagnostic.Repl\Microsoft.Diagnostic.Repl.csproj", "{90CF2633-58F0-44EE-943B-D70207455F20}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-counters", "src\Tools\dotnet-counters\dotnet-counters.csproj", "{2A9B5988-982F-4E26-9E44-D38AC5978C30}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Checked|Any CPU = Checked|Any CPU
@@ -637,6 +639,46 @@ Global
                {90CF2633-58F0-44EE-943B-D70207455F20}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
                {90CF2633-58F0-44EE-943B-D70207455F20}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
                {90CF2633-58F0-44EE-943B-D70207455F20}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|Any CPU.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|ARM.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|ARM.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|ARM64.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|ARM64.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|x64.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|x64.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|x86.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Checked|x86.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|ARM.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|ARM.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|ARM64.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|x64.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|x64.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|x86.ActiveCfg = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Debug|x86.Build.0 = Debug|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|Any CPU.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|ARM.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|ARM.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|ARM64.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|ARM64.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|x64.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|x64.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|x86.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.Release|x86.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
+               {2A9B5988-982F-4E26-9E44-D38AC5978C30}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
                {718350FA-2DD9-4950-BA41-D7A7F66DAC91}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
                {718350FA-2DD9-4950-BA41-D7A7F66DAC91}.Checked|Any CPU.Build.0 = Debug|Any CPU
                {718350FA-2DD9-4950-BA41-D7A7F66DAC91}.Checked|ARM.ActiveCfg = Debug|Any CPU
diff --git a/src/Tools/dotnet-counters/dotnet-counters.csproj b/src/Tools/dotnet-counters/dotnet-counters.csproj
index 177fb51c847423d6979644c7d0d5a158cf4c0a07..3cf98d8476344722eeb8471052a3b947751b5ec0 100644 (file)
--- a/src/Tools/dotnet-counters/dotnet-counters.csproj
+++ b/src/Tools/dotnet-counters/dotnet-counters.csproj
@@ -1,26 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-
-    <!-- Target .NET Core 2.1 so it will run on LTS -->
     <TargetFramework>netcoreapp2.1</TargetFramework>
-
-    <RootNamespace>Microsoft.Diagnostics.Tools.Counters</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
-  </PropertyGroup>
+    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
+    <!-- The package version needs to be hard coded as a stable version so "dotnet tool install -g dotnet-sos" works
+    <Version>$(VersionPrefix)</Version>
+    <PackageVersion>$(VersionPrefix)</PackageVersion>
+     -->
 
-  <ItemGroup>
-    <Compile Include="..\Common\CommandLineException.cs" Link="CommandLineException.cs" />
-    <Compile Include="..\Common\ConsoleCancellation.cs" Link="ConsoleCancellation.cs" />
-    <Compile Include="..\Common\DebugUtil.cs" Link="DebugUtil.cs" />
-  </ItemGroup>
+    <ToolCommandName>dotnet-counters</ToolCommandName>
+    <RootNamespace>Microsoft.Diagnostics.Tools.Counters</RootNamespace>
+    <Description>.NET Core Performance Counter Tool</Description>
+    <PackageTags>Diagnostic</PackageTags>
+    <PackageReleaseNotes>$(Description)</PackageReleaseNotes>
+    <!-- Need to put the shims here to sign -->
+    <PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
+
+  </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.30" />
   </ItemGroup>
 
Domain: Dotnet / Core;