Skip to content

Commit 35d4984

Browse files
jimbrigjimbrig
authored
Merge branch 'main' into develop
2 parents c32a263 + fb5e48c commit 35d4984

39 files changed

+579
-546
lines changed

‎.vscode/extensions.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"recommendations": [
33
"ms-vscode.powershell",
4-
"tylerleonhardt.vscode-inline-values-powershell",
54
"christian-kohler.path-intellisense",
6-
"psioniq.psi-header"
5+
"tylerleonhardt.vscode-pester-test-adapter",
6+
"tyriar.windows-terminal",
7+
"pspester.pester-test",
8+
"robowens.psbuild",
9+
"ms-azuretools.vscode-docker"
710
]
811
}

‎Archive/.gitignore

-5
This file was deleted.

‎Custom/Archive/install-gitwithssh.ps1 ‎Archive/Custom/Archive/install-gitwithssh.ps1

File renamed without changes.

‎Custom/Archive/install-helpers.ps1 ‎Archive/Custom/Archive/install-helpers.ps1

File renamed without changes.

‎Custom/Archive/install-nerd-fonts.ps1 ‎Archive/Custom/Archive/install-nerd-fonts.ps1

File renamed without changes.

‎Custom/Archive/install-pwsh-preview.ps1 ‎Archive/Custom/Archive/install-pwsh-preview.ps1

File renamed without changes.

‎Custom/Archive/install-pwsh.ps1 ‎Archive/Custom/Archive/install-pwsh.ps1

File renamed without changes.

‎Custom/Archive/installed-applications.ps1 ‎Archive/Custom/Archive/installed-applications.ps1

File renamed without changes.

‎Custom/Archive/reset-settings.ps1 ‎Archive/Custom/Archive/reset-settings.ps1

File renamed without changes.

‎Custom/Archive/setup.ps1 ‎Archive/Custom/Archive/setup.ps1

File renamed without changes.

‎Custom/Functions/Export-Drivers.ps1 ‎Archive/Custom/Functions/Export-Drivers.ps1

File renamed without changes.

‎Custom/Functions/Export-ISOFiles.ps1 ‎Archive/Custom/Functions/Export-ISOFiles.ps1

File renamed without changes.

‎Custom/Functions/Install-GitHub.ps1 ‎Archive/Custom/Functions/Install-GitHub.ps1

File renamed without changes.

‎Custom/Functions/Obsidian-Helpers.ps1 ‎Archive/Custom/Functions/Obsidian-Helpers.ps1

File renamed without changes.

‎Custom/Functions/Test-ProgramInstalled.ps1 ‎Archive/Custom/Functions/Test-ProgramInstalled.ps1

File renamed without changes.

‎Custom/Functions/Update-EveryModule.ps1 ‎Archive/Custom/Functions/Update-EveryModule.ps1

File renamed without changes.

‎Custom/Functions/Update-PowerShell.ps1 ‎Archive/Custom/Functions/Update-PowerShell.ps1

File renamed without changes.

‎Custom/Modules/Extract-Icon.psm1 ‎Archive/Custom/Modules/Extract-Icon.psm1

File renamed without changes.

‎Custom/Modules/Feedback-Helpers.psm1 ‎Archive/Custom/Modules/Feedback-Helpers.psm1

File renamed without changes.

‎Custom/Modules/Install-Helpers.psm1 ‎Archive/Custom/Modules/Install-Helpers.psm1

File renamed without changes.

‎Custom/Modules/Keeper-Functions.psm1 ‎Archive/Custom/Modules/Keeper-Functions.psm1

File renamed without changes.

‎Custom/Modules/Windows-Helpers.psm1 ‎Archive/Custom/Modules/Windows-Helpers.psm1

File renamed without changes.

‎Custom/Sandbox/Custom-Windows-ISO-DISM-Workflow.ps1 ‎Archive/Custom/Sandbox/Custom-Windows-ISO-DISM-Workflow.ps1

File renamed without changes.

‎CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,37 @@ All notable changes to this project will be documented in this file.
33

44
## [unreleased]
55

6+
### Bug Fixes
7+
8+
- Fix aliases
9+
- Quotes
10+
611
### Documentation
712

813
- New release CHANGELOG docs
914
- Add ffsend to README
15+
- Update HELP
1016

1117
### Features
1218

1319
- Add 2 new scripts
1420
- Add `ffsend` completion
21+
- Make completion scripts robust to errors
22+
- Add Archived items back
23+
- Enhance vscode settings
24+
- Add choco to CurrentUserCurrentHost
25+
- Add PSVirtualEnv shell completion
26+
- Deprecate venv completion
1527

1628
### Miscellaneous Tasks
1729

1830
- Autopublish 2022-01-10T22:48:58Z
1931
- Autopublish 2022-02-23T18:00:44Z
2032
- Update TOC
33+
- Autopublish 2022-02-23T18:03:59Z
34+
- Autopublish 2022-02-26T23:17:42Z
35+
- Autopublish 2022-02-26T23:19:17Z
36+
- Autopublish 2022-05-04T03:43:14Z
2137

2238
## [1.3.0] - 2022-01-02
2339

‎Help/Microsoft.PowerShell.Core_00000000-0000-0000-0000-000000000000_HelpInfo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
3-
<HelpContentURI>https://aka.ms/powershell72-help</HelpContentURI>
3+
<HelpContentURI>https://aka.ms/powershell73-help</HelpContentURI>
44
<SupportedUICultures>
55
<UICulture>
66
<UICultureName>en-US</UICultureName>

‎Help/Microsoft.PowerShell.Diagnostics_ca046f10-ca64-4740-8ff9-2565dba61a4f_HelpInfo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
3-
<HelpContentURI>https://aka.ms/powershell72-help</HelpContentURI>
3+
<HelpContentURI>https://aka.ms/powershell73-help</HelpContentURI>
44
<SupportedUICultures>
55
<UICulture>
66
<UICultureName>en-US</UICultureName>

‎Help/Microsoft.PowerShell.Host_56d66100-99a0-4ffc-a12d-eee9a6718aef_HelpInfo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
3-
<HelpContentURI>https://aka.ms/powershell72-help</HelpContentURI>
3+
<HelpContentURI>https://aka.ms/powershell73-help</HelpContentURI>
44
<SupportedUICultures>
55
<UICulture>
66
<UICultureName>en-US</UICultureName>

‎Help/Microsoft.PowerShell.Management_eefcb906-b326-4e99-9f54-8b4bb6ef3c6d_HelpInfo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
3-
<HelpContentURI>https://aka.ms/powershell72-help</HelpContentURI>
3+
<HelpContentURI>https://aka.ms/powershell73-help</HelpContentURI>
44
<SupportedUICultures>
55
<UICulture>
66
<UICultureName>en-US</UICultureName>

‎Help/Microsoft.PowerShell.Security_a94c8c7e-9810-47c0-b8af-65089c13a35a_HelpInfo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
3-
<HelpContentURI>https://aka.ms/powershell72-help</HelpContentURI>
3+
<HelpContentURI>https://aka.ms/powershell73-help</HelpContentURI>
44
<SupportedUICultures>
55
<UICulture>
66
<UICultureName>en-US</UICultureName>

‎Help/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_HelpInfo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
3-
<HelpContentURI>https://aka.ms/powershell72-help</HelpContentURI>
3+
<HelpContentURI>https://aka.ms/powershell73-help</HelpContentURI>
44
<SupportedUICultures>
55
<UICulture>
66
<UICultureName>en-US</UICultureName>

‎Help/Microsoft.WSMan.Management_766204a6-330e-4263-a7ab-46c87afc366c_HelpInfo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
3-
<HelpContentURI>https://aka.ms/powershell72-help</HelpContentURI>
3+
<HelpContentURI>https://aka.ms/powershell73-help</HelpContentURI>
44
<SupportedUICultures>
55
<UICulture>
66
<UICultureName>en-US</UICultureName>

‎Microsoft.PowerShell_profile.ps1

+10
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,13 @@
66

77
# Load Custom User Specific Functions Here:
88
# . Custom\*.ps1
9+
10+
# Import the Chocolatey Profile that contains the necessary code to enable
11+
# tab-completions to function for `choco`.
12+
# Be aware that if you are missing these lines from your profile, tab completion
13+
# for `choco` will not function.
14+
# See https://ch0.co/tab-completion for details.
15+
$ChocolateyProfile = "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
16+
if (Test-Path($ChocolateyProfile)) {
17+
Import-Module "$ChocolateyProfile"
18+
}

‎Profile/aliases.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Set-Alias -Name checkdisk -Value Invoke-Checkdisk
1414
Set-Alias -Name sfc -Value Invoke-SFCScan
1515
Set-Alias -Name expl -Value explorer.exe
1616
Set-Alias -Name np -Value 'C:\Program Files\WindowsApps\Microsoft.WindowsNotepad_11.2111.0.0_x64__8wekyb3d8bbwe\Notepad\Notepad.exe'
17-
Set-Alias -Name files -Value 'C:\Program Files\WindowsApps\49306atecsolution.FilesUWP_2.0.34.0_x64__et10x9a9vyk8t\Files.exe'
1817

18+
# Set-Alias -Name files -Value 'C:\Program Files\WindowsApps\49306atecsolution.FilesUWP_2.0.34.0_x64__et10x9a9vyk8t\Files.exe'
1919

2020
# Remove stupid 'touch' alias for 'set-filetime'
2121
Remove-Alias -Name touch
@@ -40,10 +40,10 @@ If (Get-Command choco -ErrorAction SilentlyContinue) {
4040
Set-Alias -Name csearch -Value chocosearch
4141
Set-Alias -Name cup -Value chocoupgrade
4242

43-
If (Get-Command choco-cleaner) {
43+
If (Get-Command choco-cleaner -ErrorAction SilentlyContinue) {
4444
Set-Alias -Name cclean -Value chococlean
4545
}
46-
If (Get-Command choco-package-list-backup) {
46+
If (Get-Command choco-package-list-backup -ErrorAction SilentlyContinue) {
4747
Set-Alias -Name cbackup -Value chocobackup
4848
}
4949
}

‎Profile/completion.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Import-Module Microsoft.PowerShell.Utility
66

77
$path = "$PSScriptRoot\completions"
8-
$files = Get-ChildItem -Path $path -Filter "*.ps1"
8+
$files = Get-ChildItem -Path $path -Filter '*.ps1'
99
ForEach ($file in $files) {
1010
. $file
1111
}

‎Profile/completions/.deprecated/venv.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#Requires -Module PSVirtualEnv
2+
3+
. (ActivateVirtualEnvAutocompletion) # or in short '. (activate-venv)'

0 commit comments

Comments
 (0)