Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 0 additions & 38 deletions .github/workflows/update-dotnet-install-scripts.yml

This file was deleted.

16 changes: 0 additions & 16 deletions extension/schemas/aspire-global-settings.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,6 @@
"description": "Enable or disable watch mode by default when running Aspire applications for automatic restarts on file changes",
"default": false
},
"dotnetSdkInstallationEnabled": {
"anyOf": [
{
"type": "boolean"
},
{
"type": "string",
"enum": [
"true",
"false"
]
}
],
"description": "Enable or disable automatic .NET SDK installation when a required SDK version is missing",
"default": true
},
"execCommandEnabled": {
"anyOf": [
{
Expand Down
16 changes: 0 additions & 16 deletions extension/schemas/aspire-settings.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,6 @@
"description": "Enable or disable watch mode by default when running Aspire applications for automatic restarts on file changes",
"default": false
},
"dotnetSdkInstallationEnabled": {
"anyOf": [
{
"type": "boolean"
},
{
"type": "string",
"enum": [
"true",
"false"
]
}
],
"description": "Enable or disable automatic .NET SDK installation when a required SDK version is missing",
"default": true
},
"execCommandEnabled": {
"anyOf": [
{
Expand Down
2 changes: 0 additions & 2 deletions src/Aspire.Cli/Aspire.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\dotnet-install.sh" />
<EmbeddedResource Include="Resources\dotnet-install.ps1" />
<EmbeddedResource Include="$(SharedDir)Mcp\Resources\aspire-16.png" Link="Mcp\Resources\aspire-16.png" />
<EmbeddedResource Include="$(SharedDir)Mcp\Resources\aspire-256.png" Link="Mcp\Resources\aspire-256.png" />
<EmbeddedResource Include="$(SharedDir)Mcp\Resources\aspire-32.png" Link="Mcp\Resources\aspire-32.png" />
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Cli/Commands/AddCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
// Check if the .NET SDK is available (only needed for .NET projects)
if (project.LanguageId == KnownLanguageId.CSharp)
{
if (!await SdkInstallHelper.EnsureSdkInstalledAsync(_sdkInstaller, InteractionService, _features, Telemetry, _hostEnvironment, cancellationToken))
if (!await SdkInstallHelper.EnsureSdkInstalledAsync(_sdkInstaller, InteractionService, Telemetry, cancellationToken))
{
return ExitCodeConstants.SdkNotInstalled;
}
Expand Down
8 changes: 2 additions & 6 deletions src/Aspire.Cli/Commands/ExecCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ internal class ExecCommand : BaseCommand
private readonly IProjectLocator _projectLocator;
private readonly IAnsiConsole _ansiConsole;
private readonly IDotNetSdkInstaller _sdkInstaller;
private readonly ICliHostEnvironment _hostEnvironment;
private readonly IFeatures _features;

private static readonly OptionWithLegacy<FileInfo?> s_appHostOption = new("--apphost", "--project", ExecCommandStrings.ProjectArgumentDescription);
private static readonly Option<string> s_resourceOption = new("--resource", "-r")
Expand Down Expand Up @@ -55,16 +53,14 @@ public ExecCommand(
IDotNetSdkInstaller sdkInstaller,
IFeatures features,
ICliUpdateNotifier updateNotifier,
CliExecutionContext executionContext, ICliHostEnvironment hostEnvironment)
CliExecutionContext executionContext)
: base("exec", ExecCommandStrings.Description, features, updateNotifier, executionContext, interactionService, telemetry)
{
_runner = runner;
_certificateService = certificateService;
_projectLocator = projectLocator;
_ansiConsole = ansiConsole;
_sdkInstaller = sdkInstaller;
_hostEnvironment = hostEnvironment;
_features = features;

Options.Add(s_appHostOption);
Options.Add(s_resourceOption);
Expand All @@ -79,7 +75,7 @@ public ExecCommand(
protected override async Task<int> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
{
// Check if the .NET SDK is available
if (!await SdkInstallHelper.EnsureSdkInstalledAsync(_sdkInstaller, InteractionService, _features, Telemetry, _hostEnvironment, cancellationToken))
if (!await SdkInstallHelper.EnsureSdkInstalledAsync(_sdkInstaller, InteractionService, Telemetry, cancellationToken))
{
return ExitCodeConstants.SdkNotInstalled;
}
Expand Down
7 changes: 1 addition & 6 deletions src/Aspire.Cli/Commands/InitCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ internal sealed class InitCommand : BaseCommand, IPackageMetaPrefetchingCommand
private readonly IPackagingService _packagingService;
private readonly ISolutionLocator _solutionLocator;
private readonly IDotNetSdkInstaller _sdkInstaller;
private readonly ICliHostEnvironment _hostEnvironment;
private readonly IFeatures _features;
private readonly ICliUpdateNotifier _updateNotifier;
private readonly CliExecutionContext _executionContext;
private readonly IConfigurationService _configurationService;
Expand Down Expand Up @@ -78,7 +76,6 @@ public InitCommand(
IFeatures features,
ICliUpdateNotifier updateNotifier,
CliExecutionContext executionContext,
ICliHostEnvironment hostEnvironment,
IInteractionService interactionService,
IConfigurationService configurationService,
ILanguageService languageService,
Expand All @@ -93,8 +90,6 @@ public InitCommand(
_packagingService = packagingService;
_solutionLocator = solutionLocator;
_sdkInstaller = sdkInstaller;
_hostEnvironment = hostEnvironment;
_features = features;
_updateNotifier = updateNotifier;
_executionContext = executionContext;
_configurationService = configurationService;
Expand Down Expand Up @@ -149,7 +144,7 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
}

// For C#, we need the .NET SDK
if (!await SdkInstallHelper.EnsureSdkInstalledAsync(_sdkInstaller, InteractionService, _features, Telemetry, _hostEnvironment, cancellationToken))
if (!await SdkInstallHelper.EnsureSdkInstalledAsync(_sdkInstaller, InteractionService, Telemetry, cancellationToken))
{
return ExitCodeConstants.SdkNotInstalled;
}
Expand Down
9 changes: 0 additions & 9 deletions src/Aspire.Cli/DotNet/DotNetCliRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -441,15 +441,6 @@ public async Task<int> RunAsync(FileInfo projectFile, bool watch, bool noBuild,
}
}

if (features.IsFeatureEnabled(KnownFeatures.DotNetSdkInstallationEnabled, true))
{
// Only set the environment variable if it's not already set by the user
if (!finalEnv.ContainsKey("DOTNET_ROLL_FORWARD"))
{
finalEnv["DOTNET_ROLL_FORWARD"] = "LatestMajor";
}
}

// Set the backchannel socket path when backchannel is configured
if (backchannelCompletionSource is not null)
{
Expand Down
Loading
Loading