#15

Included new DnnPackager.Tasks.dll in NuGet Package. Changed install.ps1 in nuget package to install the new targets file, and remove the old v1 targets file. Attempted to get tab expansion working for the Install-Module powershell command.
dazinator · Dec 3, 2015 · bca99dd · bca99dd · dazinator · Dec 3, 2015
1 parent 7237b0e
commit bca99dd
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 19 deletions.
diff --git a/src/DnnPackager.nuspec b/src/DnnPackager.nuspec
@@ -21,7 +21,9 @@
     </releaseNotes>
   </metadata>
   <files>
-    <file src="DnnPackager\tools\**\*.*" target="tools" />   
+    <file src="DnnPackager\tools\**\*.*" target="tools" />
+    <file src="DnnPackager\DnnPackager.Tasks\bin\$Configuration$\DnnPackager.Tasks.dll" target="tools" />
+
     <file src="DnnPackager\content\**\*.*" target="content" />
     <file src="DnnPackager\readme.txt" target="" />
     <file src="DnnPackager\bin\$Configuration$\DnnPackager.exe" target="tools" />

diff --git a/src/DnnPackager/DnnPackager.csproj b/src/DnnPackager/DnnPackager.csproj
@@ -69,7 +69,7 @@
     <None Include="content\DnnPackageBuilderOverrides.props" />
     <None Include="tools\before.solutionname.sln.targets" />
     <None Include="tools\DnnPackager.Build.targets" />
-    <None Include="tools\UserConfig.psm1" />
+    <None Include="wip\UserConfig.psm1" />
     <None Include="tools\init.ps1" />
     <None Include="tools\ModuleDeployment.psm1" />
     <None Include="tools\Solution.nuspecc" />

diff --git a/src/DnnPackager/tools/DnnPackager.Build.targets b/src/DnnPackager/tools/DnnPackager.Build.targets
@@ -1,10 +1,15 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>
 
-  <UsingTask TaskName="DnnPackager.Tasks.FindDnnManifestFile" AssemblyFile="DnnPackager.Tasks.dll" />
-  <UsingTask TaskName="DnnPackager.Tasks.ReadPackageInfoFromManifest" AssemblyFile="DnnPackager.Tasks.dll" />
-  <UsingTask TaskName="DnnPackager.Tasks.CreateDnnExtensionInstallationZip" AssemblyFile="DnnPackager.Tasks.dll" />
+  <PropertyGroup>
+    <DnnPackagerTasksPath Condition="'$(DnnPackagerTasksPath)' == ''">$(MSBuildThisFileDirectory)</DnnPackagerTasksPath>
+    <DnnPackagerTasksLib>$(DnnPackagerTasksPath)DnnPackager.Tasks.dll</DnnPackagerTasksLib>
+  </PropertyGroup>  
+
+  <UsingTask TaskName="DnnPackager.Tasks.FindDnnManifestFile" AssemblyFile="$(DnnPackagerTasksLib)" />
+  <UsingTask TaskName="DnnPackager.Tasks.ReadPackageInfoFromManifest" AssemblyFile="$(DnnPackagerTasksLib)" />
+  <UsingTask TaskName="DnnPackager.Tasks.CreateDnnExtensionInstallationZip" AssemblyFile="$(DnnPackagerTasksLib)" />
 
   <!-- Hook into the AfterBuild activity -->
   <PropertyGroup>
@@ -36,7 +41,7 @@
       $(MSBuildProjectDirectory)\$(DnnManifestFileName).$(DnnManifestFileExtension)
     </DnnManifestFilePath>
 
-
+    
     <!--<OctoPackPublishPackagesToTeamCity Condition="'$(OctoPackPublishPackagesToTeamCity)' == ''">true</OctoPackPublishPackagesToTeamCity>-->
     <!--<OctoPackProjectName Condition="'$(OctoPackProjectName)' == ''">$(MSBuildProjectName)</OctoPackProjectName>-->
 
@@ -47,6 +52,8 @@
   -->
   <Target Name="DnnPackager" Condition="$(RunDnnPackager)">
 
+    <Message Text="DnnPackager: Tasks Lib @ $(DnnPackagerTasksLib)"/>
+
     <!--If path of dnn manifest file ($DnnManifestFilePath) not provided, then find it-->
     <FindDnnManifestFile ProjectDirectory="$(MSBuildProjectDirectory)" Configuration="$(Configuration)" Condition="'$(DnnManifestFilePath)' == ''">
       <Output TaskParameter="ManifestFilePath" ItemName="DnnManifestFilePath"/>
@@ -72,14 +79,11 @@
       <ResourcesZipContentFiles Include="@(Content)" />
       <!--The primary output assembly will be included in the install package.-->
       <PackageAssemblies Include="$(TargetPath)" />
-      <!--All debug symbols in the output directory will be included in the install package.
-      TODO: Look at creating some flag for whether to include symbols or not -->
+      <!-- Debug symbols in the output directory to be included in the install package when DebugSymbols (common msbuild property) is set to true. -->
       <PackageSymbols Include="$(OutDir)\*.pdb" />
-      <!--Any other files which should be included in the dnn install package. This is a workaround here, which I am creating a dummy entry so that
-      the msbuild item exists, but only files that actually exist on disk during packaging will be included in the install zip - dummyentry.txt won't exist on disk
-       and so it won't end up in the install zip which is what I want. -->
+      <!--Any other files which should be included in the dnn install package. This is a hack here to initialise a collection of files with a dummy item.
+      Only files that actually exist on disk during packaging will be included in the install zip - dummyentry.txt won't exist on disk so it won't end up in the install zip which is what I want. -->
       <PackageFiles Include="DummyEntry.txt" />
-
     </ItemGroup>
 
     <!--Todo: implement this task in c#-->

diff --git a/src/DnnPackager/tools/ModuleDeployment.psm1 b/src/DnnPackager/tools/ModuleDeployment.psm1
@@ -71,8 +71,17 @@ function Get-SingleProject($name)
     return $project
 }
 
-Register-TabExpansion 'Deploy-Module' @{
-   'buildConfigName' = { "Debug", "Release" } 
+function Get-Configurations()
+{
+    $solution = Get-Interface $dte.Solution ([EnvDTE80.Solution2])
+    $solBuild = Get-Interface $solution.SolutionBuild ([EnvDTE.SolutionBuild])
+	$configs = $solBuild.SolutionConfigurations
+	$configs = [EnvDTE.SolutionConfigurations]::$solBuild.SolutionConfigurations 
+	return $configs
+}
+
+Register-TabExpansion 'Install-Module' @{
+   'buildConfigName' = { Get-Configurations | Select-Object -Property Name } 
 }
 
 Export-ModuleMember Install-Module
diff --git a/src/DnnPackager/tools/install.ps1 b/src/DnnPackager/tools/install.ps1
@@ -11,7 +11,8 @@ $ProjectPath = Split-Path $Project.FullName -parent
 $ProjectPropsFile = 'DnnPackageBuilderOverrides.props'
 $ProjectPropsPath = $ProjectPath | Join-Path -ChildPath $ProjectPropsFile
 
-$TargetsFile = 'DnnPackager.targets'
+$OldTargetsFileV1 = 'DnnPackager.targets'
+$TargetsFile = 'DnnPackager.Build.targets'
 # $TargetsFolder = 'build\'
 # $TargetsPath = $InstallPath | Join-Path -ChildPath $TargetsFolder
 # $TargetsPath = $InstallPath | Join-Path -ChildPath $TargetsFile 
@@ -59,7 +60,18 @@ $MSBProject.Xml.AddImport($RelativeProjectPropsPath) | Out-Null
 
 # PACKAGE BUILDER TARGETS
 # =======================
-# Ensure targets file added, remove existing if found.
+
+# REMOVE OLD V1 TARGETS FILE
+$ExistingImports = $MSBProject.Xml.Imports |
+    Where-Object { $_.Project -like "*\$OldTargetsFileV1" }
+if ($ExistingImports) {
+    $ExistingImports | 
+        ForEach-Object {
+            $MSBProject.Xml.RemoveChild($_) | Out-Null
+        }
+}
+
+# ADD NEW TARGETS FILE. REMOVE FIRST IF EXISTS.
 $ExistingImports = $MSBProject.Xml.Imports |
     Where-Object { $_.Project -like "*\$TargetsFile" }
 if ($ExistingImports) {

diff --git a/src/DnnPackager/tools/UserConfig.psm1 → src/DnnPackager/wip/UserConfig.psm1 b/src/DnnPackager/tools/UserConfig.psm1 → src/DnnPackager/wip/UserConfig.psm1
diff --git a/src/nuget.config b/src/nuget.config
@@ -1,4 +1,5 @@
-<configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
   <config>
     <add key="repositoryPath" value="..\lib" /> 
   </config>
@@ -9,7 +10,7 @@
     <add key="automatic" value="False" />
   </packageRestore>
   <packageSources>
-    <add key="NuGet official package source" value="https://nuget.org/api/v2/" />   
+    <add key="NuGet official package source" value="https://nuget.org/api/v2/" />
   </packageSources>
   <activePackageSource>   
     <!-- this tells that all of them are active -->