Skip to content
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

Remove FSharp support #1404

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Remove FSharp support #1404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09f492f
Remove FSharp support
APErebus Dec 12, 2024
d90d122
Remove more FSharp code
APErebus Dec 12, 2024
0dd5d8a
Remove more FSharp stuff
APErebus Dec 12, 2024
2c3e40e
Fix failing tests
APErebus Dec 12, 2024
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 build/Build.NetCoreTesting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ partial class Build
.Executes(() =>
{
const string testFilter =
"TestCategory != Windows & TestCategory != fsharp & TestCategory != scriptcs & TestCategory != PlatformAgnostic & TestCategory != RunOnceOnWindowsAndLinux";
"TestCategory != Windows & TestCategory != scriptcs & TestCategory != PlatformAgnostic & TestCategory != RunOnceOnWindowsAndLinux";

DotNetTasks.DotNetTest(settings => settings
.SetProjectFile("Binaries/Calamari.Tests.dll")
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.AzureResourceGroup.Tests/AzureResourceGroupActionHandlerFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ await CommandTestBuilder.CreateAsync<DeployAzureResourceGroupCommand, Program>()
context.Variables.Add(KnownVariables.Package.EnabledFeatures, KnownVariables.Features.CustomScripts);
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.Deploy, ScriptSyntax.PowerShell), psScript);
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.PreDeploy, ScriptSyntax.CSharp), "Console.WriteLine(\"Hello from C#\");");
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.PostDeploy, ScriptSyntax.FSharp), "printfn \"Hello from F#\"");

context.WithFilesToCopy(packagePath);

Expand Down
1 change: 0 additions & 1 deletion source/Calamari.AzureResourceGroup.Tests/LegacyAzureResourceGroupActionHandlerFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ await CommandTestBuilder.CreateAsync<DeployAzureResourceGroupCommand, Program>()
context.Variables.Add(KnownVariables.Package.EnabledFeatures, KnownVariables.Features.CustomScripts);
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.Deploy, ScriptSyntax.PowerShell), psScript);
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.PreDeploy, ScriptSyntax.CSharp), "Console.WriteLine(\"Hello from C#\");");
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.PostDeploy, ScriptSyntax.FSharp), "printfn \"Hello from F#\"");

context.WithFilesToCopy(packagePath);

Expand Down
1 change: 0 additions & 1 deletion source/Calamari.AzureServiceFabric.Tests/AzureServiceFabricPowerShellContextFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public class AzureServiceFabricPowerShellContextFixture
[Test]
[TestCase("Endpoint", ScriptSyntax.PowerShell, true)]
[TestCase("", ScriptSyntax.PowerShell, false)]
[TestCase("Endpoint", ScriptSyntax.FSharp, false)]
public void ShouldBeEnabled(string connectionEndpoint, ScriptSyntax syntax, bool expected)
{
var variables = new CalamariVariables
Expand Down
2 changes: 0 additions & 2 deletions source/Calamari.AzureWebApp.Tests/DeployAzureWebCommandFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,13 +379,11 @@ await CommandTestBuilder.CreateAsync<DeployAzureWebCommand, Program>()
context.Variables.Add(KnownVariables.Package.EnabledFeatures, KnownVariables.Features.CustomScripts);
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.Deploy, ScriptSyntax.PowerShell), psScript);
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.PreDeploy, ScriptSyntax.CSharp), "Console.WriteLine(\"Hello from C#\");");
context.Variables.Add(KnownVariables.Action.CustomScripts.GetCustomScriptStage(DeploymentStages.PostDeploy, ScriptSyntax.FSharp), "printfn \"Hello from F#\"");
context.WithFilesToCopy(tempPath.DirectoryPath);
})
.WithAssert(result =>
{
result.FullLog.Should().Contain("Hello from C#");
result.FullLog.Should().Contain("Hello from F#");
})
.Execute();

Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Common/Calamari.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@

<ItemGroup>
<EmbeddedResource Include="Features\Scripting\Bash\Bootstrap.sh" />
<EmbeddedResource Include="Features\Scripting\FSharp\Bootstrap.fsx" />
<EmbeddedResource Include="Features\Scripting\Python\Configuration.py" />
<EmbeddedResource Include="Features\Scripting\Python\InstallDependencies.py" />
<EmbeddedResource Include="Features\Scripting\DotnetScript\Bootstrap.csx" />
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Common/FeatureToggles/FeatureToggle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ public enum FeatureToggle {
ModernAzureSdkFeatureToggle,
OidcAccountsFeatureToggle,
AsynchronousAzureZipDeployFeatureToggle,
FSharpDeprecationFeatureToggle,
AzureRMDeprecationFeatureToggle,
PreventHelmV2DeploymentsFeatureToggle,
KubernetesLiveObjectStatusFeatureToggle,
Expand Down
18 changes: 0 additions & 18 deletions source/Calamari.Common/Features/Scripting/FSharp/Bootstrap.fsi
View file
Open in desktop

This file was deleted.

188 changes: 0 additions & 188 deletions source/Calamari.Common/Features/Scripting/FSharp/Bootstrap.fsx
View file
Open in desktop

This file was deleted.

Loading