Merge pull request #48 from blipson89/releases/release-2.1.0

Releases/release 2.1.0
blipson89 · Oct 9, 2021 · 57a1c45 · 57a1c45
2 parents a598d9d + 08627e0
commit 57a1c45
Show file tree

Hide file tree

Showing 28 changed files with 449 additions and 183 deletions.
diff --git a/build.yaml b/build.yaml
@@ -4,12 +4,22 @@ pool:
 jobs:
 - job: Build
   steps:
-  - task: GitVersion@5
+  - task: gitversion/setup@0
     inputs:
-      runtime: 'core'
+      versionSpec: '5.x'
+  - task: gitversion/execute@0
+    displayName: "Update SharedAssemblyInfo version"
+    inputs:
+      useConfigFile: true
+      configFilePath: 'GitVersion.yml'
+      additionalArguments: '/updateassemblyinfo .\src\SharedAssemblyInfo.cs'
+  - task: gitversion/execute@0
+    displayName: "Update dotnet csproj assembly version"
+    inputs:
+      targetPath: '$(Build.SourcesDirectory)'
+      useConfigFile: true
       configFilePath: 'GitVersion.yml'
-      updateAssemblyInfo: true
-      updateAssemblyInfoFilename: 'src/SharedAssemblyInfo.cs'
+      additionalArguments: '/updateprojectfiles'
   - task: DotNetCoreCLI@2
     displayName: "Dotnet Restore"
     inputs:
@@ -31,7 +41,7 @@ jobs:
       includeSymbols: true
       nobuild: true
   - task: DotNetCoreCLI@2
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/releases/')))
     displayName: "Push to Artifact feed"
     inputs:
       command: 'push'

diff --git a/src/Leprechaun.Cli/ConsoleArgs.cs b/src/Leprechaun.Cli/ConsoleArgs.cs
@@ -25,5 +25,8 @@ class ConsoleArgs : IRuntimeArgs
 
 		[ValueArgument(typeof(string), 'p', "plugins", Description = "Path to the folder where plugins will be located. ./Leprechaun")]
 		public string PluginPath { get; set; }
+
+		[SwitchArgument('d', "debug", false, Description = "Prints out full stack traces for exceptions")]
+		public bool Debug { get; set; }
 	}
 }
diff --git a/src/Leprechaun.CodeGen.Roslyn/CSharpScriptCodeGeneratorContext.cs b/src/Leprechaun.CodeGen.Roslyn/CSharpScriptCodeGeneratorContext.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
 using System.Text;
 using Leprechaun.Logging;
 using Leprechaun.Model;
@@ -13,6 +15,12 @@ public CSharpScriptCodeGeneratorContext(ConfigurationCodeGenerationMetadata meta
 		{
 			Log = logger;
 			_metadata = metadata;
+			Version = GetVersion();
+		}
+
+		private string GetVersion()
+		{
+			return FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).FileVersion;
 		}
 
 		public IReadOnlyCollection<TemplateCodeGenerationMetadata> Templates => _metadata.Metadata;
@@ -24,5 +32,7 @@ public CSharpScriptCodeGeneratorContext(ConfigurationCodeGenerationMetadata meta
 		public ILogger Log { get; }
 
 		public StringBuilder Code { get; } = new StringBuilder();
+
+		public string Version { get; }
 	}
 }
diff --git a/src/Leprechaun.CodeGen.Roslyn/Leprechaun.CodeGen.Roslyn.nuspec b/src/Leprechaun.CodeGen.Roslyn/Leprechaun.CodeGen.Roslyn.nuspec
@@ -11,6 +11,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Provides code generation to Leprechaun using C# scripts, executed with Roslyn.</description>
     <tags>sitecore codegen leprechaun</tags>
+    <copyright>©2021 Ben Lipson</copyright>
     <dependencies>
         <dependency id="Leprechaun" version="$version$" />
     </dependencies>