Formalize nupkg names

6 files changed, 60 insertions, 17 deletions

diff --git a/src/.nuget/Microsoft.DotNet.ILCompiler.nuspec b/src/.nuget/Microsoft.DotNet.ILCompiler.nuspec
new file mode 100644
index 000000000..507cec247
--- /dev/null
+++ b/src/.nuget/Microsoft.DotNet.ILCompiler.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Microsoft.DotNet.ILCompiler</id>
+    <version>1.0.0-prerelease</version>
+    <title>Microsoft .NET Native Toolchain</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>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="runtime.json" />
+  </files>
+</package>
+
diff --git a/src/.nuget/runtime.json b/src/.nuget/runtime.json
new file mode 100644
index 000000000..95449b38c
--- /dev/null
+++ b/src/.nuget/runtime.json
@@ -0,0 +1,20 @@
+{
+  "runtimes": {
+    "win7-x64": {
+      "Microsoft.DotNet.ILCompiler": {
+        "toolchain.win7-x64.Microsoft.DotNet.ILCompiler": "1.0.0-prerelease"
+      }
+    },
+    "ubuntu.14.04-x64": {
+      "Microsoft.DotNet.ILCompiler": {
+        "toolchain.ubuntu.14.04-x64.Microsoft.DotNet.ILCompiler": "1.0.0-prerelease"
+      }
+    },
+    "osx.10.10-x64": {
+      "Microsoft.DotNet.ILCompiler": {
+        "toolchain.osx.10.10-x64.Microsoft.DotNet.ILCompiler": "1.0.0-prerelease"
+      }
+    }
+  }
+}
+
diff --git a/src/.nuget/toolchain.Linux-x64.Microsoft.DotNet.ILCompiler.nuspec b/src/.nuget/toolchain.osx.10.10-x64.Microsoft.DotNet.ILCompiler.nuspec
index 9d011d48c..2877bef3d 100644
--- a/src/.nuget/toolchain.Linux-x64.Microsoft.DotNet.ILCompiler.nuspec
+++ b/src/.nuget/toolchain.osx.10.10-x64.Microsoft.DotNet.ILCompiler.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>toolchain.Linux-x64.Microsoft.DotNet.ILCompiler</id>
+    <id>toolchain.osx.10.10-x64.Microsoft.DotNet.ILCompiler</id>
     <version>1.0.0-prerelease</version>
     <title>Microsoft .NET Native Toolchain</title>
     <authors>Microsoft</authors>
@@ -45,11 +45,11 @@
     <file src="../ILCompiler.Compiler.dll" target="runtimes/any/lib/dotnet/ILCompiler.Compiler.dll" />
     <file src="../ILCompiler.DependencyAnalysisFramework.dll" target="runtimes/any/lib/dotnet/ILCompiler.DependencyAnalysisFramework.dll" />
     <file src="../ILCompiler.TypeSystem.dll" target="runtimes/any/lib/dotnet/ILCompiler.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" />
+    <file src="../lib/libRuntime.a" target="runtimes/osx.10.10-x64/native/sdk/libRuntime.a" />
+    <file src="../lib/libPortableRuntime.a" target="runtimes/osx.10.10-x64/native/sdk/libPortableRuntime.a" />
+    <file src="../lib/libbootstrapper.a" target="runtimes/osx.10.10-x64/native/sdk/libbootstrapper.a" />
+    <file src="../lib/libbootstrappercpp.a" target="runtimes/osx.10.10-x64/native/sdk/libbootstrappercpp.a" />
+    <file src="../lib/libSystem.Private.CoreLib.Native.a" target="runtimes/osx.10.10-x64/native/sdk/libSystem.Private.CoreLib.Native.a" />
+    <file src="../System.Private.Corelib.dll" target="runtimes/osx.10.10-x64/native/sdk/System.Private.Corelib.dll" />
   </files>
 </package>
diff --git a/src/.nuget/toolchain.OSX-x64.Microsoft.Dotnet.ILCompiler.nuspec b/src/.nuget/toolchain.ubuntu.14.04-x64.Microsoft.DotNet.ILCompiler.nuspec
index 1695db4de..c8decc1bd 100644
--- a/src/.nuget/toolchain.OSX-x64.Microsoft.Dotnet.ILCompiler.nuspec
+++ b/src/.nuget/toolchain.ubuntu.14.04-x64.Microsoft.DotNet.ILCompiler.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>toolchain.OSX-x64.Microsoft.DotNet.ILCompiler</id>
+    <id>toolchain.ubuntu.14.04-x64.Microsoft.DotNet.ILCompiler</id>
     <version>1.0.0-prerelease</version>
     <title>Microsoft .NET Native Toolchain</title>
     <authors>Microsoft</authors>
@@ -45,11 +45,11 @@
     <file src="../ILCompiler.Compiler.dll" target="runtimes/any/lib/dotnet/ILCompiler.Compiler.dll" />
     <file src="../ILCompiler.DependencyAnalysisFramework.dll" target="runtimes/any/lib/dotnet/ILCompiler.DependencyAnalysisFramework.dll" />
     <file src="../ILCompiler.TypeSystem.dll" target="runtimes/any/lib/dotnet/ILCompiler.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" />
+    <file src="../lib/libRuntime.a" target="runtimes/ubuntu.14.04-x64/native/sdk/libRuntime.a" />
+    <file src="../lib/libPortableRuntime.a" target="runtimes/ubuntu.14.04-x64/native/sdk/libPortableRuntime.a" />
+    <file src="../lib/libbootstrapper.a" target="runtimes/ubuntu.14.04-x64/native/sdk/libbootstrapper.a" />
+    <file src="../lib/libbootstrappercpp.a" target="runtimes/ubuntu.14.04-x64/native/sdk/libbootstrappercpp.a" />
+    <file src="../lib/libSystem.Private.CoreLib.Native.a" target="runtimes/ubuntu.14.04-x64/native/sdk/libSystem.Private.CoreLib.Native.a" />
+    <file src="../System.Private.Corelib.dll" target="runtimes/ubuntu.14.04-x64/native/sdk/System.Private.Corelib.dll" />
   </files>
 </package>
diff --git a/src/.nuget/toolchain.Windows_NT-x64.Microsoft.Dotnet.ILCompiler.Development.nuspec b/src/.nuget/toolchain.win7-x64.Microsoft.DotNet.ILCompiler.Development.nuspec
index 6582f27e5..d00877179 100644
--- a/src/.nuget/toolchain.Windows_NT-x64.Microsoft.Dotnet.ILCompiler.Development.nuspec
+++ b/src/.nuget/toolchain.win7-x64.Microsoft.DotNet.ILCompiler.Development.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>toolchain.Windows_NT-x64.Microsoft.DotNet.ILCompiler.Development</id>
+    <id>toolchain.win7-x64.Microsoft.DotNet.ILCompiler.Development</id>
     <version>1.0.0-prerelease</version>
     <title>Microsoft .NET Native Toolchain - Development Version</title>
     <authors>Microsoft</authors>
@@ -37,4 +37,4 @@
     <file src="..\..\..\..\packages\Microsoft.DiaSymReader\1.0.6\lib\portable-net45+win8\Microsoft.DiaSymReader.dll" />
     <file src="..\..\..\..\src\scripts\dotnet-compile-native.bat" />
   </files>
-</package>
\ No newline at end of file
+</package>
diff --git a/src/.nuget/toolchain.Windows_NT-x64.Microsoft.Dotnet.ILCompiler.nuspec b/src/.nuget/toolchain.win7-x64.Microsoft.DotNet.ILCompiler.nuspec
index c61ae8e96..121f90e20 100644
--- a/src/.nuget/toolchain.Windows_NT-x64.Microsoft.Dotnet.ILCompiler.nuspec
+++ b/src/.nuget/toolchain.win7-x64.Microsoft.DotNet.ILCompiler.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>toolchain.Windows_NT-x64.Microsoft.DotNet.ILCompiler</id>
+    <id>toolchain.win7-x64.Microsoft.DotNet.ILCompiler</id>
     <version>1.0.0-prerelease</version>
     <title>Microsoft .NET Native Toolchain</title>
     <authors>Microsoft</authors>