Skip to content

Commit 49deb91

Browse files
authored
Remove HostsFile module reference (AutomatedLab#1780)
Bump required AutomatedLab.Common version to include HostsFile commands
1 parent bc1e664 commit 49deb91

28 files changed

+10
-906
lines changed

.build/02-build.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function BuildModule
1313
throw "Module name may not be empty"
1414
}
1515

16-
#region Handle Working Directory DefaultsHostsFile
16+
#region Handle Working Directory Defaults
1717
$WorkingDirectory = Join-Path -Path $PSScriptRoot -ChildPath "..\$Name"
1818
$publishDir = New-Item -Path $PSScriptRoot -Name "..\publish" -ItemType Directory -Force
1919
#endregion Handle Working Directory Defaults
@@ -84,7 +84,7 @@ if (-not $env:PSModulePath.Contains($modpath))
8484
$env:PSModulePath = '{0}{1}{2}' -f $modPath, $sep, $env:PSModulePath
8585
}
8686

87-
$modules = 'AutomatedLabCore', 'AutomatedLabUnattended', 'PSLog', 'PSFileTransfer', 'AutomatedLabDefinition', 'AutomatedLabWorker', 'HostsFile', 'AutomatedLabNotifications', 'AutomatedLabTest', 'AutomatedLab.Ships', 'AutomatedLab.Recipe', 'AutomatedLab'
87+
$modules = 'AutomatedLabCore', 'AutomatedLabUnattended', 'PSLog', 'PSFileTransfer', 'AutomatedLabDefinition', 'AutomatedLabWorker', 'AutomatedLabNotifications', 'AutomatedLabTest', 'AutomatedLab.Ships', 'AutomatedLab.Recipe', 'AutomatedLab'
8888
Write-Host "Building modules $($modules -join ',') to $modPath"
8989
foreach ($module in $modules)
9090
{
@@ -165,7 +165,7 @@ Installed-Size: $('{0:0}' -f ((Get-ChildItem -Path (Join-Path $buildFolder -Chil
165165
"@ | Set-Content -Path ./deb/automatedlab/DEBIAN/control -Encoding UTF8
166166

167167
# Copy content
168-
foreach ($source in [IO.DirectoryInfo[]]@('./publish/AutomatedLab', './publish/AutomatedLab.Recipe', './publish/AutomatedLab.Ships', './publish/AutomatedLabDefinition', './publish/AutomatedLabNotifications', './publish/AutomatedLabTest', './publish/AutomatedLabUnattended', './publish/AutomatedLabWorker', './publish/HostsFile', './publish/PSLog', './publish/PSFileTransfer'))
168+
foreach ($source in [IO.DirectoryInfo[]]@('./publish/AutomatedLab', './publish/AutomatedLab.Recipe', './publish/AutomatedLab.Ships', './publish/AutomatedLabDefinition', './publish/AutomatedLabNotifications', './publish/AutomatedLabTest', './publish/AutomatedLabUnattended', './publish/AutomatedLabWorker', './publish/PSLog', './publish/PSFileTransfer'))
169169
{
170170
$sourcePath = Join-Path -Path $source -ChildPath '/*'
171171
$modulepath = Join-Path -Path ./deb/automatedlab/usr/local/share/powershell/Modules -ChildPath "$($source.Name)/$($env:APPVEYOR_BUILD_VERSION)"

AutomatedLab.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{BF2C3317
2323
LabSources\Tools\WinSATAPI.dll = LabSources\Tools\WinSATAPI.dll
2424
EndProjectSection
2525
EndProject
26-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostsFile", "HostsFile", "{02FAEEE2-57BE-41C6-85BB-6B60F9D1983A}"
27-
ProjectSection(SolutionItems) = preProject
28-
HostsFile\HostsFile.psd1 = HostsFile\HostsFile.psd1
29-
HostsFile\HostsFile.psm1 = HostsFile\HostsFile.psm1
30-
EndProjectSection
31-
EndProject
3226
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutomatedLabWorker", "AutomatedLabWorker", "{B7B1933B-77D7-4310-9049-7744B1F07154}"
3327
ProjectSection(SolutionItems) = preProject
3428
AutomatedLabWorker\AutomatedLabAzureWorkerNetwork.psm1 = AutomatedLabWorker\AutomatedLabAzureWorkerNetwork.psm1

AutomatedLab/AutomatedLab.psd1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
RequiredModules = @(
3131
'AutomatedLabCore'
32-
@{ ModuleName = 'AutomatedLab.Common'; ModuleVersion = '2.3.17' }
32+
@{ ModuleName = 'AutomatedLab.Common'; ModuleVersion = '2.3.37' }
3333
'AutomatedLab.Recipe'
3434
'AutomatedLab.Ships'
3535
'AutomatedLabDefinition'
@@ -39,7 +39,6 @@
3939
'AutomatedLabWorker'
4040
'PSLog'
4141
'PSFileTransfer'
42-
'HostsFile'
4342
'Pester'
4443
'powershell-yaml'
4544
'PSFramework'

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
- Use Storage Account kind `storagev2` for all new lab sources storages
1414
- Storages will be upgraded automatically
1515

16+
### Removed
17+
18+
- HostsFile module removed and cmdlets integrated into AutomatedLab.Common
19+
1620
### Bugs
1721

1822
- Removed dependency to NewtonSoft.Json

Help/HostsFile/en-us/Add-HostEntry.md

Lines changed: 0 additions & 112 deletions
This file was deleted.

Help/HostsFile/en-us/Clear-HostFile.md

Lines changed: 0 additions & 61 deletions
This file was deleted.

Help/HostsFile/en-us/Get-HostEntry.md

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)