Merging all V1.1 changes into master (#3)

tsteenbakkers · web-flow · commit a55754afe39b · 2020-12-24T11:43:25.000+01:00
* fixing dead link

* shortening links

* minor text changes

* dst timezone fix

* Adding serverless job types

* Adding display name

* fixing serverless pool type

* ordering job pool properties

* fix for empty step sections

* adding pipeline and job demands for non serverless agent jobs

* added blog posts

* updated docs to reflect changes in demands

* changing the way how jobs are ID-ed and reffed by in demands

* fixing duplication of demands in the case of multiple jobs

* commenting emptying construct for steps

* documentation on changing job id and build number

* re-ordering triggers

* fixing wrong syntax for included / excluded when multiple found

* strong typing some arrays to include arrayed single / null tasks

* more strong-typing

* fixing job properties for time-outs

* camelcasing for timeouts

* adding multi sliced ToDO

* strongtyping returned array and remove from child call

* adding checkout properties

* adding 1.1 doc changes except resources

* adding pipeline wide timeouts

* finalizing v1.1 docs

* updating PSD
diff --git a/README.md b/README.md
@@ -1,17 +1,38 @@
 # AzDoAPITools
 
-[![Build Status](https://dev.azure.com/ContinuousData/cdtestproject/_apis/build/status/tsteenbakkers.AzDoAPITools?branchName=master)](https://dev.azure.com/ContinuousData/cdtestproject/_build/latest?definitionId=4&branchName=master)
-[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Continuous-Data/AzDoAPITools/blob/master/LICENSE)
-[![Documentation - AzDoAPITools](https://img.shields.io/badge/Documentation-AzDoAPITools-blue.svg)](https://github.com/Continuous-Data/AzDoAPITools/blob/master/docs/readme.md)
+[![Build Status](https://dev.azure.com/ContinuousData/cdtestproject/_apis/build/status/tsteenbakkers.AzDoAPITools?repoName=Continuous-Data%2FAzDoAPITools&branchName=master)](https://dev.azure.com/ContinuousData/cdtestproject/_build/latest?definitionId=4&repoName=Continuous-Data%2FAzDoAPITools&branchName=master)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
+[![Documentation - AzDoAPITools](https://img.shields.io/badge/Documentation-AzDoAPITools-blue.svg)](./docs/README.md)
 [![PowerShell Gallery - AzDoAPITools](https://img.shields.io/badge/PowerShell%20Gallery-AzDoAPITools-blue.svg)](https://www.powershellgallery.com/packages/AzDoAPITools)
 [![Minimum Supported PowerShell Version](https://img.shields.io/badge/PowerShell-5.1-blue.svg)](https://github.com/PowerShell/PowerShell)
 
+## Version 1.1 Changes
+
+This first update to AzDoAPITools was inspired by Microsofts own [Export to YAML](https://devblogs.microsoft.com/devops/replacing-view-yaml/) functionality introduced in [sprint 178](https://docs.microsoft.com/en-us/azure/devops/release-notes/2020/sprint-178-update#improve-yaml-conversion-in-the-classic-build-designer) inspired me to update my own tooling. After seeing some of the YAML generated by Microsoft I noticed that my tool needed some polishing to make it more in line to the native functionality. I added some ToDo's from the already existing list and added some functionality which I had not taken into account previously. With this update AzDoAPITools is up on par if not better than Microsofts functionality. I have done a comparisson with version 1.0 of AzDoAPITools vs Microsoft "Export to YAML" in [my blog](https://www.continuous-data.nl/azure-devops/full-review-of-the-new-export-to-yaml-feature-in-azure-devops/).
+
+### changes
+
+- added Pipeline / Job demands
+- Added pipeline timeouts to every job
+- Added Step Properties (checkout, persistcredentials, lfs, submodules etc...)
+- added Agentless pools
+- Changed Job id / displayName notation (added displayname and use actual API id as id instead of displayName as id)
+- Changed order of triggers according to MS Export Tool ordering
+- Changes order of job properties to MS Export Tool ordering
+- fixed syntax for included / excluded paths and branches notation
+- Fixed rare occurrence where executor of script would happen to be in a DST timezone where the target zone would not be.
+- Fixed empty jobs syntax. will now be converted as empty array [] rather than a started array.
+- Fixed notation for job properties for timeout and canceltimeout.
+- updated documentation
+
 ## Introduction
 
-AzDoAPITools is a project which was born when doing a migration from classical pipelines to YAML pipelines for a customer. Which is the current function of the published module. The module will convert Task Groups and classical build pipelines to usable all in one YAML pipelines / step templates.
+AzDoAPITools is a project which was born while doing a migration from classical pipelines (GUI-based) to YAML pipelines (Pipeline as code) for a customer. Which is the current function of the published module. The module will convert Task Groups and classical build pipelines to usable all in one YAML pipelines / step templates.
 
 In the future you can expect other automations which i have done for customers such as automatic branching / mass policy application etc. to be bundled in this module.
 
+In [this blog post](https://www.continuous-data.nl/tools/intro-azdoapitools/) I have written an introduction into this tool and in [this blog post](https://www.continuous-data.nl/azure-devops/full-review-of-the-new-export-to-yaml-feature-in-azure-devops/) there is a comparison with the in-built "Export to YAML" functionality which was created by Microsoft in November 2020.
+
 ## Requirements
 
 - Powershell 5.1
diff --git a/Source/AzdoAPITools.psd1 b/Source/AzdoAPITools.psd1
@@ -12,7 +12,7 @@
 RootModule = 'AzdoAPITools.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.0.0'
+ModuleVersion = '1.1.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/Source/Private/Convert-TaskStepsToYAMLSteps.ps1 b/Source/Private/Convert-TaskStepsToYAMLSteps.ps1
@@ -37,7 +37,7 @@ function Convert-TaskStepsToYAMLSteps {
 
         if($steps.count -ge 1){
             $taskscount = $input.count
-            $convertedsteps = @()
+            [array]$convertedsteps = @()
             $convertedcount = 0
             Write-verbose "Found $taskscount tasks"
             foreach ($step in $steps) {
@@ -73,15 +73,15 @@ function Convert-TaskStepsToYAMLSteps {
                     }
                     
                     #### Adding Step to Steps
-                    $convertedsteps += $yamlstep
+                    [array]$convertedsteps += $yamlstep
 
                 }elseif($step.task.definitionType -eq 'metaTask' -and $step.enabled -eq 'true'){
 
                     $TGtemplate = Get-AzDoAPIToolsDefinitionsTaskGroupsByID -ID $stepid -TGVersion $stepversion -ApiType 'TaskGroup' -Projectname $projectname -profilename $profilename
 
                     if ($ExpandNestedTaskGroups.IsPresent) {
-                        $nestedtaskgrouptasks = Convert-TaskStepsToYAMLSteps -profilename $profilename -Projectname $projectname -InputArray $TGTemplate -ExpandNestedTaskGroups -inputType $tgtemplate.type -parentinputtype $inputtype
-                        $convertedsteps += $nestedtaskgrouptasks
+                        [array]$nestedtaskgrouptasks = Convert-TaskStepsToYAMLSteps -profilename $profilename -Projectname $projectname -InputArray $TGTemplate -ExpandNestedTaskGroups -inputType $tgtemplate.type -parentinputtype $inputtype
+                        [array]$convertedsteps += $nestedtaskgrouptasks
                     }else {
                         
                         $TGTemplateName = "$($TGTemplate.name).yml"
@@ -95,7 +95,7 @@ function Convert-TaskStepsToYAMLSteps {
                             
                         }
                         
-                        $convertedsteps += $yamlstep
+                        [array]$convertedsteps += $yamlstep
                     }
                     
                 }
@@ -106,8 +106,10 @@ function Convert-TaskStepsToYAMLSteps {
         }else{
             Write-Verbose 'No Tasks found. skipping steps.'
         }
-
-    return $convertedsteps
+    if ($convertedsteps.Count -lt 1) {
+        [array]$convertedsteps = @()
+    }
+    return [array]$convertedsteps
     } 
     
 }
diff --git a/Source/Private/Get-AzDoAPIToolsAgentPool.ps1 b/Source/Private/Get-AzDoAPIToolsAgentPool.ps1
@@ -13,7 +13,7 @@ function Get-AzDoAPIToolsAgentPool {
     
     
     process {
-        $returnedpool = @{}
+        $returnedpool = [ordered]@{}
         $pool = Use-AzDoAPI -url $PoolURL -method 'get'
         
         if ($pool.pool.isHosted -eq 'true') {
diff --git a/Source/Private/Get-CronFromSchedule.ps1 b/Source/Private/Get-CronFromSchedule.ps1
@@ -44,7 +44,7 @@ function Get-CronFromSchedule {
                         
                         $SourceTimezone = [System.TimeZoneInfo]::FindSystemTimeZoneById($schedule.timezoneid)
                         
-                        if($SourceTimezone.SupportsDaylightSavingTime -eq $true){
+                        if($SourceTimezone.SupportsDaylightSavingTime -eq $true -and $datetimetoconvert.IsDaylightSavingTime() -eq $true){
                             $datetimetoconvert = $datetimetoconvert.AddHours(1)
                         }
 
diff --git a/Source/Private/Get-DefinitionInputIncludeExclude.ps1 b/Source/Private/Get-DefinitionInputIncludeExclude.ps1
@@ -9,7 +9,7 @@ function Get-DefinitionInputIncludeExclude {
     begin{
         $included = @()
         $excluded = @()
-        $return = @()
+        $return = [ordered]@{}
         $regex = '^([\+\-])[\\\/]?(.+)'
     }
     
@@ -30,17 +30,11 @@ function Get-DefinitionInputIncludeExclude {
     end{
         
         if ($included.count -ge 1) {
-            $includedinput = @{
-                'include' = $included
-            }
-            $return += $includedinput
+            $return.add('include',$included)
         }
 
         if ($excluded.count -ge 1) {
-            $excludedinput = @{
-                'exclude' = $excluded
-            }
-            $return += $excludedinput
+            $return.add('exclude',$excluded)
         }  
 
         return $return
diff --git a/Source/Private/Get-TaskProperties.ps1 b/Source/Private/Get-TaskProperties.ps1
@@ -38,6 +38,43 @@ function Get-TaskProperties {
                         $FilteredTaskProperties | Add-Member -NotePropertyName $propertyname -NotePropertyValue $propertyvalue
                     }
                 }
+                jobTimeoutInMinutes {
+                    if($propertyvalue -ne 0){
+                        $FilteredTaskProperties | Add-Member -NotePropertyName 'timeoutInMinutes' -NotePropertyValue $propertyvalue
+                    }
+                }
+                jobCancelTimeoutInMinutes {
+                    if($propertyvalue -ne 0){
+                        $FilteredTaskProperties | Add-Member -NotePropertyName 'cancelTimeoutInMinutes' -NotePropertyValue $propertyvalue
+                    }
+                }
+                clean {
+                    if($propertyvalue -ne $false){
+                        $FilteredTaskProperties | Add-Member -NotePropertyName $propertyname -NotePropertyValue $propertyvalue
+                    }
+                }
+                gitLfsSupport {
+                    if($propertyvalue -ne $false){
+                        $FilteredTaskProperties | Add-Member -NotePropertyName 'lfs' -NotePropertyValue $propertyvalue
+                    }
+                }
+                checkoutSubmodules {
+                    if($propertyvalue -ne $false){
+                        $FilteredTaskProperties | Add-Member -NotePropertyName 'submodules' -NotePropertyValue $propertyvalue
+                    }
+                }
+                checkoutNestedSubmodules {
+                    if($propertyvalue -ne $false){
+
+                        $FilteredTaskProperties | Add-Member -NotePropertyName 'submodules' -NotePropertyValue 'recursive'
+        
+                    }
+                }
+                fetchDepth {
+                    if($propertyvalue -ne 0){
+                        $FilteredTaskProperties | Add-Member -NotePropertyName $propertyname -NotePropertyValue $propertyvalue
+                    }
+                }
                 Default {
                     $FilteredTaskProperties | Add-Member -NotePropertyName $propertyname -NotePropertyValue $propertyvalue
                 }
diff --git a/Source/Public/Get-AzDoAPIToolsDefinitionStepsAsYAMLPrepped.ps1 b/Source/Public/Get-AzDoAPIToolsDefinitionStepsAsYAMLPrepped.ps1
@@ -27,52 +27,151 @@ function Get-AzDoAPIToolsDefinitionStepsAsYAMLPrepped {
            $jobcount = $jobs.count
            $definitionjobs = @()
            $retunreddefinitionjobs = [ordered]@{}
-           $phaserefs = @{}
+           [bool]$pipelinedemands = ($definition.PSobject.Properties.name.contains('demands'))
+
 
            foreach ($job in $jobs) {
+
                $definitionsteps = [ordered]@{}
-                $definitionjob = [ordered]@{}
-              $steps = Convert-TaskStepsToYAMLSteps -InputArray $job -Projectname $projectname -profilename $profilename -inputtype $definitiontype -ExpandNestedTaskGroups:$ExpandNestedTaskGroups.isPresent
-              
-              [bool]$custompool = ($job.target.PSobject.Properties.name.contains('queue'))
+               $definitionjob = [ordered]@{}
+               $demandstoadd = $null
+               [array]$steps = @()
+               [array]$stepsPlusStepproperties = @()
+               $steppropertiestoadd = [ordered]@{}
+               [bool]$custompool = ($job.target.PSobject.Properties.name.contains('queue'))
+               [bool]$dependencies = ($job.PSobject.Properties.name.contains('dependencies'))
+               [bool]$jobdemands = ($job.target.PSobject.Properties.name.contains('demands'))
+                
+               #populating stepproperties
+               
+               #first do checkout as it has to be the first task always
+                
+               if($definition.repository.properties.skipSyncSource -eq 'true'){
+                   $steppropertiestoadd.add('checkout', 'none')
+               }else {
+                    $steppropertiestoadd.add('checkout', 'self')
+               }
 
-              [bool]$dependencies = ($job.PSobject.Properties.name.contains('dependencies'))
+                #adding other properties
+                $repooptions = Get-TaskProperties -InputTaskObject $definition.repository -propertiestoskip @('properties','id','type','name','url','defaultBranch')
+                
+                $repooptions.PSobject.Properties | ForEach-Object{
+                    $steppropertiestoadd.add($_.name,$_.value)
+                }
 
-              $phaserefs.Add($job.refName,$job.name)
+                $repoproperties = Get-TaskProperties -InputTaskObject $definition.repository.properties -propertiestoskip @('labelSources','labelSourcesFormat','reportBuildStatus','cleanOptions','skipSyncSource')
+                
+                $repoproperties.PSobject.Properties | ForEach-Object{
+                        if ($_.name -eq 'submodules') {
+                            $steppropertiestoadd.$($_.name) = $_.value 
+                        }else{
+                            $steppropertiestoadd.add($_.name,$_.value)
+                        }
+                }
+                
+                if ($job.target.allowScriptsAuthAccessOption -eq 'true') {
 
-              if ($jobcount -gt 1 -or $custompool) {
+                    $steppropertiestoadd.add('persistCredentials', 'true')
+                    
+                }
+
+              if ($jobcount -gt 1 -or $custompool -or $pipelinedemands -or $jobdemands) {
                   
-                $definitionjob.add('job',$job.name.replace(" ","_"))
+                $definitionjob.add('job',$job.refName)
+                ### Adding displayname
+                $definitionjob.add('displayName',$job.name)
+
                 ### add job pool properties
-                if ($custompool) {
+                if ($custompool -and $job.target.type -eq 1) {
 
                     $poolToAdd = Get-AzDoAPIToolsAgentPool -poolURL $job.target.queue._links.self.href -AgentIdentifier $job.target.agentSpecification.identifier
-                    if ($pooltoAdd.count -ge 1) {
-                        $definitionjob.add('pool',$poolToAdd)
+                    
+                    
+                    [array]$stepsPlusStepproperties = $steppropertiestoadd   
+                    
+                }elseif (!$custompool -and $job.target.type -eq 1) {
+
+                    $poolToAdd = Get-AzDoAPIToolsAgentPool -PoolURL $definition.queue._links.self.href -agentidentifier $definition.process.target.agentSpecification.identifier
+                    
+                    [array]$stepsPlusStepproperties = $steppropertiestoadd
+                }
+                elseif($job.target.type -eq 2){
+
+                    $poolToAdd = 'server'
+
+                    [array]$stepsPlusStepproperties = @()
+                }
+
+                if ($pooltoAdd.count -ge 1) {
+                    $definitionjob.add('pool',$poolToAdd)
+                }
+
+                ### Adding job demands
+                if ($jobdemands) {
+                    $demandstoadd += $job.target.demands
+                }
+
+                if ($pipelinedemands) {
+                    $demandstoadd += $definition.demands
+                }
+
+                if ($demandstoadd.count -ge 1 -and $job.target.type -eq 1) {
+                    if($definitionjob.Contains('pool')){
+                        $definitionjob.pool.add('demands',$demandstoadd)
+                    }else{
+                        Write-Error "No Pool construct found to add demands to."
                     }
+                    
+                }
+                ### Adding Job Properties
+                
+                #pipeline specific timeouts
+                if($definition.jobTimeoutInMinutes -ne 60){
+                    $definitionjob.add('timeoutInMinutes',$definition.jobTimeoutInMinutes)
+
                 }
 
+                if($definition.jobCancelTimeoutInMinutes -ne 5){
+                    $definitionjob.add('cancelTimeoutInMinutes',$definition.jobCancelTimeoutInMinutes)
+                }
+
+                #job specific properties
                 $jobproperties = Get-TaskProperties -InputTaskObject $job -propertiestoskip @('steps','target','name','refname','jobAuthorizationScope','dependencies')
                     
                 $jobproperties.PSObject.Properties | ForEach-Object{
-                    $definitionjob.add($_.name,$_.value)
+                    if ($_.name -eq 'timeoutInMinutes' -and ($definitionjob.timeoutInMinutes)) {
+                        $definitionjob.timeoutInMinutes = $_.value
+                        
+                    }elseif ($_.name -eq 'cancelTimeoutInMinutes' -and ($definitionjob.cancelTimeoutInMinutes)) {
+                        $definitionjob.cancelTimeoutInMinutes = $_.value
+                        
+                    }else{
+                        $definitionjob.add($_.name,$_.value)
+                    }
+                    
                 }
 
                 #add section for dependancies
                 if ($dependencies) {
-                    $dependancy = $phaserefs.$($job.dependencies.scope)
-                    $definitionjob.add('dependsOn',$dependancy.replace(" ","_"))
+                    $definitionjob.add('dependsOn',$job.dependencies.scope)
                 }
+                
+                #populating jobs/steps
+
+                [array]$steps = Convert-TaskStepsToYAMLSteps -InputArray $job -Projectname $projectname -profilename $profilename -inputtype $definitiontype -ExpandNestedTaskGroups:$ExpandNestedTaskGroups.isPresent
 
-                $definitionjob.add('steps',$steps)
+                [array]$stepsPlusStepproperties += $steps
+
+                $definitionjob.add('steps',$stepsPlusStepproperties)
                 
                 $definitionjobs += $definitionjob
+
               }else{
-                $definitionsteps.add('steps',$steps)
+                $definitionsteps.add('steps',$stepsPlusStepproperties)
               }
            }
 
-           if ($jobcount -gt 1 -or $custompool) {
+           if ($jobcount -gt 1 -or $custompool -or $pipelinedemands -or $jobdemands) {
                $retunreddefinitionjobs.add('jobs',$definitionjobs)
 
                return $retunreddefinitionjobs
diff --git a/Source/Public/Get-AzDoAPIToolsDefinitionTriggersAsYAMLPrepped.ps1 b/Source/Public/Get-AzDoAPIToolsDefinitionTriggersAsYAMLPrepped.ps1
@@ -17,6 +17,12 @@ function Get-AzDoAPIToolsDefinitionTriggersAsYAMLPrepped {
 
                 if ($citriggers) {
                     $triggers = [ordered]@{}
+
+                    if ($citriggers.batchChanges -eq 'true') {
+
+                        $triggers.add('batch',$citriggers.batchChanges) 
+                    }
+
                     if($citriggers.branchFilters){
                         $branchtriggers = Get-DefinitionInputIncludeExclude -inputs $citriggers.branchFilters
                     
@@ -33,12 +39,6 @@ function Get-AzDoAPIToolsDefinitionTriggersAsYAMLPrepped {
                         }
 
                     }
-                    
-
-                    if ($citriggers.batchChanges -eq 'true') {
-
-                        $triggers.add('batch',$citriggers.batchChanges) 
-                    }
 
                     if ($triggers.Count -ge 1) {
                         $returnedtriggerobject = @{
diff --git a/docs/classic-to-yaml-conversion.md b/docs/classic-to-yaml-conversion.md
diff --git a/docs/functions/Get-AzDoAPIToolsDefinitionStepsAsYAMLPrepped.md b/docs/functions/Get-AzDoAPIToolsDefinitionStepsAsYAMLPrepped.md

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ function Convert-TaskStepsToYAMLSteps {`
`37`	`37`
`38`	`38`	`if($steps.count -ge 1){`
`39`	`39`	`$taskscount = $input.count`
`40`		`- $convertedsteps = @()`
	`40`	`+ [array]$convertedsteps = @()`
`41`	`41`	`$convertedcount = 0`
`42`	`42`	`Write-verbose "Found $taskscount tasks"`
`43`	`43`	`foreach ($step in $steps) {`
`@@ -73,15 +73,15 @@ function Convert-TaskStepsToYAMLSteps {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`#### Adding Step to Steps`
`76`		`- $convertedsteps += $yamlstep`
	`76`	`+ [array]$convertedsteps += $yamlstep`
`77`	`77`
`78`	`78`	`}elseif($step.task.definitionType -eq 'metaTask' -and $step.enabled -eq 'true'){`
`79`	`79`
`80`	`80`	`$TGtemplate = Get-AzDoAPIToolsDefinitionsTaskGroupsByID -ID $stepid -TGVersion $stepversion -ApiType 'TaskGroup' -Projectname $projectname -profilename $profilename`
`81`	`81`
`82`	`82`	`if ($ExpandNestedTaskGroups.IsPresent) {`
`83`		`- $nestedtaskgrouptasks = Convert-TaskStepsToYAMLSteps -profilename $profilename -Projectname $projectname -InputArray $TGTemplate -ExpandNestedTaskGroups -inputType $tgtemplate.type -parentinputtype $inputtype`
`84`		`- $convertedsteps += $nestedtaskgrouptasks`
	`83`	`+ [array]$nestedtaskgrouptasks = Convert-TaskStepsToYAMLSteps -profilename $profilename -Projectname $projectname -InputArray $TGTemplate -ExpandNestedTaskGroups -inputType $tgtemplate.type -parentinputtype $inputtype`
	`84`	`+ [array]$convertedsteps += $nestedtaskgrouptasks`
`85`	`85`	`}else {`
`86`	`86`
`87`	`87`	`$TGTemplateName = "$($TGTemplate.name).yml"`
`@@ -95,7 +95,7 @@ function Convert-TaskStepsToYAMLSteps {`
`95`	`95`
`96`	`96`	`}`
`97`	`97`
`98`		`- $convertedsteps += $yamlstep`
	`98`	`+ [array]$convertedsteps += $yamlstep`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`}`
`@@ -106,8 +106,10 @@ function Convert-TaskStepsToYAMLSteps {`
`106`	`106`	`}else{`
`107`	`107`	`Write-Verbose 'No Tasks found. skipping steps.'`
`108`	`108`	`}`
`109`		`-`
`110`		`- return $convertedsteps`
	`109`	`+ if ($convertedsteps.Count -lt 1) {`
	`110`	`+ [array]$convertedsteps = @()`
	`111`	`+ }`
	`112`	`+ return [array]$convertedsteps`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ function Get-CronFromSchedule {`
`44`	`44`
`45`	`45`	`$SourceTimezone = [System.TimeZoneInfo]::FindSystemTimeZoneById($schedule.timezoneid)`
`46`	`46`
`47`		`- if($SourceTimezone.SupportsDaylightSavingTime -eq $true){`
	`47`	`+ if($SourceTimezone.SupportsDaylightSavingTime -eq $true -and $datetimetoconvert.IsDaylightSavingTime() -eq $true){`
`48`	`48`	`$datetimetoconvert = $datetimetoconvert.AddHours(1)`
`49`	`49`	`}`
`50`	`50`