Merge branch 'develop'

Merge branch 'master' of github.com:imulus/Archetype
Conflicts: app/Umbraco/Umbraco.Archetype/Properties/AssemblyInfo.cs
2014-02-27 14:44:55 -07:00 · 2014-02-27 14:29:51 -07:00 · 2014-02-27 14:25:48 -07:00 · 2014-02-27 14:20:49 -07:00 · 2014-02-27 13:41:28 -07:00 · 2014-02-27 13:38:07 -07:00
8 changed files with 30 additions and 17 deletions
@@ -23,6 +23,7 @@ pkg/*.zip
 [Bb]in/
 [Oo]bj/
 [Pp]ackages/
+VersionInfo.cs

 *.aps
 *.bak
@@ -5,6 +5,7 @@ module.exports = function(grunt) {
    dest: 'dist',
    package_dir: 'pkg',
    package_temp_dir: '<%= package_dir %>/tmp/',
+    csProj: 'app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj',


    watch: {
@@ -89,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': { 
@@ -120,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}
        ]
      },
@@ -161,16 +162,28 @@ module.exports = function(grunt) {
      package_artifacts: ['pkg/*.zip', 'pkg/*.nupkg'],
    },

+    assemblyinfo: {
+        options: {
+            files: ['<%= csProj %>'],
+            filename: 'VersionInfo.cs',
+            info: {
+                version: '<%= (pkgMeta.version.indexOf("-") ? pkgMeta.version.substring(0, pkgMeta.version.indexOf("-")) : pkgMeta.version) %>', 
+                fileVersion: '<%= pkgMeta.version %>'
+            }
+        }
+    },
+
    msbuild: {
        dev: {
-            src: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj'],
+            src: ["<%= csProj %>"],
            options: {
                projectConfiguration: 'Debug',
                targets: ['Clean', 'Rebuild'],
                stdout: true,
                maxCpuCount: 4,
                buildParameters: {
-                    WarningLevel: 2
+                    WarningLevel: 2,
+                    NoWarn: 1607,
                },
                verbosity: 'quiet'
            }
@@ -190,6 +203,7 @@ module.exports = function(grunt) {
  grunt.loadNpmTasks('grunt-template');
  grunt.loadNpmTasks('grunt-touch');
  grunt.loadNpmTasks('grunt-msbuild');
+  grunt.loadNpmTasks('grunt-dotnet-assembly-info');
  grunt.loadTasks('tasks');


@@ -200,6 +214,7 @@ module.exports = function(grunt) {
  grunt.registerTask('deploy', ['default', 'copy:deploy', 'touchwebconfigifenabled']);
  grunt.registerTask('css:build', ['less']);
  grunt.registerTask('js:build', ['concat']);
-  grunt.registerTask('default', ['clean', 'css:build', 'js:build', 'copy:build', 'msbuild:dev']);
+  grunt.registerTask('cs:build', ['assemblyinfo', 'msbuild:dev']);
+  grunt.registerTask('default', ['clean', 'css:build', 'js:build', 'copy:build', 'cs:build']);
 };

@@ -229,6 +229,7 @@
    <Compile Include="Models\Fieldset.cs" />
    <Compile Include="Models\Property.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\VersionInfo.cs" />
    <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
  </ItemGroup>
  <ItemGroup>
@@ -11,8 +11,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]

 [assembly: ComVisible(false)]
-[assembly: Guid("E37E94F9-C7BA-4B54-B7E1-64419B3DBA0B")]
-
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
-[assembly: AssemblyInformationalVersion("0.5.0-alpha")]
+[assembly: Guid("E37E94F9-C7BA-4B54-B7E1-64419B3DBA0B")]
@@ -0,0 +1,4 @@
+using System.Reflection;
+
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]
@@ -20,7 +20,8 @@
    "grunt-template": "~0.2.2",
    "grunt-touch": "~0.1.0",
    "fs-extra": "~0.8.1",
-    "grunt-msbuild": "~0.1.9"
+    "grunt-msbuild": "~0.1.9",
+    "grunt-dotnet-assembly-info": "~1.0.9"
  },
  "repository": {
    "type": "git",
@@ -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/",
@@ -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>
Author	SHA1	Message	Date
Tom Fulton	419180c443	Merge branch 'develop'	2014-02-27 14:44:55 -07:00
Tom Fulton	e97c976c7f	Merge branch 'master' of github.com:imulus/Archetype Conflicts: app/Umbraco/Umbraco.Archetype/Properties/AssemblyInfo.cs	2014-02-27 14:29:51 -07:00
Tom Fulton	2d05e64e5a	Merge branch 'develop' of github.com:imulus/Archetype into develop	2014-02-27 14:25:48 -07:00
Tom Fulton	6f4d7f9e9b	Bump version	2014-02-27 14:20:49 -07:00
Tom Fulton	5a24e9b016	Merge pull request #62 from imulus/versioning Add version # to DLL on build	2014-02-27 13:41:28 -07:00
Tom Fulton	4d4e9d7de0	Quick-fix issues with NuGet package paths	2014-02-27 13:38:07 -07:00
Tom Fulton	cd2bd8c562	Add version # to DLL on build * Split VersionInfo from AssemblyInfo so we can ignore changes and let the build handle * Ignore VersionInfo * Install/configure assemblyinfo grunt task * Ignore compiler warning about bad version number format (.NET vs SemVer)	2014-02-22 00:32:37 -07:00