diff --git a/Gruntfile.js b/Gruntfile.js index 0b1e65a..a874b74 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,8 +18,7 @@ module.exports = function(grunt) { "app/views/archetype.config.fieldset.dialog_versioned.html": "app/views/archetype.config.fieldset.dialog.html", "app/views/archetype.config_versioned.html": "app/views/archetype.config.html", "app/views/archetype_versioned.html": "app/views/archetype.html", - "app/views/archetype.default_versioned.html": "app/views/archetype.default.html", - + "app/views/archetype.default_versioned.html": "app/views/archetype.default.html" }, options: { replacements: [{ @@ -152,7 +151,7 @@ module.exports = function(grunt) { { cwd: '<%= dest %>/bin', src: ['*.dll'], - dest: 'tmp/nuget/lib/net40', + dest: 'tmp/nuget_binaries/lib/net40', expand: true } ] @@ -169,6 +168,10 @@ module.exports = function(grunt) { dist: { src: 'tmp/nuget/package.nuspec', dest: 'pkg' + }, + dist_binaries: { + src: 'tmp/nuget_binaries/package_binaries.nuspec', + dest: 'pkg' } }, @@ -182,13 +185,28 @@ module.exports = function(grunt) { license: '<%= pkgMeta.license %>', licenseUrl: '<%= pkgMeta.licenseUrl %>', author: '<%= pkgMeta.author %>', - authorUrl: '<%= pkgMeta.authorUrl %>', - files: [{ path: 'tmp/nuget/**', target: 'content/App_Plugins/Archetype'}] + authorUrl: '<%= pkgMeta.authorUrl %>' } }, 'files': { 'tmp/nuget/package.nuspec': ['config/package.nuspec'] } + }, + 'nuspec_binaries': { + 'options': { + 'data': { + name: '<%= pkgMeta.name %>.Binaries', + version: '<%= pkgMeta.version %>', + url: '<%= pkgMeta.url %>', + license: '<%= pkgMeta.license %>', + licenseUrl: '<%= pkgMeta.licenseUrl %>', + author: '<%= pkgMeta.author %>', + authorUrl: '<%= pkgMeta.authorUrl %>' + } + }, + 'files': { + 'tmp/nuget_binaries/package_binaries.nuspec': ['config/package_binaries.nuspec'] + } } }, @@ -249,15 +267,6 @@ module.exports = function(grunt) { src: ['<%= grunt.option("target") %>\\Web.config'] } }, - - jshint: { - options: { - jshintrc: '.jshintrc' - }, - src: { - src: ['app/**/*.js', 'lib/**/*.js'] - } - }, msbuild: { options: { @@ -281,8 +290,7 @@ module.exports = function(grunt) { }); grunt.registerTask('default', ['clean', 'string-replace', 'less', 'concat', 'assemblyinfo', 'msbuild:dist', 'copy:dll', 'copy:assets', 'copy:html', 'copy:config', 'clean:html', 'clean:js', 'clean:less']); - - grunt.registerTask('nuget', ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'clean:tmp']); + grunt.registerTask('nuget', ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'template:nuspec_binaries', 'nugetpack']); grunt.registerTask('umbraco', ['clean:tmp', 'default', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']); - grunt.registerTask('package', ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']); + grunt.registerTask('package', ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'template:nuspec_binaries', 'nugetpack', 'copy:umbraco', 'umbracoPackage']); }; \ No newline at end of file diff --git a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs index 2ba2adf..d1253d4 100644 --- a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs +++ b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("1.12.1")] -[assembly: AssemblyFileVersion("1.12.1")] +[assembly: AssemblyVersion("1.12.2")] +[assembly: AssemblyFileVersion("1.12.2")] diff --git a/config/meta.json b/config/meta.json index 2c9c76f..8329404 100644 --- a/config/meta.json +++ b/config/meta.json @@ -1,6 +1,6 @@ { "name": "Archetype", - "version": "1.12.1", + "version": "1.12.2", "url": "http://github.com/imulus/archetype/", "author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.", "authorUrl": "http://imulus.com/", diff --git a/config/package.nuspec b/config/package.nuspec index 6755f9e..8853785 100644 --- a/config/package.nuspec +++ b/config/package.nuspec @@ -12,7 +12,7 @@ http://github.com/imulus/archetype/raw/master/assets/logo.png <%= licenseUrl %> - + \ No newline at end of file diff --git a/config/package_binaries.nuspec b/config/package_binaries.nuspec new file mode 100644 index 0000000..d21714d --- /dev/null +++ b/config/package_binaries.nuspec @@ -0,0 +1,18 @@ + + + + Archetype.Binaries + <%= version %> + <%= name %> + imulus, kgiszewski, tomfulton + imulus, kgiszewski, tomfulton + http://github.com/imulus/archetype + + umbraco + http://github.com/imulus/archetype/raw/master/assets/logo.png + <%= licenseUrl %> + + + + + \ No newline at end of file