Fix packaging for dotnet-dump and dotnet-analyze

(work originally by mikem, I just split his mega-commit so history would a little more understandable)

diff --git a/src/Tools/dotnet-analyze/dotnet-analyze.csproj b/src/Tools/dotnet-analyze/dotnet-analyze.csproj
index 4d6db4befa532174c55f2670b7fc93ff7eb454c4..ec801f8b37542456cac134b0c01e242807ff46ea 100644 (file)
--- a/src/Tools/dotnet-analyze/dotnet-analyze.csproj
+++ b/src/Tools/dotnet-analyze/dotnet-analyze.csproj
@@ -1,17 +1,23 @@
 <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.Analyze</RootNamespace>
-
+    <RuntimeFrameworkVersion>2.1.0</RuntimeFrameworkVersion>
     <!-- Don't pack until ship engineering is done. Currently causing the official job to fail.
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
     -->
+    <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-analyze" works -->
+    <Version>1.0.0</Version>
+    <PackageVersion>1.0.0</PackageVersion>
+    <ToolCommandName>dotnet-analyze</ToolCommandName>
+    <RootNamespace>Microsoft.Diagnostics.Tools.Analyze</RootNamespace>
+    <Description>Diagnostic analyze tool</Description>
+    <PackageTags>Diagnostic</PackageTags>
+    <PackageReleaseNotes>$(Description)</PackageReleaseNotes>
+    <!-- Need to put the shims here to sign -->
+    <PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tools/dotnet-dump/dotnet-dump.csproj b/src/Tools/dotnet-dump/dotnet-dump.csproj
index 75a08525d90b39b54eb54aaa4a8c58e1e3a64365..b8453cade2e67a0ddfd0b4a6a069228624ee15e3 100644 (file)
--- a/src/Tools/dotnet-dump/dotnet-dump.csproj
+++ b/src/Tools/dotnet-dump/dotnet-dump.csproj
@@ -1,15 +1,15 @@
-<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.Dump</RootNamespace>
 
+    <!-- Don't pack until ship engineering is done. Currently causing the official job to fail.
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
+    -->
   </PropertyGroup>
 
   <ItemGroup>