Skip to content

Commit d225d33

Browse files
nyanhpnyanhp
authored
* Prerelease build * ProductKeys copied to wrong location * AppVeyor pipe modified
1 parent 3b4c94f commit d225d33

File tree

17 files changed

+162
-44
lines changed

17 files changed

+162
-44
lines changed

‎.build/Build.ps1

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
else
3333
{
3434
Write-Verbose -Message "Module Installed, Importing $($moduleName)"
35-
Import-Module -Name $moduleName -Force -RequiredVersion $version
35+
Import-Module -ModuleInfo $module -Force
3636
}
3737
}
3838
else
@@ -76,13 +76,13 @@ if (-not ($latestVersion.Version -ge '1.6.0'))
7676

7777
if ($IsLinux)
7878
{
79-
$null = sudo mkdir ./usr/share/AutomatedLab/Assets -p
80-
$null = sudo mkdir ./usr/share/AutomatedLab/Stores -p
81-
$null = sudo mkdir ./usr/share/AutomatedLab/Labs -p
82-
$null = sudo mkdir ./usr/share/AutomatedLab/LabSources -p
79+
$null = sudo mkdir /usr/share/AutomatedLab/Assets -p
80+
$null = sudo mkdir /usr/share/AutomatedLab/Stores -p
81+
$null = sudo mkdir /usr/share/AutomatedLab/Labs -p
82+
$null = sudo mkdir /usr/share/AutomatedLab/LabSources -p
8383
}
8484

85-
Resolve-Module -Name Psake, PSDeploy, Pester, BuildHelpers, AutomatedLab, Ships, PSFramework, xPSDesiredStateConfiguration, xDscDiagnostics, xWebAdministration
85+
Resolve-Module -Name Psake, PSDeploy, Pester, BuildHelpers, AutomatedLab.Common, AutomatedLab, Ships, PSFramework, xPSDesiredStateConfiguration, xDscDiagnostics, xWebAdministration
8686

8787
Invoke-psake ./.build/psake.ps1
8888
exit ( [int]( -not $psake.build_success ) )

‎.build/afterdeploy.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Write-Host "'after_deploy' block"
2+
if ($IsLinux -or $IsMacOs) { return }
23
if ( (Get-PackageProvider nuget -Erroraction SilentlyContinue).Version -lt 2.8.5.210)
34
{
45
$provParams = @{

‎.build/beforebuild.ps1

+9-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,15 @@ Copy-Item -Path (Join-Path -Path $env:APPVEYOR_BUILD_FOLDER 'Assets/ProductKeys.
1111

1212
Write-Host "Setting version number in files"
1313
Add-AppveyorMessage -Message "Setting version number in files" -Category Information
14-
Get-ChildItem -Filter *.psd1 -Recurse | ForEach-Object { if ($_.Directory.Name -eq $_.BaseName)
14+
foreach ($item in Get-ChildItem -Filter *.psd1 -Recurse)
15+
{
16+
if ($item.BaseName -notin 'AutomatedLab','AutomatedLab.Recipe','AutomatedLab.Ships','AutomatedLabDefinition','AutomatedLabNotifications','AutomatedLabTest','AutomatedLabUnattended','AutomatedLabWorker','HostsFile','PSLog','PSFileTransfer') { continue }
17+
if ($item.Directory.Name -eq $item.BaseName)
1518
{
16-
(Get-Content $_.FullName -Raw) -replace "ModuleVersion += '\d\.\d\.\d'", "ModuleVersion = '$env:APPVEYOR_BUILD_VERSION'" | Out-File $_.FullName
19+
Add-AppveyorMessage -Message "$($item.BaseName) - $env:APPVEYOR_BUILD_VERSION, Prerelease: $($env:APPVEYOR_REPO_BRANCH -ne "master")" -Category Information
20+
$content = Get-Content $item.FullName
21+
$content = $content -replace "^\s*ModuleVersion += '\d\.\d\.\d'", "ModuleVersion = '$env:APPVEYOR_BUILD_VERSION'"
22+
if ($env:APPVEYOR_REPO_BRANCH -ne "master") {$content = $content -replace "Prerelease\s+=\s+''", "Prerelease = 'preview'"}
23+
$content | Set-Content -Path $item.FullName
1724
}
1825
}

‎AutomatedLab.Recipe/AutomatedLab.Recipe.psd1

978 Bytes
Binary file not shown.

‎AutomatedLab.Ships/AutomatedLab.Ships.psd1

+12
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,16 @@
1111
CLRVersion = '4.0'
1212
RequiredModules = @('SHiPS')
1313
FileList = @('AutomatedLab.Ships.psm1', 'AutomatedLab.Ships.psd1')
14+
15+
PrivateData = @{
16+
17+
PSData = @{
18+
Prerelease = ''
19+
Tags = @('ShipsProvider', 'Lab', 'LabAutomation', 'HyperV', 'Azure')
20+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
21+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
22+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
23+
ReleaseNotes = ''
24+
}
25+
}
1426
}

‎AutomatedLab/AutomatedLab.init.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,8 @@ $fPath = Join-Path -Path (Get-PSFConfigValue -FullName AutomatedLab.LabAppDataRo
744744
$fcPath = Join-Path -Path (Get-PSFConfigValue -FullName AutomatedLab.LabAppDataRoot) -ChildPath 'Assets/ProductKeysCustom.xml'
745745
if (-not (Test-Path -Path $fPath -ErrorAction SilentlyContinue))
746746
{
747-
Copy-Item -Path "$PSScriptRoot/ProductKeys.xml" -Destination $fcPath -Force -ErrorAction SilentlyContinue
747+
$null = if (-not (Test-Path -Path (Split-Path $fPath -Parent))) {New-Item -Path (Split-Path $fPath -Parent) -ItemType Directory}
748+
Copy-Item -Path "$PSScriptRoot/ProductKeys.xml" -Destination $fPath -Force -ErrorAction SilentlyContinue
748749
}
749750
Set-PSFConfig -Module AutomatedLab -Name ProductKeyFilePath -Value $fPath -Initialize -Validation string -Description 'Destination of the ProductKeys file for Windows products'
750751
Set-PSFConfig -Module AutomatedLab -Name ProductKeyFilePathCustom -Value $fcPath -Initialize -Validation string -Description 'Destination of the ProductKeysCustom file for Windows products'

‎AutomatedLab/AutomatedLab.psd1

+14-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
CompanyName = 'AutomatedLab Team'
1313

14-
Copyright = '2019'
14+
Copyright = '2022'
1515

16-
Description = 'The module creates a Hyper-V visual lab automatically as defined in the XML files.'
16+
Description = 'Automated lab environments with ease - Linux and Windows, Hyper-V and Azure'
1717

1818
PowerShellVersion = '5.1'
1919

@@ -289,4 +289,16 @@
289289
'AutomatedLabDiskImageWindows.psm1',
290290
'AutomatedLabRds.psm1'
291291
)
292+
293+
PrivateData = @{
294+
295+
PSData = @{
296+
Prerelease = ''
297+
Tags = @('Lab', 'LabAutomation', 'HyperV', 'Azure')
298+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
299+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
300+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
301+
ReleaseNotes = ''
302+
}
303+
}
292304
}

‎AutomatedLabDefinition/AutomatedLabDefinition.psd1

+13-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
CompanyName = 'AutomatedLab Team'
1313

14-
Copyright = '2019'
14+
Copyright = '2022'
1515

1616
Description = 'The module creates the lab and machine definition for the AutomatedLab module saved in XML'
1717

@@ -71,4 +71,16 @@
7171
AliasesToExport = @(
7272
'Get-LabPostInstallationActivity'
7373
)
74+
75+
PrivateData = @{
76+
77+
PSData = @{
78+
Prerelease = ''
79+
Tags = @('LabDefinition', 'Lab', 'LabAutomation', 'HyperV', 'Azure')
80+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
81+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
82+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
83+
ReleaseNotes = ''
84+
}
85+
}
7486
}

‎AutomatedLabNotifications/AutomatedLabNotifications.psd1

+12-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
CompatiblePSEditions = 'Core', 'Desktop'
99

10-
Copyright = '2019'
10+
Copyright = '2022'
1111

1212
Description = 'The module creates a Hyper-V visual lab automatically as defined in the XML files.'
1313

@@ -33,7 +33,17 @@
3333
"Public\Send-ALNotification.ps1"
3434
)
3535

36-
PrivateData = @{ }
36+
PrivateData = @{
37+
38+
PSData = @{
39+
Prerelease = ''
40+
Tags = @('LabNotifications' , 'IFTTT', 'Toast', 'Lab', 'LabAutomation', 'HyperV', 'Azure')
41+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
42+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
43+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
44+
ReleaseNotes = ''
45+
}
46+
}
3747

3848
# HelpInfo URI of this module
3949
# HelpInfoURI = ''

‎AutomatedLabTest/AutomatedLabTest.psd1

+14-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
CompanyName = 'AutomatedLab Team'
1313

14-
Copyright = '2020'
14+
Copyright = '2022'
1515

1616
Description = 'The module is for testing AutomatedLab'
1717

@@ -32,10 +32,20 @@
3232

3333
FileList = @('xml\AutomatedLabTest.format.ps1xml', 'AutomatedLabTest.psm1', 'AutomatedLabTest.psd1')
3434

35-
PrivateData = @{ }
35+
PrivateData = @{
36+
37+
PSData = @{
38+
Prerelease = ''
39+
Tags = @('LabTest', 'Lab', 'LabAutomation', 'HyperV', 'Azure')
40+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
41+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
42+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
43+
ReleaseNotes = ''
44+
}
45+
}
3646

3747
RequiredModules = @(
38-
@{ ModuleName='Pester'; ModuleVersion='5.0.0'; }
39-
@{ ModuleName='PSFramework'; ModuleVersion='1.1.59' }
48+
@{ ModuleName = 'Pester'; ModuleVersion = '5.0.0'; }
49+
@{ ModuleName = 'PSFramework'; ModuleVersion = '1.1.59' }
4050
)
4151
}

‎AutomatedLabTest/internal/scripts/license.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
New-PSFLicense -Product 'AutomatedLabTest' -Manufacturer 'janhe' -ProductVersion $script:ModuleVersion -ProductType Module -Name MIT -Version "1.0.0.0" -Date (Get-Date "2020-05-20") -Text @"
2-
Copyright (c) 2020 janhe
2+
Copyright (c) 2022 AutomatedLab
33
44
Permission is hereby granted, free of charge, to any person obtaining a copy
55
of this software and associated documentation files (the "Software"), to deal

‎AutomatedLabUnattended/AutomatedLabUnattended.psd1

+13-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
CompanyName = 'AutomatedLab Team'
1313

14-
Copyright = '2019'
14+
Copyright = '2022'
1515

1616
Description = 'The module is managing settings inside an unattended.xml file'
1717

@@ -22,6 +22,16 @@
2222
ModuleList = @('AutomatedLabUnattended')
2323

2424
FileList = @('AutomatedLabUnattended.psm1')
25-
}
26-
2725

26+
PrivateData = @{
27+
28+
PSData = @{
29+
Prerelease = ''
30+
Tags = @('UnattendedFile', 'Kickstart', 'AutoYast', 'Lab', 'LabAutomation', 'HyperV', 'Azure')
31+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
32+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
33+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
34+
ReleaseNotes = ''
35+
}
36+
}
37+
}

‎AutomatedLabWorker/AutomatedLabWorker.psd1

+13-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
CompanyName = 'AutomatedLab Team'
1313

14-
Copyright = '2019'
14+
Copyright = '2022'
1515

1616
Description = 'This module encapsulates all the work activities to prepare the lab'
1717

@@ -53,5 +53,16 @@
5353
'AutomatedLabVMWareWorkerVirtualMachines.psm1',
5454
'AutomatedLabVMWareWorkerNetwork.psm1')
5555

56-
PrivateData = @{ }
56+
57+
PrivateData = @{
58+
59+
PSData = @{
60+
Prerelease = ''
61+
Tags = @('LabWorker', 'Lab', 'LabAutomation', 'HyperV', 'Azure')
62+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
63+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
64+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
65+
ReleaseNotes = ''
66+
}
67+
}
5768
}

‎HostsFile/HostsFile.psd1

+13-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
CompanyName = 'AutomatedLab Team'
1313

14-
Copyright = '2019'
14+
Copyright = '2022'
1515

1616
Description = 'This module provides management of hosts file content'
1717

@@ -26,4 +26,16 @@
2626
FileList = @('HostsFile.psm1', 'HostsFile.psd1')
2727

2828
RequiredModules = @('PSFramework')
29+
30+
PrivateData = @{
31+
32+
PSData = @{
33+
Prerelease = ''
34+
Tags = @('HostFile', 'HostEntry')
35+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
36+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
37+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
38+
ReleaseNotes = ''
39+
}
40+
}
2941
}

‎PSFileTransfer/PSFileTransfer.psd1

+13-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
CompanyName = 'AutomatedLab Team'
1313

14-
Copyright = '2019'
14+
Copyright = '2022'
1515

1616
Description = 'This module packages functions created by Lee Holmes for transfering files over PowerShell Remoting'
1717

@@ -26,4 +26,16 @@
2626
FileList = @('PSFileTransfer.psm1', 'PSFileTransfer.psd1')
2727

2828
RequiredModules = @()
29+
30+
PrivateData = @{
31+
32+
PSData = @{
33+
Prerelease = ''
34+
Tags = @('FileTransfer')
35+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
36+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
37+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
38+
ReleaseNotes = ''
39+
}
40+
}
2941
}

‎PSLog/PSLog.psd1

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
CompanyName = 'AutomatedLab Team'
1515

16-
Copyright = '2019'
16+
Copyright = '2022'
1717

1818
PowerShellVersion = '5.1'
1919

@@ -33,5 +33,14 @@
3333
'System.Management.Automation.ScriptBlock'
3434
)
3535
TruncateLength = 50
36+
37+
PSData = @{
38+
Prerelease = ''
39+
Tags = @('Logging')
40+
LicenseUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/main/LICENSE'
41+
ProjectUri = 'https://github.com/AutomatedLab/AutomatedLab'
42+
IconUri = 'https://github.com/AutomatedLab/AutomatedLab/blob/master/Assets/Automated-Lab_icon256.png'
43+
ReleaseNotes = ''
44+
}
3645
}
3746
}

0 commit comments

Comments
 (0)