diff --git a/.vscode/tasks.json b/.vscode/tasks.json index daa2db4..bf81b0c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,7 +9,7 @@ { // See https://go.microsoft.com/fwlink/?LinkId=733558 // for the documentation about the tasks.json format - "version": "0.1.0", + "version": "2.0.0", // Start PowerShell "windows": { @@ -22,12 +22,6 @@ "command": "/usr/local/bin/powershell" }, - // The command is a shell script - "isShellCommand": true, - - // Show the output window always - "showOutput": "always", - "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ], @@ -35,18 +29,21 @@ // Associate with test task runner "tasks": [ { - "taskName": "Test", - "suppressTaskName": true, - "isTestCommand": true, - "showOutput": "always", + "label": "Test", + "type": "shell", "args": [ + "-NoProfile", + "-ExecutionPolicy", + "Bypass", "Write-Host 'Invoking Pester'; Import-Module Pester; Invoke-Pester -PesterOption @{IncludeVSCodeMarker=$true};", "Invoke-Command { Write-Host 'Completed Test task in task runner.' }" ], "problemMatcher": [ { "owner": "powershell", - "fileLocation": ["absolute"], + "fileLocation": [ + "absolute" + ], "severity": "error", "pattern": [ { @@ -60,7 +57,8 @@ } ] } - ] + ], + "group": "test" } - ] + ] } diff --git a/.vscode/tasks.json.old b/.vscode/tasks.json.old new file mode 100644 index 0000000..daa2db4 --- /dev/null +++ b/.vscode/tasks.json.old @@ -0,0 +1,66 @@ +// Available variables which can be used inside of strings. +// ${workspaceRoot}: the root folder of the team +// ${file}: the current opened file +// ${relativeFile}: the current opened file relative to workspaceRoot +// ${fileBasename}: the current opened file's basename +// ${fileDirname}: the current opened file's dirname +// ${fileExtname}: the current opened file's extension +// ${cwd}: the current working directory of the spawned process +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "0.1.0", + + // Start PowerShell + "windows": { + "command": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" + }, + "linux": { + "command": "/usr/bin/powershell" + }, + "osx": { + "command": "/usr/local/bin/powershell" + }, + + // The command is a shell script + "isShellCommand": true, + + // Show the output window always + "showOutput": "always", + + "args": [ + "-NoProfile", "-ExecutionPolicy", "Bypass" + ], + + // Associate with test task runner + "tasks": [ + { + "taskName": "Test", + "suppressTaskName": true, + "isTestCommand": true, + "showOutput": "always", + "args": [ + "Write-Host 'Invoking Pester'; Import-Module Pester; Invoke-Pester -PesterOption @{IncludeVSCodeMarker=$true};", + "Invoke-Command { Write-Host 'Completed Test task in task runner.' }" + ], + "problemMatcher": [ + { + "owner": "powershell", + "fileLocation": ["absolute"], + "severity": "error", + "pattern": [ + { + "regexp": "^\\s*(\\[-\\]\\s*.*?)(\\d+)ms\\s*$", + "message": 1 + }, + { + "regexp": "^\\s+at\\s+[^,]+,\\s*(.*?):\\s+line\\s+(\\d+)$", + "file": 1, + "line": 2 + } + ] + } + ] + } + ] +} diff --git a/Modules/DotNetCore/DotNetCore.psd1 b/Modules/DotNetCore/DotNetCore.psd1 deleted file mode 100644 index 650d450..0000000 Binary files a/Modules/DotNetCore/DotNetCore.psd1 and /dev/null differ diff --git a/Modules/DotNetCore/DotNetcore.psm1 b/Modules/DotNetCore/DotNetcore.psm1 deleted file mode 100644 index 2f0d9ae..0000000 --- a/Modules/DotNetCore/DotNetcore.psm1 +++ /dev/null @@ -1,25 +0,0 @@ -Function Set-DotNetSdkVersion { - [CmdletBinding()] - param( - [string]$version, - [string]$folder = $pwd - ) - - if(Test-Path "global.json") { - $globalJsonPath = (Resolve-Path 'global.json').Path - $globalJsonContent = Get-Content $globalJsonPath -raw | ConvertFrom-Json - } - else { - $globalJsonPath = Join-Path $pwd 'global.json' - Write-Output (New-Item -ItemType File $globalJsonPath) - $globalJsonContent = "{ - `"sdk`": { - `"version`": `"2.0.0`" - } - }" | ConvertFrom-Json - } - - $globalJsonContent.sdk | % {$_.version=$version} - $globalJsonContent | ConvertTo-Json | Set-Content $globalJsonPath - Write-Output $globalJsonContent -} \ No newline at end of file diff --git a/Modules/IntelliTect.Common/IntelliTect.Common.psd1 b/Modules/IntelliTect.Common/IntelliTect.Common.psd1 index e4576db..e1ea7a8 100644 Binary files a/Modules/IntelliTect.Common/IntelliTect.Common.psd1 and b/Modules/IntelliTect.Common/IntelliTect.Common.psd1 differ diff --git a/Modules/IntelliTect.Common/IntelliTect.Common.psm1 b/Modules/IntelliTect.Common/IntelliTect.Common.psm1 index 60fa3df..bb9af14 100644 --- a/Modules/IntelliTect.Common/IntelliTect.Common.psm1 +++ b/Modules/IntelliTect.Common/IntelliTect.Common.psm1 @@ -111,7 +111,7 @@ Function Highlight([string]$pattern, [Int32]$Context = 10, [Parameter(ValueFromP PROCESS { $items = $item.Split([Environment]::NewLine) foreach ($line in $items) { - if ( $line -like "*$pattern*") { + if ( $line -like "*$pattern*" -and 1) { write-host $line -foregroundcolor Yellow } else { diff --git a/Modules/IntelliTect.CredentialManager/IntelliTect.CredentialManager.psd1 b/Modules/IntelliTect.CredentialManager/IntelliTect.CredentialManager.psd1 index 516829d..6814ad7 100644 Binary files a/Modules/IntelliTect.CredentialManager/IntelliTect.CredentialManager.psd1 and b/Modules/IntelliTect.CredentialManager/IntelliTect.CredentialManager.psd1 differ diff --git a/Modules/IntelliTect.File/IntelliTect.File.psd1 b/Modules/IntelliTect.File/IntelliTect.File.psd1 index aa23226..d11678f 100644 Binary files a/Modules/IntelliTect.File/IntelliTect.File.psd1 and b/Modules/IntelliTect.File/IntelliTect.File.psd1 differ diff --git a/Modules/IntelliTect.Git/IntelliTect.Git.psd1 b/Modules/IntelliTect.Git/IntelliTect.Git.psd1 index 7d0caaf..c59d8dc 100644 Binary files a/Modules/IntelliTect.Git/IntelliTect.Git.psd1 and b/Modules/IntelliTect.Git/IntelliTect.Git.psd1 differ diff --git a/Modules/IntelliTect.Google/IntelliTect.Google.psd1 b/Modules/IntelliTect.Google/IntelliTect.Google.psd1 index 360a044..75a9522 100644 Binary files a/Modules/IntelliTect.Google/IntelliTect.Google.psd1 and b/Modules/IntelliTect.Google/IntelliTect.Google.psd1 differ diff --git a/Modules/IntelliTect.MicrosoftWord/IntelliTect.MicrosoftWord.psd1 b/Modules/IntelliTect.MicrosoftWord/IntelliTect.MicrosoftWord.psd1 index 5a5aeea..be24ff4 100644 --- a/Modules/IntelliTect.MicrosoftWord/IntelliTect.MicrosoftWord.psd1 +++ b/Modules/IntelliTect.MicrosoftWord/IntelliTect.MicrosoftWord.psd1 @@ -13,7 +13,7 @@ # Script module or binary module file associated with this manifest. RootModule = './IntelliTect.MicrosoftWord.psm1' -# Version number of this module. +# Version number of this module. ModuleVersion = '0.1.0.0' # ID used to uniquely identify this module @@ -26,7 +26,7 @@ Author = 'Mark Michaelis, Kelly Adams' CompanyName = 'IntelliTect' # Copyright statement for this module -# Copyright = '' +Copyright = '(c) 2019 IntelliTect. All rights reserved.' # Description of the functionality provided by this module Description = 'Provides an easy-to-use interface to Microsoft Word via PowerShell.'