Format dev package layout for Windows/Linux to meet CLI needs

2 files changed, 48 insertions, 10 deletions

diff --git a/src/.nuget/toolchain.ubuntu.14.04-x64.Microsoft.DotNet.ILCompiler.Development.nuspec b/src/.nuget/toolchain.ubuntu.14.04-x64.Microsoft.DotNet.ILCompiler.Development.nuspec
new file mode 100644
index 000000000..7798233d4
--- /dev/null
+++ b/src/.nuget/toolchain.ubuntu.14.04-x64.Microsoft.DotNet.ILCompiler.Development.nuspec
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>toolchain.ubuntu.14.04-x64.Microsoft.DotNet.ILCompiler.Development</id>
+    <version>1.0.0-prerelease</version>
+    <title>Microsoft .NET Native Toolchain - Development Version</title>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <licenseUrl>http://go.microsoft.com/fwlink/?LinkId=329770</licenseUrl>
+    <projectUrl>https://github.com/dotnet/corert</projectUrl>
+    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>Provides the toolchain to compile managed code to native.</description>
+    <releaseNotes>Initial release</releaseNotes>
+    <copyright>Copyright &#169; Microsoft Corporation</copyright>
+    <dependencies>
+        <dependency id="Microsoft.DiaSymReader" version="1.0.6" />
+    </dependencies>
+  </metadata>
+  <files>
+      <file src="../ilc.dll" target="ilc.dll" />
+      <file src="../ilc.exe" target="ilc.exe" />
+      <file src="../ILCompiler.Compiler.dll" target="ILCompiler.Compiler.dll" />
+      <file src="../ILCompiler.DependencyAnalysisFramework.dll" target="ILCompiler.DependencyAnalysisFramework.dll" />
+      <file src="../ILCompiler.TypeSystem.dll" target="ILCompiler.TypeSystem.dll" />
+      <file src="../lib/libRuntime.a" target="libRuntime.a" />
+      <file src="../lib/libPortableRuntime.a" target="libPortableRuntime.a" />
+      <file src="../lib/libbootstrapper.a" target="libbootstrapper.a" />
+      <file src="../lib/libbootstrappercpp.a" target="libbootstrappercpp.a" />
+      <file src="../lib/libSystem.Private.CoreLib.Native.a" target="libSystem.Private.CoreLib.Native.a" />
+      <file src="../System.Private.Corelib.dll" target="System.Private.Corelib.dll" />
+      <file src="../ToolRuntime/*.dll" />
+      <file src="../ToolRuntime/*.so" />
+      <file src="../ToolRuntime/corerun" target="corerun" />
+      <file src="../../../../packages/Microsoft.DiaSymReader/1.0.6/lib/portable-net45+win8/Microsoft.DiaSymReader.dll" />
+  </files>
+</package>
diff --git a/src/.nuget/toolchain.win7-x64.Microsoft.DotNet.ILCompiler.Development.nuspec b/src/.nuget/toolchain.win7-x64.Microsoft.DotNet.ILCompiler.Development.nuspec
index d00877179..c54ad7fce 100644
--- a/src/.nuget/toolchain.win7-x64.Microsoft.DotNet.ILCompiler.Development.nuspec
+++ b/src/.nuget/toolchain.win7-x64.Microsoft.DotNet.ILCompiler.Development.nuspec
@@ -19,21 +19,22 @@
   </metadata>
   <files>
     <file src="..\ilc.dll" target="ilc.dll" />
+    <file src="..\ilc.exe" target="ilc.exe" />
     <file src="..\ilc.pdb" target="pdb\ilc.pdb" />
     <file src="..\ILCompiler.Compiler.dll" target="ILCompiler.Compiler.dll" />
-    <file src="..\ILCompiler.Compiler.pdb" target="pdb\ILCompiler.Compiler.pdb" />
+    <file src="..\ILCompiler.Compiler.pdb" target="ILCompiler.Compiler.pdb" />
     <file src="..\ILCompiler.DependencyAnalysisFramework.dll" target="ILCompiler.DependencyAnalysisFramework.dll" />
-    <file src="..\ILCompiler.DependencyAnalysisFramework.pdb" target="pdb\ILCompiler.DependencyAnalysisFramework.pdb" />
+    <file src="..\ILCompiler.DependencyAnalysisFramework.pdb" target="ILCompiler.DependencyAnalysisFramework.pdb" />
     <file src="..\ILCompiler.TypeSystem.dll" target="ILCompiler.TypeSystem.dll" />
-    <file src="..\ILCompiler.TypeSystem.pdb" target="pdb\ILCompiler.TypeSystem.pdb" />
-    <file src="..\lib\Runtime.lib" target="sdk\Runtime.lib" />
-    <file src="..\lib\PortableRuntime.lib" target="sdk\PortableRuntime.lib" />
-    <file src="..\lib\bootstrapper.lib" target="sdk\bootstrapper.lib" />
-    <file src="..\lib\bootstrappercpp.lib" target="sdk\bootstrappercpp.lib" />
-    <file src="..\System.Private.Corelib.dll" target="sdk\System.Private.Corelib.dll" />
-    <file src="..\System.Private.Corelib.pdb" target="pdb\System.Private.Corelib.pdb" />
+    <file src="..\ILCompiler.TypeSystem.pdb" target="ILCompiler.TypeSystem.pdb" />
+    <file src="..\lib\Runtime.lib" target="Runtime.lib" />
+    <file src="..\lib\PortableRuntime.lib" target="PortableRuntime.lib" />
+    <file src="..\lib\bootstrapper.lib" target="bootstrapper.lib" />
+    <file src="..\lib\bootstrappercpp.lib" target="bootstrappercpp.lib" />
+    <file src="..\System.Private.Corelib.dll" target="System.Private.Corelib.dll" />
+    <file src="..\System.Private.Corelib.pdb" target="System.Private.Corelib.pdb" />
     <file src="..\toolruntime\*.dll" />
-    <file src="..\toolruntime\coreconsole.exe" target="ilc.exe" />
+    <file src="..\toolruntime\corerun.exe" target="corerun.exe" />
     <file src="..\..\..\..\packages\Microsoft.DiaSymReader\1.0.6\lib\portable-net45+win8\Microsoft.DiaSymReader.dll" />
     <file src="..\..\..\..\src\scripts\dotnet-compile-native.bat" />
   </files>