Skip to content

Replaced nuget.exe with dotnet pack for script package tests #779

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
seesharper merged 1 commit into from
Nov 7, 2025
Merged

Replaced nuget.exe with dotnet pack for script package tests #779

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
Binary file removed src/Dotnet.Script.Tests/NuGet/NuGet430.exe
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions src/Dotnet.Script.Tests/ScriptPackages/WithAnyTargetFramework/WithAnyTargetFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>netstandard2.0</TargetFramework>
<NuSpecFile>WithAnyTargetFramework.nuspec</NuSpecFile>
</PropertyGroup>
</Project>
7 changes: 7 additions & 0 deletions src/Dotnet.Script.Tests/ScriptPackages/WithMainCsx/WithMainCsx.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>netstandard2.0</TargetFramework>
<NuSpecFile>WithMainCsx.nuspec</NuSpecFile>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Dotnet.Script.Tests/ScriptPackages/WithMainCsx/WithMainCsx.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<package >
<package>
<metadata>
<id>ScriptPackageWithMainCsx</id>
<version>1.0.0</version>
Expand Down
7 changes: 7 additions & 0 deletions src/Dotnet.Script.Tests/ScriptPackages/WithNoEntryPointFile/WithNoEntryPointFile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>netstandard2.0</TargetFramework>
<NuSpecFile>WithNoEntryPointFile.nuspec</NuSpecFile>
</PropertyGroup>
</Project>
7 changes: 7 additions & 0 deletions ...cript.Tests/ScriptPackages/WithScriptPackageDependency/WithScriptPackageDependency.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>netstandard2.0</TargetFramework>
<NuSpecFile>WithScriptPackageDependency.nuspec</NuSpecFile>
</PropertyGroup>
</Project>
7 changes: 7 additions & 0 deletions src/Dotnet.Script.Tests/ScriptPackages/WithSubFolder/WithSubFolder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>netstandard2.0</TargetFramework>
<NuSpecFile>WithSubFolder.nuspec</NuSpecFile>
</PropertyGroup>
</Project>
18 changes: 5 additions & 13 deletions src/Dotnet.Script.Tests/ScriptPackagesFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,13 @@ private void BuildScriptPackages()
RemoveDirectory(pathToPackagesOutputFolder);
Directory.CreateDirectory(pathToPackagesOutputFolder);
var specFiles = GetSpecFiles();
_ = AppDomain.CurrentDomain.BaseDirectory;
var pathtoNuget430 = Path.Combine("../../../NuGet/NuGet430.exe");
foreach (var specFile in specFiles)
{
string command;
if (_scriptEnvironment.IsWindows)
var result = ProcessHelper.RunAndCaptureOutput("dotnet", $"pack \"{specFile}\" -o \"{pathToPackagesOutputFolder}\"");
if (result.ExitCode != 0)
{
command = pathtoNuget430;
_ = ProcessHelper.RunAndCaptureOutput(command, $"pack \"{specFile}\" -OutputDirectory \"{pathToPackagesOutputFolder}\"");
throw new InvalidOperationException($"Failed to pack {specFile}: {result.Output}");
}
else
{
command = "mono";
_ = ProcessHelper.RunAndCaptureOutput(command, $"\"{pathtoNuget430}\" pack \"{specFile}\" -OutputDirectory \"{pathToPackagesOutputFolder}\"");
}

}
}

Expand Down Expand Up @@ -91,7 +82,8 @@ private static IReadOnlyList<string> GetSpecFiles()
{
var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
var pathToScriptPackages = Path.Combine(baseDirectory, "..", "..", "..", "ScriptPackages");
return Directory.GetFiles(pathToScriptPackages, "*.nuspec", SearchOption.AllDirectories);
// The csproj files contains the nuspec references
return Directory.GetFiles(pathToScriptPackages, "*.csproj", SearchOption.AllDirectories);
}
}
}
Loading