Merge branch 'hotfix/0.10.2'

nbuildkit · Aug 28, 2017 · 65704f6 · 65704f6
2 parents 989573d + cc2c044
commit 65704f6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/src/nbuildkit/actions/deploy/shared.deploysteps.msbuild b/src/nbuildkit/actions/deploy/shared.deploysteps.msbuild
@@ -11,8 +11,12 @@
     <PropertyGroup>
         <DeployStepsShowHelp>$(MSBuildThisFileDirectory)..\shared.show.help.msbuild</DeployStepsShowHelp>
 
+        <DeployStepsBuildTargetsAssembly>$(MSBuildThisFileDirectory)..\shared.bootstrap.build.tasks.msbuild</DeployStepsBuildTargetsAssembly>
+        <DeployStepsGenerateTargetsFile>$(MSBuildThisFileDirectory)..\shared.bootstrap.generate.targetsfile.msbuild</DeployStepsGenerateTargetsFile>
+
         <DeployStepsPrepareVcsBranch>$(MSBuildThisFileDirectory)..\shared.prepare.vcssetbranch.msbuild</DeployStepsPrepareVcsBranch>
         <DeployStepsPrepareGetVersion>$(MSBuildThisFileDirectory)..\shared.prepare.getversion.msbuild</DeployStepsPrepareGetVersion>
+        <DeployStepsPrepareVcsInfo>$(MSBuildThisFileDirectory)..\shared.prepare.vcsinfo.msbuild</DeployStepsPrepareVcsInfo>
         <DeployStepsPrepareTagVcs>$(MSBuildThisFileDirectory)..\shared.prepare.tag.vcs.msbuild</DeployStepsPrepareTagVcs>
 
         <DeployStepsPrepareGetIssueIds>$(MSBuildThisFileDirectory)..\shared.prepare.getissueids.msbuild</DeployStepsPrepareGetIssueIds>
@@ -68,6 +72,14 @@
             <Name>Deploy - gather version numbers</Name>
             <Path>$(DeployStepsPrepareGetVersion)</Path>
         </AvailableStepMetadata>
+        <AvailableStepMetadata Include="$([System.IO.Path]::GetFileName('$(DeployStepsPrepareVcsInfo)'))">
+            <Description>
+                Stores the Version Control System (VCS) information in a file for later use. Currently supported version control systems is GIT
+            </Description>
+            <Id>DeployStepsPrepareVcsInfo</Id>
+            <Name>Deploy - gather VCS information</Name>
+            <Path>$(DeployStepsPrepareVcsInfo)</Path>
+        </AvailableStepMetadata>
         <AvailableStepMetadata Include="$([System.IO.Path]::GetFileName('$(DeployStepsPrepareTagVcs)'))">
             <Description>
                 Tags the current commit with the version number. Currently supported version control systems are TFS and GIT.

diff --git a/src/nbuildkit/actions/nbuildkit.msbuild.actions.nuspec b/src/nbuildkit/actions/nbuildkit.msbuild.actions.nuspec
@@ -59,13 +59,6 @@
             src="$DirSrc$\nbuildkit\actions\deploy\*.props"
             target="build\deploy" />
 
-        <file
-            src="$DirBin$\*.dll"
-            target="build/extensions" />
-        <file
-            src="$DirBootstrap$\*.targets"
-            target="build/extensions" />
-
         <file
             src="$DirWorkspace$\README.md" />
         <file

diff --git a/src/nbuildkit/actions/test/shared.teststeps.msbuild b/src/nbuildkit/actions/test/shared.teststeps.msbuild
@@ -12,6 +12,9 @@
 
         <TestStepsPrepareWorkspace>$(MSBuildThisFileDirectory)..\shared.prepare.workspace.msbuild</TestStepsPrepareWorkspace>
 
+        <TestStepsBuildTargetsAssembly>$(MSBuildThisFileDirectory)..\shared.bootstrap.build.tasks.msbuild</TestStepsBuildTargetsAssembly>
+        <TestStepsGenerateTargetsFile>$(MSBuildThisFileDirectory)..\shared.bootstrap.generate.targetsfile.msbuild</TestStepsGenerateTargetsFile>
+
         <TestStepsPrepareGetIssueIds>$(MSBuildThisFileDirectory)..\shared.prepare.getissueids.msbuild</TestStepsPrepareGetIssueIds>
         <TestStepsPrepareVcsBranch>$(MSBuildThisFileDirectory)..\shared.prepare.vcssetbranch.msbuild</TestStepsPrepareVcsBranch>
         <TestStepsPrepareRestoreNuGet>$(MSBuildThisFileDirectory)..\shared.prepare.nuget.restore.msbuild</TestStepsPrepareRestoreNuGet>

diff --git a/src/samples/files/deploy.settings.props b/src/samples/files/deploy.settings.props
@@ -378,6 +378,22 @@
             <Properties>
             </Properties>
         </DeployStepsToExecute>
+        <DeployStepsToExecute Include="$(DeployStepsPrepareVcsInfo)">
+            <ExecuteAfter></ExecuteAfter>
+            <ExecuteBefore></ExecuteBefore>
+            <Groups>
+                prepare;
+                prepare.get;
+                prepare.get.vcsinfo;
+            </Groups>
+            <Id>DeployStepsPrepareVcsInfo</Id>
+            <PostSteps>
+            </PostSteps>
+            <PreSteps>
+            </PreSteps>
+            <Properties>
+            </Properties>
+        </DeployStepsToExecute>
         <DeployStepsToExecute Include="$(DeployStepsPrepareGetIssueIds)">
             <ExecuteAfter></ExecuteAfter>
             <ExecuteBefore></ExecuteBefore>