Skip to content

Commit df755e1

Browse files
author
Nikolay Pianikov
committed
Remove BuildEngine and refactor NuGetRestoreService to use NuGet.Commands API
1 parent cf23fac commit df755e1

7 files changed

Lines changed: 141 additions & 181 deletions

File tree

‎CSharpInteractive.HostApi/CSharpInteractive.HostApi.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
2020
<PackageReference Include="TeamCity.ServiceMessages" Version="4.1.1"/>
21-
<PackageReference Include="NuGet.Versioning" Version="6.14.0"/>
21+
<PackageReference Include="NuGet.Versioning" Version="6.14.3"/>
2222
<InternalsVisibleTo Include="DynamicProxyGenAssembly2"/>
2323
<InternalsVisibleTo Include="dotnet-csi"/>
2424
<InternalsVisibleTo Include="CSharpInteractive"/>

‎CSharpInteractive.Tests/Integration/ScriptRunTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ public void ShouldSupportInfo()
188188
[InlineData("nuget: IoC.Container, 1.3.6", "//1")]
189189
[InlineData("nuget:IoC.Container,1.3.6", "//1")]
190190
[InlineData("nuget: IoC.Container, [1.3.6, 2)", "//1")]
191-
[InlineData("nuget: IoC.Container", "//1")]
192191
public void ShouldSupportNuGetRestore(string package, string name)
193192
{
194193
// Given

‎CSharpInteractive/CSharpInteractive.Tool.csproj‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,41 +50,27 @@
5050
<When Condition="'$(TargetFramework)'=='net8.0'">
5151
<ItemGroup>
5252
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
53-
<PackageReference Include="NuGet.Build.Tasks" Version="6.11.1"/>
54-
<PackageReference Include="NuGet.Packaging" Version="6.14.3"/>
55-
<PackageReference Include="NuGet.Protocol" Version="6.14.3"/>
56-
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.3"/>
57-
<PackageReference Include="Microsoft.Build.Framework" Version="17.11.48" IncludeAssets="all"/>
58-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.48" IncludeAssets="all"/>
59-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.48" IncludeAssets="all"/>
6053
</ItemGroup>
6154
</When>
6255
<When Condition="'$(TargetFramework)'=='net9.0'">
6356
<ItemGroup>
6457
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.15" />
65-
<PackageReference Include="NuGet.Build.Tasks" Version="6.12.4"/>
66-
<PackageReference Include="NuGet.Packaging" Version="6.14.3"/>
67-
<PackageReference Include="NuGet.Protocol" Version="6.14.3"/>
68-
<PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.15"/>
69-
<PackageReference Include="Microsoft.Build.Framework" Version="17.12.50" IncludeAssets="all"/>
70-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.12.50" IncludeAssets="all"/>
71-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.12.50" IncludeAssets="all"/>
7258
</ItemGroup>
7359
</When>
7460
<Otherwise>
7561
<ItemGroup>
7662
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
77-
<PackageReference Include="NuGet.Build.Tasks" Version="6.14.0"/>
78-
<PackageReference Include="NuGet.Packaging" Version="6.14.3"/>
79-
<PackageReference Include="NuGet.Protocol" Version="6.14.3"/>
80-
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.7"/>
81-
<PackageReference Include="Microsoft.Build.Framework" Version="18.0.2" IncludeAssets="all"/>
82-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.0.2" IncludeAssets="all"/>
83-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.0.2" IncludeAssets="all"/>
8463
</ItemGroup>
8564
</Otherwise>
8665
</Choose>
8766

67+
<ItemGroup>
68+
<PackageReference Include="NuGet.Commands" Version="6.14.3"/>
69+
<PackageReference Include="NuGet.Packaging" Version="6.14.3"/>
70+
<PackageReference Include="NuGet.Protocol" Version="6.14.3"/>
71+
<PackageReference Include="NuGet.ProjectModel" Version="6.14.3"/>
72+
</ItemGroup>
73+
8874
<PropertyGroup>
8975
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
9076
</PropertyGroup>

‎CSharpInteractive/CSharpInteractive.csproj‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,41 +42,27 @@
4242
<When Condition="'$(TargetFramework)'=='net8.0'">
4343
<ItemGroup>
4444
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
45-
<PackageReference Include="NuGet.Build.Tasks" Version="6.11.1"/>
46-
<PackageReference Include="NuGet.Packaging" Version="6.14.3"/>
47-
<PackageReference Include="NuGet.Protocol" Version="6.14.3"/>
48-
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.3"/>
49-
<PackageReference Include="Microsoft.Build.Framework" Version="17.11.48" IncludeAssets="all"/>
50-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.48" IncludeAssets="all"/>
51-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.48" IncludeAssets="all"/>
5245
</ItemGroup>
5346
</When>
5447
<When Condition="'$(TargetFramework)'=='net9.0'">
5548
<ItemGroup>
5649
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.15" />
57-
<PackageReference Include="NuGet.Build.Tasks" Version="6.12.4"/>
58-
<PackageReference Include="NuGet.Packaging" Version="6.14.3"/>
59-
<PackageReference Include="NuGet.Protocol" Version="6.14.3"/>
60-
<PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.15"/>
61-
<PackageReference Include="Microsoft.Build.Framework" Version="17.12.50" IncludeAssets="all"/>
62-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.12.50" IncludeAssets="all"/>
63-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.12.50" IncludeAssets="all"/>
6450
</ItemGroup>
6551
</When>
6652
<Otherwise>
6753
<ItemGroup>
6854
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
69-
<PackageReference Include="NuGet.Build.Tasks" Version="6.14.0"/>
70-
<PackageReference Include="NuGet.Packaging" Version="6.14.3"/>
71-
<PackageReference Include="NuGet.Protocol" Version="6.14.3"/>
72-
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.7"/>
73-
<PackageReference Include="Microsoft.Build.Framework" Version="18.0.2" IncludeAssets="all"/>
74-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.0.2" IncludeAssets="all"/>
75-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.0.2" IncludeAssets="all"/>
7655
</ItemGroup>
7756
</Otherwise>
7857
</Choose>
7958

59+
<ItemGroup>
60+
<PackageReference Include="NuGet.Commands" Version="6.14.3"/>
61+
<PackageReference Include="NuGet.Packaging" Version="6.14.3"/>
62+
<PackageReference Include="NuGet.Protocol" Version="6.14.3"/>
63+
<PackageReference Include="NuGet.ProjectModel" Version="6.14.3"/>
64+
</ItemGroup>
65+
8066
<PropertyGroup>
8167
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
8268
</PropertyGroup>

‎CSharpInteractive/Composition.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private static void Setup()
117117
.PerBlock<LanguageVersionSettingDescription, OptimizationLevelSettingDescription, WarningLevelSettingDescription
118118
, CheckOverflowSettingDescription, AllowUnsafeSettingDescription, NuGetRestoreSettingDescription>(Unique)
119119
.PerBlock<StartInfoDescription, HostEnvironment, ColorTheme, TeamCityLineFormatter, FileSystem, MSBuildArgumentsTool
120-
, CommandLineParser, TracePresenter, StatisticsPresenter, BuildEngine, NuGetRestoreService, NuGetLogger
120+
, CommandLineParser, TracePresenter, StatisticsPresenter, NuGetRestoreService, NuGetLogger
121121
, UniqueNameGenerator, NuGetAssetsReader, Cleaner, TextToColorStrings, FileExplorer, Utf8Encoding
122122
, BuildOutputProcessor, TeamCityContext, SummaryPresenter, ProcessResultHandler>()
123123
.Singleton(() => new CancellationTokenSource())

‎CSharpInteractive/Core/BuildEngine.cs‎

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

0 commit comments

Comments
 (0)