Skip to content

Commit 1123190

Browse files
tigtig
committed
Merge branch 'terminal_gui_v2' of tig:tig/GraphicalTools into terminal_gui_v2
2 parents 627ae55 + a2afaec commit 1123190

17 files changed

Lines changed: 218 additions & 173 deletions

‎.gitignore‎

Lines changed: 14 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,16 @@
1-
*.swp
2-
*.*~
3-
project.lock.json
4-
.DS_Store
5-
*.pyc
6-
nupkg/
7-
8-
# Rider
9-
.idea
10-
11-
# User-specific files
12-
*.suo
13-
*.user
14-
*.userosscache
15-
*.sln.docstates
16-
17-
# Build results
18-
[Dd]ebug/
19-
[Dd]ebugPublic/
20-
[Rr]elease/
21-
[Rr]eleases/
22-
x64/
23-
x86/
24-
build/
25-
bld/
26-
[Bb]in/
27-
[Oo]bj/
28-
[Oo]ut/
29-
msbuild.log
30-
msbuild.err
31-
msbuild.wrn
32-
33-
publish/
34-
35-
#Module build
361
module/
2+
out/
3+
bin/
4+
obj/
5+
publish/
6+
*.sln
7+
*.slnx
378

38-
# Visual Studio 2015
39-
.vs/
40-
41-
# ingore downloaded .NET
42-
.dotnet
43-
44-
# Ignore package
45-
Microsoft.PowerShell.GraphicalTools.zip
46-
Microsoft.PowerShell.ConsoleGuiTools.zip
47-
48-
# git artifacts
49-
*.orig
9+
# IDE support (keep locally, don't track)
10+
/.vs/
11+
/.vscode/
12+
*.user
13+
*.suo
14+
*.sln.DotSettings
15+
Properties/launchSettings.json
16+
nuget.local.config

‎.vscode/settings.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Directory.Build.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<!-- <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> -->
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<!-- Use nuget.local.config if present (gitignored). Create it to override the
5+
default nuget.config, e.g. to use nuget.org instead of the Azure DevOps feed. -->
6+
<RestoreConfigFile Condition="Exists('$(MSBuildThisFileDirectory)nuget.local.config')">$(MSBuildThisFileDirectory)nuget.local.config</RestoreConfigFile>
47
</PropertyGroup>
58
</Project>

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.7" />
4-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
5-
<PackageVersion Include="System.Management.Automation" Version="7.4.7" />
6-
<!--<PackageVersion Include="Terminal.Gui" Version="2.0.0-develop.4947" />-->
3+
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
4+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
5+
<PackageVersion Include="System.Management.Automation" Version="7.5.4" />
6+
<PackageVersion Include="Terminal.Gui" Version="2.0.0-beta.149" />
77
</ItemGroup>
88
</Project>

‎GraphicalTools.sln‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎GraphicalTools.sln.DotSettings‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎nuget.config‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<add key="PowerShellCore_PublicPackages" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json" />
56
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6-
<!-- <add key="PowerShellCore_PublicPackages" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json" /> -->
77
</packageSources>
8+
<packageSourceMapping>
9+
<packageSource key="nuget.org">
10+
<package pattern="*" />
11+
</packageSource>
12+
<packageSource key="PowerShellCore_PublicPackages">
13+
<package pattern="Microsoft.PowerShell.*" />
14+
<package pattern="System.Management.Automation" />
15+
</packageSource>
16+
</packageSourceMapping>
817
</configuration>

‎src/Microsoft.PowerShell.ConsoleGuiTools/GridViewDataSource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,4 @@ public void Dispose()
124124
{
125125
// No resources to dispose currently
126126
}
127-
}
127+
}

‎src/Microsoft.PowerShell.ConsoleGuiTools/Header.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public override void EndInit()
2727

2828

2929
// We are a subview of the ListView.Padding.
30-
if (SuperView is Padding padding) padding.Parent?.ViewportChanged += ListViewOnViewportChanged;
30+
if (SuperView is PaddingView padding) padding.Adornment?.Parent?.ViewportChanged += ListViewOnViewportChanged;
3131

3232
return;
3333

@@ -40,7 +40,7 @@ void ListViewOnViewportChanged(object? sender, DrawEventArgs e)
4040

4141
protected override void OnSubViewLayout(LayoutEventArgs args)
4242
{
43-
if (SuperView is Padding { Parent: ListView listView })
43+
if (SuperView is PaddingView { Adornment.Parent: ListView listView })
4444
SetContentSize(GetContentSize() with { Width = listView.GetContentSize().Width });
4545

4646
base.OnSubViewLayout(args);

‎src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.csproj‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\..\ConsoleGuiTools.Common.props" />
3-
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
5-
<LangVersion>preview</LangVersion>
6-
<Nullable>enable</Nullable>
7-
</PropertyGroup>
2+
<Import Project="..\..\ConsoleGuiTools.Common.props" />
3+
<PropertyGroup>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<LangVersion>preview</LangVersion>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
88

9-
<PropertyGroup>
10-
<!-- To pull Terminal.Gui from a local nuget source:
9+
<PropertyGroup>
10+
<!-- To pull Terminal.Gui from a local nuget source:
1111
- Build Terminal.Gui locally in ../../gui-cs/Terminal.Gui
1212
- Change Terminal.Gui Version= to "major.minor.patch-*"
1313
- Add ';https://api.nuget.org/v3/index.json' to the end of the RestoreSources property group below
1414
- Uncomment the RestoreSources property group below
1515
-->
16-
<!--<RestoreSources>https://api.nuget.org/v3/index.json;$(RestoreSources);../../../gui-cs/Terminal.Gui/Terminal.Gui/bin/Debug</RestoreSources>-->
17-
</PropertyGroup>
16+
<!--<RestoreSources>https://api.nuget.org/v3/index.json;$(RestoreSources);../../../gui-cs/Terminal.Gui/Terminal.Gui/bin/Debug</RestoreSources>-->
17+
</PropertyGroup>
1818

19-
<ItemGroup>
20-
<!-- Using local Terminal.Gui build for debugging -->
21-
<!--<ProjectReference Include="..\..\..\gui-cs\Terminal.Gui\Terminal.Gui\Terminal.Gui.csproj" />-->
22-
<!--<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.4" />-->
23-
<PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4947" />
24-
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="Microsoft.PowerShell.SDK" />
21+
<PackageReference Include="Terminal.Gui" />
22+
</ItemGroup>
2523

26-
<ItemGroup>
27-
<ProjectReference Include="../Microsoft.PowerShell.OutGridView.Models/Microsoft.PowerShell.OutGridView.Models.csproj" />
28-
</ItemGroup>
24+
<ItemGroup>
25+
<ProjectReference Include="../Microsoft.PowerShell.OutGridView.Models/Microsoft.PowerShell.OutGridView.Models.csproj" />
26+
</ItemGroup>
2927

30-
<ItemGroup>
31-
<None Update="Microsoft.PowerShell.ConsoleGuiTools.psd1" CopyToOutputDirectory="PreserveNewest" />
32-
</ItemGroup>
28+
<ItemGroup>
29+
<None Update="Microsoft.PowerShell.ConsoleGuiTools.psd1" CopyToOutputDirectory="PreserveNewest" />
30+
</ItemGroup>
3331

34-
<PropertyGroup>
35-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
36-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
37-
<AnalysisMode>Recommended</AnalysisMode>
38-
</PropertyGroup>
32+
<PropertyGroup>
33+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
34+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
35+
<AnalysisMode>Recommended</AnalysisMode>
36+
</PropertyGroup>
3937

40-
<PropertyGroup>
41-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
42-
</PropertyGroup>
43-
</Project>
38+
<PropertyGroup>
39+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
40+
</PropertyGroup>
41+
</Project>

0 commit comments

Comments
 (0)