Nuspec changes to be compatible with dotnet-cli

3 files changed, 99 insertions, 42 deletions

diff --git a/src/.nuget/toolchain.Linux-x64.Microsoft.DotNet.ILToNative.nuspec b/src/.nuget/toolchain.Linux-x64.Microsoft.DotNet.ILToNative.nuspec
index f14a78ca9..8376673cb 100644
--- a/src/.nuget/toolchain.Linux-x64.Microsoft.DotNet.ILToNative.nuspec
+++ b/src/.nuget/toolchain.Linux-x64.Microsoft.DotNet.ILToNative.nuspec
@@ -15,22 +15,41 @@
     <copyright>Copyright &#169; Microsoft Corporation</copyright>
     <dependencies>
         <dependency id="Microsoft.DiaSymReader" version="1.0.6" />
+        <dependency id="System.AppContext" version="4.0.0" />
+        <dependency id="System.Collections" version="4.0.10" />
+        <dependency id="System.Collections.Concurrent" version="4.0.10" />
+        <dependency id="System.Collections.Immutable" version="1.1.37" />
+        <dependency id="System.Console" version="4.0.0-beta-23419" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.10" />
+        <dependency id="System.Diagnostics.Tracing" version="4.0.20" />
+        <dependency id="System.IO" version="4.0.10" />
+        <dependency id="System.IO.FileSystem" version="4.0.0" />
+        <dependency id="System.Linq" version="4.0.0" />
+        <dependency id="System.Reflection" version="4.0.10" />
+        <dependency id="System.Reflection.Extensions" version="4.0.0" />
+        <dependency id="System.Reflection.Metadata" version="1.0.22" />
+        <dependency id="System.Reflection.Primitives" version="4.0.0" />
+        <dependency id="System.Resources.ResourceManager" version="4.0.0" />
+        <dependency id="System.Runtime" version="4.0.20" />
+        <dependency id="System.Runtime.Extensions" version="4.0.10" />
+        <dependency id="System.Runtime.InteropServices" version="4.0.20" />
+        <dependency id="System.Text.Encoding" version="4.0.10" />
+        <dependency id="System.Text.Encoding.Extensions" version="4.0.10" />
+        <dependency id="System.Threading" version="4.0.10" />
+        <dependency id="System.Threading.Tasks" version="4.0.10" />
+        <dependency id="System.Xml.ReaderWriter" version="4.0.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="../ILToNative.dll" target="ILToNative.dll" />
-    <file src="../ILToNative.Compiler.dll" target="ILToNative.Compiler.dll" />
-    <file src="../ILToNative.DependencyAnalysisFramework.dll" target="ILToNative.DependencyAnalysisFramework.dll" />
-    <file src="../ILToNative.TypeSystem.dll" target="ILToNative.TypeSystem.dll" />
-    <file src="../lib/libRuntime.a" target="sdk/libRuntime.a" />
-    <file src="../lib/libPortableRuntime.a" target="sdk/libPortableRuntime.a" />
-    <file src="../lib/libbootstrapper.a" target="sdk/libbootstrapper.a" />
-    <file src="../lib/libbootstrappercpp.a" target="sdk/libbootstrappercpp.a" />
-    <file src="../lib/libSystem.Private.CoreLib.Native.a" target="sdk/libSystem.Private.CoreLib.Native.a" />
-    <file src="../System.Private.Corelib.dll" target="sdk/System.Private.Corelib.dll" />
-    <file src="../ToolRuntime/*.dll" />
-    <file src="../ToolRuntime/*.so" />
-    <file src="../ToolRuntime/coreconsole" target="ILToNative" />
-    <file src="../../../../packages/Microsoft.DiaSymReader/1.0.6/lib/portable-net45+win8/Microsoft.DiaSymReader.dll" />
+    <file src="../ILToNative.exe" target="runtimes/any/lib/dotnet/ILToNative.exe" />
+    <file src="../ILToNative.Compiler.dll" target="runtimes/any/lib/dotnet/ILToNative.Compiler.dll" />
+    <file src="../ILToNative.DependencyAnalysisFramework.dll" target="runtimes/any/lib/dotnet/ILToNative.DependencyAnalysisFramework.dll" />
+    <file src="../ILToNative.TypeSystem.dll" target="runtimes/any/lib/dotnet/ILToNative.TypeSystem.dll" />
+    <file src="../lib/libRuntime.a" target="runtimes/Linux-x64/native/sdk/libRuntime.a" />
+    <file src="../lib/libPortableRuntime.a" target="runtimes/Linux-x64/native/sdk/libPortableRuntime.a" />
+    <file src="../lib/libbootstrapper.a" target="runtimes/Linux-x64/native/sdk/libbootstrapper.a" />
+    <file src="../lib/libbootstrappercpp.a" target="runtimes/Linux-x64/native/sdk/libbootstrappercpp.a" />
+    <file src="../lib/libSystem.Private.CoreLib.Native.a" target="runtimes/Linux-x64/native/sdk/libSystem.Private.CoreLib.Native.a" />
+    <file src="../System.Private.Corelib.dll" target="runtimes/Linux-x64/native/sdk/System.Private.Corelib.dll" />
   </files>
 </package>
diff --git a/src/.nuget/toolchain.OSX-x64.Microsoft.Dotnet.ILToNative.nuspec b/src/.nuget/toolchain.OSX-x64.Microsoft.Dotnet.ILToNative.nuspec
index 3abab4dff..bbdc79295 100644
--- a/src/.nuget/toolchain.OSX-x64.Microsoft.Dotnet.ILToNative.nuspec
+++ b/src/.nuget/toolchain.OSX-x64.Microsoft.Dotnet.ILToNative.nuspec
@@ -15,22 +15,41 @@
     <copyright>Copyright &#169; Microsoft Corporation</copyright>
     <dependencies>
         <dependency id="Microsoft.DiaSymReader" version="1.0.6" />
+        <dependency id="System.AppContext" version="4.0.0" />
+        <dependency id="System.Collections" version="4.0.10" />
+        <dependency id="System.Collections.Concurrent" version="4.0.10" />
+        <dependency id="System.Collections.Immutable" version="1.1.37" />
+        <dependency id="System.Console" version="4.0.0-beta-23419" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.10" />
+        <dependency id="System.Diagnostics.Tracing" version="4.0.20" />
+        <dependency id="System.IO" version="4.0.10" />
+        <dependency id="System.IO.FileSystem" version="4.0.0" />
+        <dependency id="System.Linq" version="4.0.0" />
+        <dependency id="System.Reflection" version="4.0.10" />
+        <dependency id="System.Reflection.Extensions" version="4.0.0" />
+        <dependency id="System.Reflection.Metadata" version="1.0.22" />
+        <dependency id="System.Reflection.Primitives" version="4.0.0" />
+        <dependency id="System.Resources.ResourceManager" version="4.0.0" />
+        <dependency id="System.Runtime" version="4.0.20" />
+        <dependency id="System.Runtime.Extensions" version="4.0.10" />
+        <dependency id="System.Runtime.InteropServices" version="4.0.20" />
+        <dependency id="System.Text.Encoding" version="4.0.10" />
+        <dependency id="System.Text.Encoding.Extensions" version="4.0.10" />
+        <dependency id="System.Threading" version="4.0.10" />
+        <dependency id="System.Threading.Tasks" version="4.0.10" />
+        <dependency id="System.Xml.ReaderWriter" version="4.0.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="../ILToNative.dll" target="ILToNative.dll" />
-    <file src="../ILToNative.Compiler.dll" target="ILToNative.Compiler.dll" />
-    <file src="../ILToNative.DependencyAnalysisFramework.dll" target="ILToNative.DependencyAnalysisFramework.dll" />
-    <file src="../ILToNative.TypeSystem.dll" target="ILToNative.TypeSystem.dll" />
-    <file src="../lib/libRuntime.a" target="sdk/libRuntime.a" />
-    <file src="../lib/libPortableRuntime.a" target="sdk/libPortableRuntime.a" />
-    <file src="../lib/libbootstrapper.a" target="sdk/libbootstrapper.a" />
-    <file src="../lib/libbootstrappercpp.a" target="sdk/libbootstrappercpp.a" />
-    <file src="../lib/libSystem.Private.CoreLib.Native.a" target="sdk/libSystem.Private.CoreLib.Native.a" />
-    <file src="../System.Private.Corelib.dll" target="sdk/System.Private.Corelib.dll" />
-    <file src="../ToolRuntime/*.dll" />
-    <file src="../ToolRuntime/*.dylib" />
-    <file src="../ToolRuntime/coreconsole" target="ILToNative" />
-    <file src="../../../../packages/Microsoft.DiaSymReader/1.0.6/lib/portable-net45+win8/Microsoft.DiaSymReader.dll" />
+    <file src="../ILToNative.exe" target="runtimes/any/lib/dotnet/ILToNative.exe" />
+    <file src="../ILToNative.Compiler.dll" target="runtimes/any/lib/dotnet/ILToNative.Compiler.dll" />
+    <file src="../ILToNative.DependencyAnalysisFramework.dll" target="runtimes/any/lib/dotnet/ILToNative.DependencyAnalysisFramework.dll" />
+    <file src="../ILToNative.TypeSystem.dll" target="runtimes/any/lib/dotnet/ILToNative.TypeSystem.dll" />
+    <file src="../lib/libRuntime.a" target="runtimes/OSX-x64/lib/dotnet/native/sdk/libRuntime.a" />
+    <file src="../lib/libPortableRuntime.a" target="runtimes/OSX-x64/native/sdk/libPortableRuntime.a" />
+    <file src="../lib/libbootstrapper.a" target="runtimes/OSX-x64/native/sdk/libbootstrapper.a" />
+    <file src="../lib/libbootstrappercpp.a" target="runtimes/OSX-x64/native/sdk/libbootstrappercpp.a" />
+    <file src="../lib/libSystem.Private.CoreLib.Native.a" target="runtimes/OSX-x64/native/sdk/libSystem.Private.CoreLib.Native.a" />
+    <file src="../System.Private.Corelib.dll" target="runtimes/OSX-x64/native/sdk/System.Private.Corelib.dll" />
   </files>
 </package>
diff --git a/src/.nuget/toolchain.Windows_NT-x64.Microsoft.Dotnet.ILToNative.nuspec b/src/.nuget/toolchain.Windows_NT-x64.Microsoft.Dotnet.ILToNative.nuspec
index 5414baa2c..56e1b1f9d 100644
--- a/src/.nuget/toolchain.Windows_NT-x64.Microsoft.Dotnet.ILToNative.nuspec
+++ b/src/.nuget/toolchain.Windows_NT-x64.Microsoft.Dotnet.ILToNative.nuspec
@@ -15,21 +15,40 @@
     <copyright>Copyright &#169; Microsoft Corporation</copyright>
     <dependencies>
         <dependency id="Microsoft.DiaSymReader" version="1.0.6" />
+        <dependency id="System.AppContext" version="4.0.0" />
+        <dependency id="System.Collections" version="4.0.10" />
+        <dependency id="System.Collections.Concurrent" version="4.0.10" />
+        <dependency id="System.Collections.Immutable" version="1.1.37" />
+        <dependency id="System.Console" version="4.0.0-beta-23419" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.10" />
+        <dependency id="System.Diagnostics.Tracing" version="4.0.20" />
+        <dependency id="System.IO" version="4.0.10" />
+        <dependency id="System.IO.FileSystem" version="4.0.0" />
+        <dependency id="System.Linq" version="4.0.0" />
+        <dependency id="System.Reflection" version="4.0.10" />
+        <dependency id="System.Reflection.Extensions" version="4.0.0" />
+        <dependency id="System.Reflection.Metadata" version="1.0.22" />
+        <dependency id="System.Reflection.Primitives" version="4.0.0" />
+        <dependency id="System.Resources.ResourceManager" version="4.0.0" />
+        <dependency id="System.Runtime" version="4.0.20" />
+        <dependency id="System.Runtime.Extensions" version="4.0.10" />
+        <dependency id="System.Runtime.InteropServices" version="4.0.20" />
+        <dependency id="System.Text.Encoding" version="4.0.10" />
+        <dependency id="System.Text.Encoding.Extensions" version="4.0.10" />
+        <dependency id="System.Threading" version="4.0.10" />
+        <dependency id="System.Threading.Tasks" version="4.0.10" />
+        <dependency id="System.Xml.ReaderWriter" version="4.0.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="..\ILToNative.dll" target="ILToNative.dll" />
-    <file src="..\ILToNative.Compiler.dll" target="ILToNative.Compiler.dll" />
-    <file src="..\ILToNative.DependencyAnalysisFramework.dll" target="ILToNative.DependencyAnalysisFramework.dll" />
-    <file src="..\ILToNative.TypeSystem.dll" target="ILToNative.TypeSystem.dll" />
-    <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="..\toolruntime\*.dll" />
-    <file src="..\toolruntime\coreconsole.exe" target="ILToNative.exe" />
-    <file src="..\..\..\..\packages\Microsoft.DiaSymReader\1.0.6\lib\portable-net45+win8\Microsoft.DiaSymReader.dll" />
-    <file src="..\..\..\..\src\scripts\dotnet-compile-native.bat" />
+    <file src="..\ILToNative.exe" target="runtimes\any\lib\dotnet\ILToNative.exe" />
+    <file src="..\ILToNative.Compiler.dll" target="runtimes\any\lib\dotnet\ILToNative.Compiler.dll" />
+    <file src="..\ILToNative.DependencyAnalysisFramework.dll" target="runtimes\any\lib\dotnet\ILToNative.DependencyAnalysisFramework.dll" />
+    <file src="..\ILToNative.TypeSystem.dll" target="runtimes\any\lib\dotnet\ILToNative.TypeSystem.dll" />
+    <file src="..\lib\Runtime.lib" target="runtimes\win7-x64\native\sdk\Runtime.lib" />
+    <file src="..\lib\PortableRuntime.lib" target="runtimes\win7-x64\native\sdk\PortableRuntime.lib" />
+    <file src="..\lib\bootstrapper.lib" target="runtimes\win7-x64\native\sdk\bootstrapper.lib" />
+    <file src="..\lib\bootstrappercpp.lib" target="runtimes\win7-x64\native\sdk\bootstrappercpp.lib" />
+    <file src="..\System.Private.Corelib.dll" target="runtimes\win7-x64\native\sdk\System.Private.Corelib.dll" />
   </files>
-</package>
\ No newline at end of file
+</package>