Update packaging for tools

Move targets files in to 'toolassets'. The 'tools' folder has conventions in NuGet that we don't want applied to these packages.

Downgrade to Microsoft.NETCore.App 1.0.0

Add 'prefercliruntime' package.

src/Microsoft.DotNet.Watcher.Tools/Internal/MsBuildFileSetFactory.cs

@@ -164,8 +164,9 @@ namespace Microsoft.DotNet.Watcher.Internal
             {
                 AppContext.BaseDirectory,
                 assemblyDir,
-                Path.Combine(assemblyDir, "../../tools"), // from nuget cache
+                Path.Combine(assemblyDir, "../../toolassets"), // from nuget cache
-                Path.Combine(assemblyDir, "tools") // from local build
+                Path.Combine(assemblyDir, "toolassets"), // from local build
+                Path.Combine(AppContext.BaseDirectory, "../../toolassets"), // relative to packaged deps.json
             };
 
             var targetPath = searchPaths.Select(p => Path.Combine(p, WatchTargetsFileName)).First(File.Exists);

src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.nuspec

@@ -19,12 +19,13 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="prefercliruntime" target="\prefercliruntime" />
     <file src="dotnet-watch.dll" target="lib\netcoreapp1.0\" />
     <file src="dotnet-watch.deps.json" target="lib\netcoreapp1.0\" />
     <file src="dotnet-watch.runtimeconfig.json" target="lib\netcoreapp1.0\" />
-    <file src="tools\DotNetWatchCommon.targets" target="tools\" />
+    <file src="toolassets\DotNetWatchCommon.targets" target="toolassets\" />
-    <file src="tools\DotNetWatchInner.targets" target="tools\" />
+    <file src="toolassets\DotNetWatchInner.targets" target="toolassets\" />
-    <file src="tools\DotNetWatchOuter.targets" target="tools\" />
+    <file src="toolassets\DotNetWatchOuter.targets" target="toolassets\" />
-    <file src="tools\*.targets" target="tools\" />
+    <file src="toolassets\*.targets" target="toolassets\" />
   </files>
 </package>

src/Microsoft.DotNet.Watcher.Tools/project.json

@@ -1,22 +1,12 @@
 {
   "version": "1.0.0-*",
-  "description": "Command line tool to watch for source file changes during development and restart the dotnet command.",
-  "packOptions": {
-    "tags": [
-      "dotnet",
-      "watch"
-    ],
-    "files": {
-      "include": "tools/*.targets"
-    }
-  },
   "buildOptions": {
     "outputName": "dotnet-watch",
     "warningsAsErrors": true,
     "emitEntryPoint": true,
     "debugType": "portable",
     "keyFile": "../../tools/Key.snk",
-    "copyToOutput": "tools/*.targets",
+    "copyToOutput": "toolassets/*.targets",
     "embed": {
       "mappings": {
         "dotnetwatch.targets": "dotnetwatch.targets"
@@ -28,7 +18,8 @@
   },
   "publishOptions": {
     "include": [
-      "tools/*.targets"
+      "toolassets/*.targets",
+      "prefercliruntime"
     ]
   },
   "dependencies": {
@@ -38,7 +29,7 @@
     },
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.0.0"
     }
   },
   "frameworks": {

src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.nuspec

@@ -20,6 +20,7 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="prefercliruntime" target="\prefercliruntime" />
     <file src="dotnet-sql-cache.dll" target="lib\netcoreapp1.0\" />
     <file src="dotnet-sql-cache.deps.json" target="lib\netcoreapp1.0\" />
     <file src="dotnet-sql-cache.runtimeconfig.json" target="lib\netcoreapp1.0\" />

src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json

@@ -6,23 +6,13 @@
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "compile": "../Shared/**/*.cs"
-
   },
-  "description": "Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.",
+  "publishOptions": {
-  "packOptions": {
+    "include": "prefercliruntime"
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/aspnet/DotNetTools"
-    },
-    "tags": [
-      "cache",
-      "distributedcache",
-      "sqlserver"
-    ]
   },
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.1",
+      "version": "1.0.0",
       "type": "platform"
     },
     "System.Data.SqlClient": "4.1.0"

src/Microsoft.Extensions.SecretManager.Tools/Internal/ProjectIdResolver.cs

@@ -81,14 +81,6 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal
             return id;
         }
 
-        public void Dispose()
-        {
-            foreach (var file in _tempFiles)
-            {
-                TryDelete(file);
-            }
-        }
-
         private string GetTargetFile()
         {
             var assemblyDir = Path.GetDirectoryName(GetType().GetTypeInfo().Assembly.Location);
@@ -98,33 +90,23 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal
             {
                 AppContext.BaseDirectory,
                 assemblyDir, // next to assembly
-                Path.Combine(assemblyDir, "../../tools"), // inside the nupkg
+                Path.Combine(assemblyDir, "../../toolassets"), // inside the nupkg
+                Path.Combine(assemblyDir, "toolassets"), // for local builds
+                Path.Combine(AppContext.BaseDirectory, "../../toolassets"), // relative to packaged deps.json
             };
 
-            var foundFile = searchPaths
+            return searchPaths
                 .Select(dir => Path.Combine(dir, TargetsFileName))
                 .Where(File.Exists)
-                .FirstOrDefault();
+                .First();
+        }
 
-            if (foundFile != null)
+        public void Dispose()
+        {
+            foreach (var file in _tempFiles)
             {
-                return foundFile;
+                TryDelete(file);
             }
-
-            // This should only really happen during testing. Current build system doesn't give us a good way to ensure the
-            // test project has an always-up to date version of the targets file.
-            // TODO cleanup after we switch to an MSBuild system in which can specify "CopyToOutputDirectory: Always" to resolve this issue
-            var outputPath = Path.GetTempFileName();
-            using (var resource = GetType().GetTypeInfo().Assembly.GetManifestResourceStream(TargetsFileName))
-            using (var stream = new FileStream(outputPath, FileMode.Create))
-            {
-                resource.CopyTo(stream);
-            }
-
-            // cleanup
-            _tempFiles.Add(outputPath);
-
-            return outputPath;
         }
 
         private static void TryDelete(string file)

src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.nuspec

@@ -22,7 +22,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="FindUserSecretsProperty.targets" target="tools\" />
+    <file src="prefercliruntime" target="\prefercliruntime" />
+    <file src="toolassets\FindUserSecretsProperty.targets" target="toolassets\" />
     <file src="dotnet-user-secrets.dll" target="lib\netcoreapp1.0\" />
     <file src="dotnet-user-secrets.deps.json" target="lib\netcoreapp1.0\" />
     <file src="dotnet-user-secrets.runtimeconfig.json" target="lib\netcoreapp1.0\" />

src/Microsoft.Extensions.SecretManager.Tools/project.json

@@ -5,42 +5,21 @@
     "emitEntryPoint": true,
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "copyToOutput": "*.targets",
+    "copyToOutput": "toolassets/*.targets",
-    "embed": {
-      "mappings": {
-        "FindUserSecretsProperty.targets": "./FindUserSecretsProperty.targets"
-      }
-    },
     "compile": {
       "include": "../Shared/**/*.cs"
     }
   },
-  "description": "Command line tool to manage user secrets for Microsoft.Extensions.Configuration.",
-  "packOptions": {
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/aspnet/DotNetTools"
-    },
-    "tags": [
-      "configuration",
-      "secrets",
-      "usersecrets"
-    ],
-    "files": {
-      "mappings": {
-        "tools/FindUserSecretsProperty.targets": "FindUserSecretsProperty.targets"
-      }
-    }
-  },
   "publishOptions": {
     "include": [
-      "*.targets"
+      "toolassets/*.targets",
+      "prefercliruntime"
     ]
   },
   "dependencies": {
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0",
     "Microsoft.NETCore.App": {
-      "version": "1.0.1",
+      "version": "1.0.0",
       "type": "platform"
     }
   },

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/clean-assets.cmd

@@ -3,9 +3,9 @@
 if not "%1" == "" (
     echo "Deleting %1\TestProjects"
     rmdir /s /q %1\TestProjects
-    echo "Deleting %1\tools"
+    echo "Deleting %1\toolassets"
-    rmdir /s /q %1\tools
+    rmdir /s /q %1\toolassets
 )
 
-mkdir %1\tools
+mkdir %1\toolassets
-copy ..\..\src\Microsoft.DotNet.Watcher.Tools\tools\*.targets %1\tools
+copy ..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\*.targets %1\toolassets

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/clean-assets.sh

@@ -4,11 +4,11 @@ if [ -z $1 ]; then
     echo "Deleting $1/TestProjects"
     rm -rf $1/TestProjects
 
-    echo "Deleting $1/tools"
+    echo "Deleting $1/toolassets"
-    rm -rf $1/tools
+    rm -rf $1/toolassets
 fi
 
-mkdir -p $1/tools
+mkdir -p $1/toolassets
-cp ../../src/Microsoft.DotNet.Watcher.Tools/tools/*.targets $1/tools
+cp ../../src/Microsoft.DotNet.Watcher.Tools/toolassets/*.targets $1/toolassets
 
 exit 0

test/Microsoft.DotNet.Watcher.Tools.Tests/copyfiles.cmd

@@ -1,9 +1,9 @@
 @ECHO OFF
 :again
 if not "%1" == "" (
-    echo "Deleting %1\tools"
+    echo "Deleting %1\toolassets"
-    rmdir /s /q %1\tools
+    rmdir /s /q %1\toolassets
 )
 
-mkdir %1\tools
+mkdir %1\toolassets
-copy ..\..\src\Microsoft.DotNet.Watcher.Tools\tools\*.targets %1\tools
+copy ..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\*.targets %1\toolassets

test/Microsoft.DotNet.Watcher.Tools.Tests/copyfiles.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
 if [ -z $1 ]; then
-    echo "Deleting $1/tools"
+    echo "Deleting $1/toolassets"
-    rm -rf $1/tools
+    rm -rf $1/toolassets
 fi
 
-mkdir -p $1/tools
+mkdir -p $1/toolassets
-echo "Copying ./../src/Microsoft.DotNet.Watcher.Tools/tools/*.targets"
+echo "Copying ./../src/Microsoft.DotNet.Watcher.Tools/toolassets/*.targets"
-cp ../../src/Microsoft.DotNet.Watcher.Tools/tools/*.targets $1/tools
+cp ../../src/Microsoft.DotNet.Watcher.Tools/toolassets/*.targets $1/toolassets
 
 exit 0

test/Microsoft.Extensions.SecretManager.Tools.Tests/copyfiles.cmd

@@ -0,0 +1,9 @@
+@ECHO OFF
+:again
+if not "%1" == "" (
+    echo "Deleting %1\toolassets"
+    rmdir /s /q %1\toolassets
+)
+
+mkdir %1\toolassets
+copy ..\..\src\Microsoft.Extensions.SecretManager.Tools\toolassets\*.targets %1\toolassets

test/Microsoft.Extensions.SecretManager.Tools.Tests/copyfiles.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+if [ -z $1 ]; then
+    echo "Deleting $1/toolassets"
+    rm -rf $1/toolassets
+fi
+
+mkdir -p $1/toolassets
+echo "Copying ./../src/Microsoft.Extensions.SecretManager.Tools/toolassets/*.targets"
+cp ../../src/Microsoft.Extensions.SecretManager.Tools/toolassets/*.targets $1/toolassets
+
+exit 0

test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json

@@ -20,5 +20,8 @@
         }
       }
     }
+  },
+  "scripts": {
+    "precompile": "copyfiles %compile:OutputDir%"
   }
 }