Skip to content

Commit

Permalink
Rename PSCompatibilityAnalyzer to PSCompatibilityCollector
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Holt authored and rjmholt committed Apr 24, 2019
1 parent dd2035d commit 2ee3c5e
Show file tree
Hide file tree
Showing 104 changed files with 42 additions and 38 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -216,5 +216,5 @@ PSScriptAnalyzer/
# Test result file
TestResults.xml

# PSCompatibilityAnalyzer module
PSCompatibilityAnalyzer/out/
# PSCompatibilityCollector module
PSCompatibilityCollector/out/
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public PowerShellDataCollector Build(SMA.PowerShell pwsh, PowerShellVersion psVe

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

private const string THIS_MODULE_NAME = "PSCompatibilityAnalyzer";
private const string THIS_MODULE_NAME = "PSCompatibilityCollector";

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
@{

# Script module or binary module file associated with this manifest.
RootModule = 'PSCompatibilityAnalyzer.psm1'
RootModule = 'PSCompatibilityCollector.psm1'

# Version number of this module.
ModuleVersion = '0.1.0'
ModuleVersion = '0.2.0'

# Supported PSEditions (field not compatible with PS v3/4)
# CompatiblePSEditions = @('Core', 'Desktop')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ if ($IsWindows -eq $false) {
$script:TargetFrameworks = 'netstandard2.0','net452'
}

$script:Psm1Path = [System.IO.Path]::Combine($PSScriptRoot, 'PSCompatibilityAnalyzer.psm1')
$script:Psd1Path = [System.IO.Path]::Combine($PSScriptRoot, 'PSCompatibilityAnalyzer.psd1')
$script:ModuleName = Split-Path $PSScriptRoot -Leaf

$script:Psm1Path = [System.IO.Path]::Combine($PSScriptRoot, "$script:ModuleName.psm1")
$script:Psd1Path = [System.IO.Path]::Combine($PSScriptRoot, "$script:ModuleName.psd1")
$script:ProfileDirPath = [System.IO.Path]::Combine($PSScriptRoot, 'profiles')

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

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

Copy-Item -LiteralPath $script:Psd1Path -Destination (Join-Path $DestinationDir 'PSCompatibilityAnalyzer.psd1')
Copy-Item -LiteralPath $script:Psm1Path -Destination (Join-Path $DestinationDir 'PSCompatibilityAnalyzer.psm1')
Copy-Item -LiteralPath $script:Psd1Path -Destination (Join-Path $DestinationDir "$script:ModuleName.psd1")
Copy-Item -LiteralPath $script:Psm1Path -Destination (Join-Path $DestinationDir "$script:ModuleName.psm1")
Copy-Item -Recurse -LiteralPath $script:ProfileDirPath -Destination $DestinationDir -ErrorAction Ignore

foreach ($framework in $TargetFramework)
Expand Down Expand Up @@ -118,7 +120,7 @@ if ($Clean)
}

# Only build if the output directory does not exist
if (-not (Test-Path "$PSScriptRoot/out/PSCompatibilityAnalyzer"))
if (-not (Test-Path "$PSScriptRoot/out/$script:ModuleName"))
{
if ($Framework)
{
Expand All @@ -136,7 +138,7 @@ if (-not (Test-Path "$PSScriptRoot/out/PSCompatibilityAnalyzer"))
}
else
{
Write-Verbose "PSCompatibilityAnalyzer module already built -- skipping build"
Write-Verbose "$script:ModuleName module already built -- skipping build"
Write-Verbose "Use '-Clean' to force building"
}

Expand Down
Loading

0 comments on commit 2ee3c5e

Please sign in to comment.