Skip to content

Commit 12ffb00

Browse files
crummelcrummel
committed
Upgrade command-line-api
1 parent b233ae4 commit 12ffb00

7 files changed

+191
-129
lines changed

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
<Sha>956e14dedd3a3ac981b320d66c6d389387a2954a</Sha>
4343
</Dependency>
4444
<!-- this should have CPD to Roslyn or runtime but they don't have the proper Version.Details.xml entry - https://github.com/dotnet/runtime/issues/42637 -->
45-
<Dependency Name="System.CommandLine" Version="2.0.0-beta1.20253.1">
45+
<Dependency Name="System.CommandLine" Version="2.0.0-beta1.20371.2">
4646
<Uri>https://github.com/dotnet/command-line-api</Uri>
47-
<Sha>afd010ba8cb3cbd714c734465d1a5de1ee133e2d</Sha>
47+
<Sha>6ddde11ed45e3f4b9d80c97670f347dbfda15c3f</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-6.21160.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5050
<Uri>https://github.com/dotnet/roslyn</Uri>

‎patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch

Lines changed: 33 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
From aafb58d2919b4ebe663cd61fd7fc622358da2ce5 Mon Sep 17 00:00:00 2001
1+
From f6976aaccc195fb298e1c61d20d5b75ea5ac52f5 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Fri, 18 Sep 2020 16:09:49 -0500
4-
Subject: [PATCH 1/3] Exclude dotnet-suggest from source-build.
4+
Subject: [PATCH 1/4] Exclude dotnet-suggest from source-build.
55

66
This is not used by any downstream repos in source-build and adds a
77
bunch of prebuilts, so we can leave this out for now.
88
---
9-
System.CommandLine.sln | 134 ------------------
9+
System.CommandLine.sln | 105 ------------------
1010
.../dotnet-suggest.csproj | 1 +
11-
2 files changed, 1 insertion(+), 134 deletions(-)
11+
2 files changed, 1 insertion(+), 105 deletions(-)
1212

1313
diff --git a/System.CommandLine.sln b/System.CommandLine.sln
14-
index ec97010..102aefe 100644
14+
index bb83d4f..7caad0e 100644
1515
--- a/System.CommandLine.sln
1616
+++ b/System.CommandLine.sln
17-
@@ -30,31 +30,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E5B1EC71-0FC
17+
@@ -30,32 +30,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E5B1EC71-0FC
1818
EndProject
1919
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine", "src\System.CommandLine\System.CommandLine.csproj", "{0BE8E56E-7580-4526-BE24-D304E1779724}"
2020
EndProject
@@ -28,12 +28,12 @@ index ec97010..102aefe 100644
2828
EndProject
2929
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.DragonFruit.Tests", "src\System.CommandLine.DragonFruit.Tests\System.CommandLine.DragonFruit.Tests.csproj", "{1F4B2074-F651-4A02-A860-7DDA74B2CC5F}"
3030
-EndProject
31-
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-suggest", "src\System.CommandLine.Suggest\dotnet-suggest.csproj", "{E23C760E-B826-4B4F-BE76-916D86BAD2DB}"
32-
-EndProject
31+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-suggest", "src\System.CommandLine.Suggest\dotnet-suggest.csproj", "{E23C760E-B826-4B4F-BE76-916D86BAD2DB}"
32+
EndProject
3333
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-suggest.Tests", "src\System.CommandLine.Suggest.Tests\dotnet-suggest.Tests.csproj", "{E41F0471-B14D-4FA0-9D8B-1E7750695AE9}"
3434
-EndProject
35-
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderingPlayground", "samples\RenderingPlayground\RenderingPlayground.csproj", "{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}"
36-
-EndProject
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderingPlayground", "samples\RenderingPlayground\RenderingPlayground.csproj", "{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}"
36+
EndProject
3737
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Rendering", "src\System.CommandLine.Rendering\System.CommandLine.Rendering.csproj", "{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}"
3838
EndProject
3939
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Rendering.Tests", "src\System.CommandLine.Rendering.Tests\System.CommandLine.Rendering.Tests.csproj", "{9E574595-A9CD-441A-9328-1D4DD5B531E8}"
@@ -43,10 +43,11 @@ index ec97010..102aefe 100644
4343
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Hosting", "src\System.CommandLine.Hosting\System.CommandLine.Hosting.csproj", "{644C4B4A-4A32-4307-9F71-C3BF901FFB66}"
4444
EndProject
4545
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CommandLine.Hosting.Tests", "src\System.CommandLine.Hosting.Tests\System.CommandLine.Hosting.Tests.csproj", "{39483140-BC26-4CAD-BBAE-3DC76C2F16CF}"
46+
-EndProject
47+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingPlayground", "samples\HostingPlayground\HostingPlayground.csproj", "{0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}"
4648
EndProject
4749
Global
48-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
49-
@@ -78,30 +61,6 @@ Global
50+
@@ -80,30 +66,6 @@ Global
5051
{0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x64.Build.0 = Release|Any CPU
5152
{0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x86.ActiveCfg = Release|Any CPU
5253
{0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x86.Build.0 = Release|Any CPU
@@ -77,7 +78,7 @@ index ec97010..102aefe 100644
7778
{EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7879
{EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|Any CPU.Build.0 = Debug|Any CPU
7980
{EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|x64.ActiveCfg = Debug|Any CPU
80-
@@ -114,54 +73,6 @@ Global
81+
@@ -116,18 +78,6 @@ Global
8182
{EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x64.Build.0 = Release|Any CPU
8283
{EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x86.ActiveCfg = Release|Any CPU
8384
{EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x86.Build.0 = Release|Any CPU
@@ -93,18 +94,13 @@ index ec97010..102aefe 100644
9394
- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x64.Build.0 = Release|Any CPU
9495
- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x86.ActiveCfg = Release|Any CPU
9596
- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x86.Build.0 = Release|Any CPU
96-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
98-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x64.ActiveCfg = Debug|Any CPU
99-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x64.Build.0 = Debug|Any CPU
100-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x86.ActiveCfg = Debug|Any CPU
101-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x86.Build.0 = Debug|Any CPU
102-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
103-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|Any CPU.Build.0 = Release|Any CPU
104-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x64.ActiveCfg = Release|Any CPU
105-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x64.Build.0 = Release|Any CPU
106-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.ActiveCfg = Release|Any CPU
107-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.Build.0 = Release|Any CPU
97+
{E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
98+
{E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
99+
{E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x64.ActiveCfg = Debug|Any CPU
100+
@@ -140,18 +90,6 @@ Global
101+
{E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x64.Build.0 = Release|Any CPU
102+
{E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.ActiveCfg = Release|Any CPU
103+
{E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.Build.0 = Release|Any CPU
108104
- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
109105
- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
110106
- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -117,22 +113,10 @@ index ec97010..102aefe 100644
117113
- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x64.Build.0 = Release|Any CPU
118114
- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x86.ActiveCfg = Release|Any CPU
119115
- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x86.Build.0 = Release|Any CPU
120-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.Build.0 = Debug|Any CPU
122-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x64.ActiveCfg = Debug|Any CPU
123-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x64.Build.0 = Debug|Any CPU
124-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x86.ActiveCfg = Debug|Any CPU
125-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x86.Build.0 = Debug|Any CPU
126-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|Any CPU.ActiveCfg = Release|Any CPU
127-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|Any CPU.Build.0 = Release|Any CPU
128-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|x64.ActiveCfg = Release|Any CPU
129-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|x64.Build.0 = Release|Any CPU
130-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|x86.ActiveCfg = Release|Any CPU
131-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|x86.Build.0 = Release|Any CPU
132-
{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133-
{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
134-
{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Debug|x64.ActiveCfg = Debug|Any CPU
135-
@@ -174,30 +85,6 @@ Global
116+
{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117+
{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.Build.0 = Debug|Any CPU
118+
{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x64.ActiveCfg = Debug|Any CPU
119+
@@ -176,30 +114,6 @@ Global
136120
{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x64.Build.0 = Release|Any CPU
137121
{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x86.ActiveCfg = Release|Any CPU
138122
{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x86.Build.0 = Release|Any CPU
@@ -163,7 +147,7 @@ index ec97010..102aefe 100644
163147
{644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
164148
{644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|Any CPU.Build.0 = Debug|Any CPU
165149
{644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|x64.ActiveCfg = Debug|Any CPU
166-
@@ -210,36 +97,15 @@ Global
150+
@@ -212,18 +126,6 @@ Global
167151
{644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x64.Build.0 = Release|Any CPU
168152
{644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x86.ActiveCfg = Release|Any CPU
169153
{644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x86.Build.0 = Release|Any CPU
@@ -179,27 +163,28 @@ index ec97010..102aefe 100644
179163
- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x64.Build.0 = Release|Any CPU
180164
- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x86.ActiveCfg = Release|Any CPU
181165
- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x86.Build.0 = Release|Any CPU
182-
EndGlobalSection
183-
GlobalSection(SolutionProperties) = preSolution
184-
HideSolutionNode = FALSE
166+
{0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
167+
{0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|Any CPU.Build.0 = Debug|Any CPU
168+
{0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|x64.ActiveCfg = Debug|Any CPU
169+
@@ -242,18 +144,11 @@ Global
185170
EndGlobalSection
186171
GlobalSection(NestedProjects) = preSolution
187172
{0BE8E56E-7580-4526-BE24-D304E1779724} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
188173
- {F843CCCA-4CC9-422C-A881-3AE6A998B53F} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
189174
- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00} = {6749FB3E-39DE-4321-A39E-525278E9408D}
190175
{EEC30462-078F-45EB-AA70-12E3170CD51E} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
191176
- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
192-
- {E23C760E-B826-4B4F-BE76-916D86BAD2DB} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
177+
{E23C760E-B826-4B4F-BE76-916D86BAD2DB} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
193178
- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
194-
- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E} = {6749FB3E-39DE-4321-A39E-525278E9408D}
179+
{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E} = {6749FB3E-39DE-4321-A39E-525278E9408D}
195180
{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
196181
- {9E574595-A9CD-441A-9328-1D4DD5B531E8} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
197182
- {C39B0705-993E-43DB-B66A-A37A587F0BF7} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
198183
{644C4B4A-4A32-4307-9F71-C3BF901FFB66} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
199184
- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
185+
{0BF6958D-9EE3-4623-B3D6-4DA77EAC1906} = {6749FB3E-39DE-4321-A39E-525278E9408D}
200186
EndGlobalSection
201187
GlobalSection(ExtensibilityGlobals) = postSolution
202-
SolutionGuid = {5C159F93-800B-49E7-9905-EE09F8B8434A}
203188
diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
204189
index f529484..ef9c3bb 100644
205190
--- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj

‎patches/command-line-api/0002-Use-package-version-properties-for-reference-version.patch

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
From 74c9b072853ff4d68f2630462a6f1ac5d576979d Mon Sep 17 00:00:00 2001
1+
From 4860e6a90c1f0b014a79d9a4c5c237d53281902d Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Mon, 21 Sep 2020 09:59:02 -0500
4-
Subject: [PATCH 2/2] Use package version properties for reference versions.
4+
Subject: [PATCH 2/4] Use package version properties for reference versions.
55

66
---
7-
eng/Versions.props | 7 +++++--
8-
src/System.CommandLine/System.CommandLine.csproj | 4 ++--
9-
2 files changed, 7 insertions(+), 4 deletions(-)
7+
eng/Versions.props | 8 ++++++--
8+
src/System.CommandLine/System.CommandLine.csproj | 4 ++--
9+
2 files changed, 8 insertions(+), 4 deletions(-)
1010

1111
diff --git a/eng/Versions.props b/eng/Versions.props
12-
index 3048701..16a0eb7 100644
12+
index 3048701..6e9c9af 100644
1313
--- a/eng/Versions.props
1414
+++ b/eng/Versions.props
15-
@@ -29,9 +29,12 @@
15+
@@ -29,9 +29,13 @@
1616
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
1717
<PublishWindowsPdb>true</PublishWindowsPdb>
1818
</PropertyGroup>
@@ -26,22 +26,23 @@ index 3048701..16a0eb7 100644
2626
+ <MicrosoftCSharpPackageVersion Condition="'$(MicrosoftCSharpPackageVersion)' == ''">4.4.1</MicrosoftCSharpPackageVersion>
2727
+ <SystemMemoryPackageVersion Condition="'$(SystemMemoryPackageVersion)' == ''">4.5.3</SystemMemoryPackageVersion>
2828
+ </PropertyGroup>
29+
+
2930
</Project>
3031
diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj
31-
index 1ae8dd3..aaa2c4a 100644
32+
index 5841d89..83d604c 100644
3233
--- a/src/System.CommandLine/System.CommandLine.csproj
3334
+++ b/src/System.CommandLine/System.CommandLine.csproj
34-
@@ -19,8 +19,8 @@
35-
</PropertyGroup>
36-
35+
@@ -24,8 +24,8 @@
36+
</ItemGroup>
37+
3738
<ItemGroup>
3839
- <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
39-
- <PackageReference Include="system.memory" Version="4.5.3" />
40+
- <PackageReference Include="system.memory" Version="4.5.4" />
4041
+ <PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
4142
+ <PackageReference Include="system.memory" Version="$(SystemMemoryPackageVersion)" />
4243
</ItemGroup>
43-
44+
4445
</Project>
45-
--
46+
--
4647
2.18.0
4748

0 commit comments

Comments
 (0)