Skip to content

Commit 2ee3c5e

Browse files
Robert Holtrjmholt
Robert Holt
authored andcommitted
Rename PSCompatibilityAnalyzer to PSCompatibilityCollector
1 parent dd2035d commit 2ee3c5e

File tree

104 files changed

+42
-38
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+42
-38
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,5 +216,5 @@ PSScriptAnalyzer/
216216
# Test result file
217217
TestResults.xml
218218

219-
# PSCompatibilityAnalyzer module
220-
PSCompatibilityAnalyzer/out/
219+
# PSCompatibilityCollector module
220+
PSCompatibilityCollector/out/
+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public PowerShellDataCollector Build(SMA.PowerShell pwsh, PowerShellVersion psVe
5555

5656
private const string CORE_MODULE_NAME = "Microsoft.PowerShell.Core";
5757

58-
private const string THIS_MODULE_NAME = "PSCompatibilityAnalyzer";
58+
private const string THIS_MODULE_NAME = "PSCompatibilityCollector";
5959

6060
private static readonly Regex s_typeDataRegex = new Regex("Error in TypeData \"([A-Za-z.]+)\"", RegexOptions.Compiled);
6161

PSCompatibilityAnalyzer/PSCompatibilityAnalyzer.psd1 renamed to PSCompatibilityCollector/PSCompatibilityCollector.psd1

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
@{
1313

1414
# Script module or binary module file associated with this manifest.
15-
RootModule = 'PSCompatibilityAnalyzer.psm1'
15+
RootModule = 'PSCompatibilityCollector.psm1'
1616

1717
# Version number of this module.
18-
ModuleVersion = '0.1.0'
18+
ModuleVersion = '0.2.0'
1919

2020
# Supported PSEditions (field not compatible with PS v3/4)
2121
# CompatiblePSEditions = @('Core', 'Desktop')

PSCompatibilityAnalyzer/build.ps1 renamed to PSCompatibilityCollector/build.ps1

+9-7
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ if ($IsWindows -eq $false) {
2727
$script:TargetFrameworks = 'netstandard2.0','net452'
2828
}
2929

30-
$script:Psm1Path = [System.IO.Path]::Combine($PSScriptRoot, 'PSCompatibilityAnalyzer.psm1')
31-
$script:Psd1Path = [System.IO.Path]::Combine($PSScriptRoot, 'PSCompatibilityAnalyzer.psd1')
30+
$script:ModuleName = Split-Path $PSScriptRoot -Leaf
31+
32+
$script:Psm1Path = [System.IO.Path]::Combine($PSScriptRoot, "$script:ModuleName.psm1")
33+
$script:Psd1Path = [System.IO.Path]::Combine($PSScriptRoot, "$script:ModuleName.psd1")
3234
$script:ProfileDirPath = [System.IO.Path]::Combine($PSScriptRoot, 'profiles')
3335

34-
$script:BinModDir = [System.IO.Path]::Combine($PSScriptRoot, 'out', 'PSCompatibilityAnalyzer')
36+
$script:BinModDir = [System.IO.Path]::Combine($PSScriptRoot, 'out', "$script:ModuleName")
3537
$script:BinModSrcDir = Join-Path $PSScriptRoot 'Microsoft.PowerShell.CrossCompatibility'
3638

3739
$script:PublishDlls = @{
@@ -89,8 +91,8 @@ function Publish-CrossCompatibilityModule
8991
throw "$DestinationDir exists but is not a directory. Aborting."
9092
}
9193

92-
Copy-Item -LiteralPath $script:Psd1Path -Destination (Join-Path $DestinationDir 'PSCompatibilityAnalyzer.psd1')
93-
Copy-Item -LiteralPath $script:Psm1Path -Destination (Join-Path $DestinationDir 'PSCompatibilityAnalyzer.psm1')
94+
Copy-Item -LiteralPath $script:Psd1Path -Destination (Join-Path $DestinationDir "$script:ModuleName.psd1")
95+
Copy-Item -LiteralPath $script:Psm1Path -Destination (Join-Path $DestinationDir "$script:ModuleName.psm1")
9496
Copy-Item -Recurse -LiteralPath $script:ProfileDirPath -Destination $DestinationDir -ErrorAction Ignore
9597

9698
foreach ($framework in $TargetFramework)
@@ -118,7 +120,7 @@ if ($Clean)
118120
}
119121

120122
# Only build if the output directory does not exist
121-
if (-not (Test-Path "$PSScriptRoot/out/PSCompatibilityAnalyzer"))
123+
if (-not (Test-Path "$PSScriptRoot/out/$script:ModuleName"))
122124
{
123125
if ($Framework)
124126
{
@@ -136,7 +138,7 @@ if (-not (Test-Path "$PSScriptRoot/out/PSCompatibilityAnalyzer"))
136138
}
137139
else
138140
{
139-
Write-Verbose "PSCompatibilityAnalyzer module already built -- skipping build"
141+
Write-Verbose "$script:ModuleName module already built -- skipping build"
140142
Write-Verbose "Use '-Clean' to force building"
141143
}
142144

0 commit comments

Comments
 (0)