diff --git a/source/Calamari.Common/Features/Scripting/DotnetScript/DotnetScriptBootstrapper.cs b/source/Calamari.Common/Features/Scripting/DotnetScript/DotnetScriptBootstrapper.cs index d5d600f6a..3445dd9a1 100644 --- a/source/Calamari.Common/Features/Scripting/DotnetScript/DotnetScriptBootstrapper.cs +++ b/source/Calamari.Common/Features/Scripting/DotnetScript/DotnetScriptBootstrapper.cs @@ -84,9 +84,6 @@ static DotnetScriptBootstrapper() public static string FindBundledExecutable() { - if (ScriptingEnvironment.IsNetFramework()) - throw new CommandException("dotnet-script requires .NET Core 6 or later"); - var exeName = $"dotnet-script.{(CalamariEnvironment.IsRunningOnWindows ? "cmd" : "dll")}"; var myPath = typeof(DotnetScriptExecutor).Assembly.Location; var parent = Path.GetDirectoryName(myPath); diff --git a/source/Calamari.ConsolidateCalamariPackages.Tests/IntegrationTests.AndThenThePackageContentsShouldBe.approved.txt b/source/Calamari.ConsolidateCalamariPackages.Tests/IntegrationTests.AndThenThePackageContentsShouldBe.approved.txt index 1cb8fb21c..068b770ae 100644 --- a/source/Calamari.ConsolidateCalamariPackages.Tests/IntegrationTests.AndThenThePackageContentsShouldBe.approved.txt +++ b/source/Calamari.ConsolidateCalamariPackages.Tests/IntegrationTests.AndThenThePackageContentsShouldBe.approved.txt @@ -308,10 +308,10 @@ \Microsoft.WindowsAzure.Packaging.dll \Microsoft.WindowsAzure.ServiceModel.Common.dll \Microsoft.WindowsAzure.Storage.dll -\mscordaccore.dll -\mscordaccore.dll \mscordaccore_amd64_amd64_.dll \mscordaccore_amd64_amd64_.dll +\mscordaccore.dll +\mscordaccore.dll \mscordbi.dll \mscordbi.dll \mscorlib.dll @@ -415,13 +415,13 @@ \SharpCompress.dll \SharpCompress.dll \SharpCompress.dll +\sos_amd64_amd64_.dll +\SOS_README.md +\SOS_README.md \sos.dll \SOS.NETCore.dll \SOS.NETCore.dll \SOS.NETCore.dll -\sos_amd64_amd64_.dll -\SOS_README.md -\SOS_README.md \sosdocsunix.txt \Sprache.dll \Sprache.dll diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index eca113155..f27cb469e 100644 --- a/source/Calamari/Calamari.csproj +++ b/source/Calamari/Calamari.csproj @@ -106,7 +106,7 @@ - +