Merge branch 'develop'

kgiszewski · Feb 27, 2014 · 419180c · 419180c
2 parents e97c976 + 2d05e64
commit 419180c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -90,7 +90,7 @@ module.exports = function(grunt) {
             author: '<%= pkgMeta.author %>',
             authorUrl: '<%= pkgMeta.authorUrl %>',
 
-    				files: [{ path: '..\\..\\..\\<%= dest %>\\**', target: 'content\\App_Plugins\\Archetype'}]
+    				files: [{ path: '..\\..\\..\\<%= package_temp_dir %>\\nuget\\**', target: 'content\\App_Plugins\\Archetype'}]
 	    		}
     		},
     		'files': { 
@@ -121,7 +121,7 @@ module.exports = function(grunt) {
       },
       nuget_prepare: {
         files: [
-          {expand: true, cwd: '<%= dest %>/', src: ['**/*', '!bin', '!bin/*'], dest: '<%= package_temp_dir %>/nuget/content/', flatten: false},
+          {expand: true, cwd: '<%= dest %>/', src: ['**/*', '!bin', '!bin/*'], dest: '<%= package_temp_dir %>/nuget/content/App_Plugins/Archetype', flatten: false},
           {expand: true, cwd: '<%= dest %>/', src: ['bin/**/*.dll'], dest: '<%= package_temp_dir %>/nuget/lib/net40/', flatten: true}
         ]
       },

diff --git a/pkg/meta.json b/pkg/meta.json
@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "0.5.0-alpha",
+	"version": "0.5.1-alpha",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus",
 	"authorUrl": "http://imulus.com/",

diff --git a/pkg/nuget/package.nuspec b/pkg/nuget/package.nuspec
@@ -12,9 +12,4 @@
                 <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
                 <licenseUrl><%= licenseUrl %></licenseUrl>
         </metadata>
-        <files>
-                <% files.forEach(function(file) { %>
-                        <file src="<%- file.path %>" target="<%= file.target %>" /> 
-                <% }); %>
-        </files>
 </package>