Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Joel/7 #5

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Joel/7 #5

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
58b3e69
Add PSStyle support
Jaykul Sep 26, 2024
d08e6e8
Update with views from 7
Jaykul Sep 26, 2024
9ace773
Start by fixing the views. This is NormalView
Jaykul Sep 27, 2024
f9abe85
This is ConciseView
Jaykul Sep 28, 2024
f20497c
Start by fixing the views. This is NormalView
Jaykul Sep 28, 2024
771e1db
This is DetailedView
Jaykul Sep 28, 2024
7618f00
Fix WrapString so it works with LineColors
Jaykul Sep 30, 2024
85ab35e
This is YamlView which is almost the same as Detailed
Jaykul Sep 30, 2024
cfc60de
This is ConciseView
Jaykul Sep 30, 2024
47c2a48
This is DetailedView
Jaykul Sep 30, 2024
e103abf
Detect Github Workflow and Azure Pipelines and use DetailedView
Jaykul Oct 7, 2024
76e474a
Add explicit formatting for Github Actions and Azure Pipelines
Jaykul Oct 7, 2024
c2e8937
Clean up PSScriptAnalyzer
Jaykul Oct 7, 2024
1a56d18
Additional reference files, just for the record.
Jaykul Oct 7, 2024
82f2d6f
Fix workflow
Jaykul Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,10 @@ jobs:
submodules: true
fetch-depth: 0

- name: earthly +build
if: github.ref != 'refs/heads/main'
run: earthly --strict +build

- name: earthly +test
if: github.ref != 'refs/heads/main'
run: earthly --strict +test
@@ -34,18 +38,18 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: ModuleBuilder
path: Modules/ModuleBuilder
name: ErrorView
path: Modules/ErrorView

- uses: actions/upload-artifact@v4
with:
name: TestResults
path: Modules/ModuleBuilder-TestResults
path: Modules/ErrorView-TestResults

- uses: actions/upload-artifact@v4
with:
name: Packages
path: Modules/ModuleBuilder-Packages
path: Modules/ErrorView-Packages

- name: Upload Tests
uses: actions/upload-artifact@v4
@@ -68,8 +72,8 @@ jobs:
- name: Download Build Output
uses: actions/download-artifact@v4
with:
name: ModuleBuilder
path: Modules/ModuleBuilder
name: ErrorView
path: Modules/ErrorView
- name: Download Pester Tests
uses: actions/download-artifact@v4
with:
@@ -83,15 +87,15 @@ jobs:
- uses: PoshCode/Actions/install-requiredmodules@v1
- uses: PoshCode/Actions/pester@v1
with:
codeCoveragePath: Modules/ModuleBuilder
moduleUnderTest: ModuleBuilder
codeCoveragePath: Modules/ErrorView
moduleUnderTest: ErrorView
additionalModulePaths: ${{github.workspace}}/Modules
- name: Publish Test Results
uses: zyborg/dotnet-tests-report@v1
with:
test_results_path: results.xml
- name: Upload Results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Pester Results
path: ${{github.workspace}}/*.xml
14 changes: 14 additions & 0 deletions ErrorView.code-workspace
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"folders": [
{
"name": "ErrorView",
"path": "."
},
{
"path": "../../Tasks"
}
],
"settings": {
"powershell.cwd": "."
}
}
206 changes: 206 additions & 0 deletions Reference/FileInfo.format.ps1xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
<?xml version="1.0" encoding="utf-8"?>
<Configuration>
<ViewDefinitions>
<View>
<Name>children</Name>
<ViewSelectedBy>
<TypeName>System.IO.DirectoryInfo</TypeName>
</ViewSelectedBy>
<GroupBy>
<PropertyName>PSParentPath</PropertyName>
</GroupBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>Mode</Label>
<Width>7</Width>
<Alignment>Left</Alignment>
</TableColumnHeader>
<TableColumnHeader>
<Label>LastWriteTime</Label>
<Width>26</Width>
<Alignment>Right</Alignment>
</TableColumnHeader>
<TableColumnHeader>
<Label>Length</Label>
<Width>14</Width>
<Alignment>Right</Alignment>
</TableColumnHeader>
<TableColumnHeader>
<Label>Name</Label>
<Alignment>Left</Alignment>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<Wrap />
<TableColumnItems>
<TableColumnItem>
<PropertyName>ModeWithoutHardLink</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>LastWriteTimeString</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>LengthString</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>NameString</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>childrenWithHardlink</Name>
<ViewSelectedBy>
<TypeName>System.IO.DirectoryInfo</TypeName>
</ViewSelectedBy>
<GroupBy>
<PropertyName>PSParentPath</PropertyName>
</GroupBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>Mode</Label>
<Width>7</Width>
<Alignment>Left</Alignment>
</TableColumnHeader>
<TableColumnHeader>
<Label>LastWriteTime</Label>
<Width>26</Width>
<Alignment>Right</Alignment>
</TableColumnHeader>
<TableColumnHeader>
<Label>Length</Label>
<Width>14</Width>
<Alignment>Right</Alignment>
</TableColumnHeader>
<TableColumnHeader>
<Label>Name</Label>
<Alignment>Left</Alignment>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<Wrap />
<TableColumnItems>
<TableColumnItem>
<PropertyName>Mode</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>LastWriteTimeString</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>LengthString</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>NameString</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>children</Name>
<ViewSelectedBy>
<TypeName>System.IO.DirectoryInfo</TypeName>
</ViewSelectedBy>
<GroupBy>
<PropertyName>PSParentPath</PropertyName>
</GroupBy>
<ListControl>
<ListEntries>
<ListEntry>
<ListItems>
<ListItem>
<PropertyName>Name</PropertyName>
</ListItem>
<ListItem>
<PropertyName>CreationTime</PropertyName>
</ListItem>
<ListItem>
<PropertyName>LastWriteTime</PropertyName>
</ListItem>
<ListItem>
<PropertyName>LastAccessTime</PropertyName>
</ListItem>
<ListItem>
<PropertyName>Mode</PropertyName>
</ListItem>
<ListItem>
<PropertyName>LinkType</PropertyName>
</ListItem>
<ListItem>
<PropertyName>Target</PropertyName>
</ListItem>
</ListItems>
</ListEntry>
<ListEntry>
<EntrySelectedBy>
<TypeName>System.IO.FileInfo</TypeName>
</EntrySelectedBy>
<ListItems>
<ListItem>
<PropertyName>Name</PropertyName>
</ListItem>
<ListItem>
<Label>Length</Label>
<PropertyName>LengthString</PropertyName>
</ListItem>
<ListItem>
<PropertyName>CreationTime</PropertyName>
</ListItem>
<ListItem>
<PropertyName>LastWriteTime</PropertyName>
</ListItem>
<ListItem>
<PropertyName>LastAccessTime</PropertyName>
</ListItem>
<ListItem>
<PropertyName>Mode</PropertyName>
</ListItem>
<ListItem>
<PropertyName>LinkType</PropertyName>
</ListItem>
<ListItem>
<PropertyName>Target</PropertyName>
</ListItem>
<ListItem>
<PropertyName>VersionInfo</PropertyName>
</ListItem>
</ListItems>
</ListEntry>
</ListEntries>
</ListControl>
</View>
<View>
<Name>children</Name>
<ViewSelectedBy>
<TypeName>System.IO.DirectoryInfo</TypeName>
</ViewSelectedBy>
<GroupBy>
<PropertyName>PSParentPath</PropertyName>
</GroupBy>
<WideControl>
<WideEntries>
<WideEntry>
<WideItem>
<PropertyName>Name</PropertyName>
</WideItem>
</WideEntry>
<WideEntry>
<EntrySelectedBy>
<TypeName>System.IO.DirectoryInfo</TypeName>
</EntrySelectedBy>
<WideItem>
<PropertyName>Name</PropertyName>
</WideItem>
</WideEntry>
</WideEntries>
</WideControl>
</View>
</ViewDefinitions>
</Configuration>
1 change: 1 addition & 0 deletions Reference/LegacyErrorView.format.ps1xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?xml version="1.0" encoding="utf-8"?><Configuration><ViewDefinitions /></Configuration>
56 changes: 56 additions & 0 deletions Reference/NativeCommandError.ps1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
$errorColor = ''
$commandPrefix = ''
if (@('NativeCommandErrorMessage','NativeCommandError') -notcontains $_.FullyQualifiedErrorId -and @('CategoryView','ConciseView','DetailedView') -notcontains $ErrorView)
{
$myinv = $_.InvocationInfo
if ($Host.UI.SupportsVirtualTerminal) {
$errorColor = $PSStyle.Formatting.Error
}

$commandPrefix = if ($myinv -and $myinv.MyCommand) {
switch -regex ( $myinv.MyCommand.CommandType )
{
([System.Management.Automation.CommandTypes]::ExternalScript)
{
if ($myinv.MyCommand.Path)
{
$myinv.MyCommand.Path + ' : '
}

break
}

([System.Management.Automation.CommandTypes]::Script)
{
if ($myinv.MyCommand.ScriptBlock)
{
$myinv.MyCommand.ScriptBlock.ToString() + ' : '
}

break
}
default
{
if ($myinv.InvocationName -match '^[&amp;\.]?$')
{
if ($myinv.MyCommand.Name)
{
$myinv.MyCommand.Name + ' : '
}
}
else
{
$myinv.InvocationName + ' : '
}

break
}
}
}
elseif ($myinv -and $myinv.InvocationName)
{
$myinv.InvocationName + ' : '
}
}

$errorColor + $commandPrefix
Loading
Loading