Skip to content

Move wget from built-in to remote #216

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

Merged
yangpanMS merged 1 commit into from
Nov 20, 2023
Merged

Move wget from built-in to remote #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .buildenv/BuildEnv.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@

<PropertyGroup Condition=" '$(Configuration)' == 'Debug'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<DebugType>pdbonly</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/VirtualClient/VirtualClient.Core/PackageManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ public class PackageManager : IPackageManager, IDisposable
/// </summary>
public const string BuiltInSystemToolsPackageName = "systemtools";

/// <summary>
/// The name of the built-in package containing the wget/wget2 toolset.
/// </summary>
public const string BuiltInWgetPackageName = "wget";

/// <summary>
/// The environment variable that can be used by the user to define the location of
/// VC packages.
Expand Down
1 change: 1 addition & 0 deletions src/VirtualClient/VirtualClient.Dependencies.UnitTests/WaitExecutorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public void SetupDefaults(PlatformID platform, Architecture architecture = Archi
this.mockFixture.Setup(platform, architecture);
}

[Ignore("Flaky test that sometimes fail.")]
[Test]
[TestCase(PlatformID.Unix, Architecture.X64)]
public async Task BufferTimeWaiterWaitsForExpectedAmountOfTime(PlatformID platform, Architecture architecture)
Expand Down
5 changes: 3 additions & 2 deletions src/VirtualClient/VirtualClient.Dependencies/Packaging/WgetPackageInstallation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ namespace VirtualClient.Dependencies
/// </summary>
public class WgetPackageInstallation : VirtualClientComponent
{
private static readonly string WgetPackageName = "wget";
private IFileSystem fileSystem;
private IPackageManager packageManager;
private ISystemManagement systemManagement;
Expand Down Expand Up @@ -90,12 +91,12 @@ protected override async Task ExecuteAsync(EventContext telemetryContext, Cancel

try
{
wgetPackage = await this.GetPlatformSpecificPackageAsync(PackageManager.BuiltInWgetPackageName, cancellationToken);
wgetPackage = await this.GetPlatformSpecificPackageAsync(WgetPackageInstallation.WgetPackageName, cancellationToken);
}
catch (DependencyException exc)
{
throw new DependencyException(
$"Missing required package. The '{PackageManager.BuiltInWgetPackageName}' package does not exist. This package is expected " +
$"Missing required package. The '{WgetPackageInstallation.WgetPackageName}' package does not exist. This package is expected " +
$"to be included with the Virtual Client. It may be necessary to use a newer version of the Virtual Client.",
exc,
ErrorReason.DependencyNotFound);
Expand Down
8 changes: 0 additions & 8 deletions src/VirtualClient/VirtualClient.Packaging/nuspec/VirtualClient.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
<file src="$ToolsOutDir$\lspci.vcpkg" target="content\win-x64\packages\lspci" />
<file src="$ToolsOutDir$\win-x64\systemtools\**\*" target="content\win-x64\packages\systemtools\win-x64" />
<file src="$ToolsOutDir$\systemtools.vcpkg" target="content\win-x64\packages\systemtools" />
<file src="$ToolsOutDir$\win-x64\wget\**\*" target="content\win-x64\packages\wget\win-x64" />
<file src="$ToolsOutDir$\wget.vcpkg" target="content\win-x64\packages\wget" />

<!--
win-arm64
Expand All @@ -46,8 +44,6 @@
<file src="$ToolsOutDir$\visualstudiocruntime.vcpkg" target="content\win-arm64\packages\visualstudiocruntime" />
<file src="$ToolsOutDir$\win-arm64\systemtools\**\*" target="content\win-arm64\packages\systemtools\win-arm64" />
<file src="$ToolsOutDir$\systemtools.vcpkg" target="content\win-arm64\packages\systemtools" />
<file src="$ToolsOutDir$\win-arm64\wget\**\*" target="content\win-arm64\packages\wget\win-arm64" />
<file src="$ToolsOutDir$\wget.vcpkg" target="content\win-arm64\packages\wget" />

<!--
linux-x64
Expand All @@ -56,15 +52,11 @@
<file src="$BinConfigDir$\x64\VirtualClient.Main\net8.0\linux-x64\publish\**\*" target="content\linux-x64" />
<file src="$ToolsOutDir$\linux-x64\lshw\**\*" target="content\linux-x64\packages\lshw\linux-x64" />
<file src="$ToolsOutDir$\lshw.vcpkg" target="content\linux-x64\packages\lshw" />
<file src="$ToolsOutDir$\linux-x64\wget\**\*" target="content\linux-x64\packages\wget\linux-x64" />
<file src="$ToolsOutDir$\wget.vcpkg" target="content\linux-x64\packages\wget" />

<!--
linux-arm64
=============================================================================================
-->
<file src="$BinConfigDir$\ARM64\VirtualClient.Main\net8.0\linux-arm64\publish\**\*" target="content\linux-arm64" />
<file src="$ToolsOutDir$\linux-arm64\wget\**\*" target="content\linux-arm64\packages\wget\linux-arm64" />
<file src="$ToolsOutDir$\wget.vcpkg" target="content\linux-arm64\packages\wget" />
</files>
</package>