Skip to content

Commit 724affc

Browse files
committed
Update Terminal.Gui to 2.0.0-rc.3 and solution config
Switched to Terminal.Gui NuGet package (2.0.0-rc.3) in place of local project reference. Updated GraphicalTools.sln for VS 18, added Solution Items, and set SolutionGuid. Added a local NuGet package source to nuget.config.
1 parent 6266046 commit 724affc

4 files changed

Lines changed: 23 additions & 6 deletions

File tree

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
44
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
55
<PackageVersion Include="System.Management.Automation" Version="7.5.4" />
6-
<PackageVersion Include="Terminal.Gui" Version="2.0.0-beta.217" />
6+
<PackageVersion Include="Terminal.Gui" Version="2.0.0-rc.3" />
77
<!-- Test dependencies -->
88
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
99
<PackageVersion Include="xunit" Version="2.9.3" />

GraphicalTools.sln

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31903.59
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.6.11716.218 insiders
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
77
EndProject
@@ -17,6 +17,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terminal.Gui", "..\gui-cs\T
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terminal.Gui.Analyzers.Internal", "..\gui-cs\Terminal.Gui\Terminal.Gui.Analyzers.Internal\Terminal.Gui.Analyzers.Internal.csproj", "{45957E57-3576-4EE7-AE19-4AEEA3347007}"
1919
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC49DFD5-E542-49BF-B582-41A89281D7E0}"
21+
ProjectSection(SolutionItems) = preProject
22+
ConsoleGuiTools.build.ps1 = ConsoleGuiTools.build.ps1
23+
ConsoleGuiTools.Common.props = ConsoleGuiTools.Common.props
24+
Directory.Build.props = Directory.Build.props
25+
Directory.Packages.props = Directory.Packages.props
26+
global.json = global.json
27+
nuget.config = nuget.config
28+
README.md = README.md
29+
EndProjectSection
30+
EndProject
2031
Global
2132
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2233
Debug|Any CPU = Debug|Any CPU
@@ -96,4 +107,7 @@ Global
96107
{233472F8-D472-4265-813B-B394013A2B60} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
97108
{F1E2D3C4-B5A6-7890-ABCD-EF0987654321} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}
98109
EndGlobalSection
110+
GlobalSection(ExtensibilityGlobals) = postSolution
111+
SolutionGuid = {2FE0632F-98BB-4772-8465-957821A4EE1B}
112+
EndGlobalSection
99113
EndGlobal

nuget.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<clear />
55
<add key="PowerShellCore_PublicPackages" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json" />
66
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
7+
<add key="local" value="C:\Users\Tig/psrepo" />
78
</packageSources>
89
<packageSourceMapping>
910
<packageSource key="nuget.org">

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
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>$(RestoreSources);../../../gui-cs/Terminal.Gui/Terminal.Gui/bin/Debug;https://api.nuget.org/v3/index.json;</RestoreSources>
16+
<!--<RestoreSources>$(RestoreSources);../../../gui-cs/Terminal.Gui/Terminal.Gui/bin/Debug;https://api.nuget.org/v3/index.json;</RestoreSources>-->
1717
</PropertyGroup>
1818

1919
<ItemGroup>
2020
<PackageReference Include="Microsoft.PowerShell.SDK" />
2121
<!-- Temporarily using ProjectReference to local Terminal.Gui source instead of NuGet package.
2222
To revert, replace this ProjectReference with: <PackageReference Include="Terminal.Gui" /> -->
23-
<ProjectReference Include="..\..\..\gui-cs\Terminal.Gui\Terminal.Gui\Terminal.Gui.csproj" />
23+
<!--<ProjectReference Include="..\..\..\gui-cs\Terminal.Gui\Terminal.Gui\Terminal.Gui.csproj" />-->
24+
25+
<PackageReference Include="Terminal.Gui" />
2426
</ItemGroup>
2527

2628
<ItemGroup>

0 commit comments

Comments
 (0)