huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Nate McMaster 2016-12-07 09:30:18 -08:00
parent 80e6430332
commit f277816556
No known key found for this signature in database
GPG Key ID: BD729980AA6A21BD
22 changed files with 73 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.DotNet.Watcher.Tools/Internal/MsBuildFileSetFactory.cs
View File

@ -164,8 +164,9 @@ namespace Microsoft.DotNet.Watcher.Internal
{
AppContext.BaseDirectory,
assemblyDir,
Path.Combine(assemblyDir, "../../tools"), // from nuget cache
Path.Combine(assemblyDir, "tools") // from local build
Path.Combine(assemblyDir, "../../toolassets"), // from nuget cache
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);

9
src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.nuspec
View File

@ -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="tools\DotNetWatchInner.targets" target="tools\" />
<file src="tools\DotNetWatchOuter.targets" target="tools\" />
<file src="tools\*.targets" target="tools\" />
<file src="toolassets\DotNetWatchCommon.targets" target="toolassets\" />
<file src="toolassets\DotNetWatchInner.targets" target="toolassets\" />
<file src="toolassets\DotNetWatchOuter.targets" target="toolassets\" />
<file src="toolassets\*.targets" target="toolassets\" />
</files>
</package>

0
src/Microsoft.DotNet.Watcher.Tools/prefercliruntime Normal file
View File

17
src/Microsoft.DotNet.Watcher.Tools/project.json
View File

@ -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": {

0
src/Microsoft.DotNet.Watcher.Tools/tools/DotNetWatchCommon.targets → src/Microsoft.DotNet.Watcher.Tools/toolassets/DotNetWatchCommon.targets
View File

0
src/Microsoft.DotNet.Watcher.Tools/tools/DotNetWatchInner.targets → src/Microsoft.DotNet.Watcher.Tools/toolassets/DotNetWatchInner.targets
View File

0
src/Microsoft.DotNet.Watcher.Tools/tools/DotNetWatchOuter.targets → src/Microsoft.DotNet.Watcher.Tools/toolassets/DotNetWatchOuter.targets
View File

1
src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.nuspec
View File

@ -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\" />

0
src/Microsoft.Extensions.Caching.SqlConfig.Tools/prefercliruntime Normal file
View File

16
src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json
View File

@ -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.",
"packOptions": {
"repository": {
"type": "git",
"url": "https://github.com/aspnet/DotNetTools"
},
"tags": [
"cache",
"distributedcache",
"sqlserver"
]
"publishOptions": {
"include": "prefercliruntime"
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.1",
"version": "1.0.0",
"type": "platform"
},
"System.Data.SqlClient": "4.1.0"

38
src/Microsoft.Extensions.SecretManager.Tools/Internal/ProjectIdResolver.cs
View File

@ -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)

3
src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.nuspec
View File

@ -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\" />

0
src/Microsoft.Extensions.SecretManager.Tools/prefercliruntime Normal file
View File

29
src/Microsoft.Extensions.SecretManager.Tools/project.json
View File

@ -5,42 +5,21 @@
"emitEntryPoint": true,
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"copyToOutput": "*.targets",
"embed": {
"mappings": {
"FindUserSecretsProperty.targets": "./FindUserSecretsProperty.targets"
}
},
"copyToOutput": "toolassets/*.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"
}
},

0
src/Microsoft.Extensions.SecretManager.Tools/FindUserSecretsProperty.targets → src/Microsoft.Extensions.SecretManager.Tools/toolassets/FindUserSecretsProperty.targets
View File

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

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

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

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

8
test/Microsoft.DotNet.Watcher.Tools.Tests/copyfiles.cmd
View File

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

10
test/Microsoft.DotNet.Watcher.Tools.Tests/copyfiles.sh
View File

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

9
test/Microsoft.Extensions.SecretManager.Tools.Tests/copyfiles.cmd Normal file
View File

@ -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

12
test/Microsoft.Extensions.SecretManager.Tools.Tests/copyfiles.sh Executable file
View File

@ -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

3
test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json
View File

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