Merge branch 'master' into feature/cache-path-cmdline-argument

filipw · web-flow · commit 549228939d1d · 2025-11-07T17:46:23.000+01:00
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0
+FROM mcr.microsoft.com/dotnet/sdk:9.0
 
 # https://www.nuget.org/packages/dotnet-script/
 RUN dotnet tool install dotnet-script --tool-path /usr/bin
diff --git a/src/Dotnet.Script.Tests/NuGet/NuGet430.exe b/src/Dotnet.Script.Tests/NuGet/NuGet430.exe
diff --git a/src/Dotnet.Script.Tests/ScriptPackages/WithAnyTargetFramework/WithAnyTargetFramework.csproj b/src/Dotnet.Script.Tests/ScriptPackages/WithAnyTargetFramework/WithAnyTargetFramework.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NuSpecFile>WithAnyTargetFramework.nuspec</NuSpecFile>
+  </PropertyGroup>
+</Project>
diff --git a/src/Dotnet.Script.Tests/ScriptPackages/WithMainCsx/WithMainCsx.csproj b/src/Dotnet.Script.Tests/ScriptPackages/WithMainCsx/WithMainCsx.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NuSpecFile>WithMainCsx.nuspec</NuSpecFile>
+  </PropertyGroup>
+</Project>
diff --git a/src/Dotnet.Script.Tests/ScriptPackages/WithMainCsx/WithMainCsx.nuspec b/src/Dotnet.Script.Tests/ScriptPackages/WithMainCsx/WithMainCsx.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package>
   <metadata>
     <id>ScriptPackageWithMainCsx</id>
     <version>1.0.0</version>
diff --git a/src/Dotnet.Script.Tests/ScriptPackages/WithNoEntryPointFile/WithNoEntryPointFile.csproj b/src/Dotnet.Script.Tests/ScriptPackages/WithNoEntryPointFile/WithNoEntryPointFile.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NuSpecFile>WithNoEntryPointFile.nuspec</NuSpecFile>
+  </PropertyGroup>
+</Project>
diff --git a/src/Dotnet.Script.Tests/ScriptPackages/WithScriptPackageDependency/WithScriptPackageDependency.csproj b/src/Dotnet.Script.Tests/ScriptPackages/WithScriptPackageDependency/WithScriptPackageDependency.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NuSpecFile>WithScriptPackageDependency.nuspec</NuSpecFile>
+  </PropertyGroup>
+</Project>
diff --git a/src/Dotnet.Script.Tests/ScriptPackages/WithSubFolder/WithSubFolder.csproj b/src/Dotnet.Script.Tests/ScriptPackages/WithSubFolder/WithSubFolder.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NuSpecFile>WithSubFolder.nuspec</NuSpecFile>
+  </PropertyGroup>
+</Project>
diff --git a/src/Dotnet.Script.Tests/ScriptPackagesFixture.cs b/src/Dotnet.Script.Tests/ScriptPackagesFixture.cs
@@ -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}\"");
-                }
-
             }
         }
 
@@ -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);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/dotnet/sdk:7.0`
	`1`	`+FROM mcr.microsoft.com/dotnet/sdk:9.0`
`2`	`2`
`3`	`3`	`# https://www.nuget.org/packages/dotnet-script/`
`4`	`4`	`RUN dotnet tool install dotnet-script --tool-path /usr/bin`
Original file line number	Diff line number	Diff line change
`@@ -35,22 +35,13 @@ private void BuildScriptPackages()`
`35`	`35`	`RemoveDirectory(pathToPackagesOutputFolder);`
`36`	`36`	`Directory.CreateDirectory(pathToPackagesOutputFolder);`
`37`	`37`	`var specFiles = GetSpecFiles();`
`38`		`- _ = AppDomain.CurrentDomain.BaseDirectory;`
`39`		`- var pathtoNuget430 = Path.Combine("../../../NuGet/NuGet430.exe");`
`40`	`38`	`foreach (var specFile in specFiles)`
`41`	`39`	`{`
`42`		`- string command;`
`43`		`- if (_scriptEnvironment.IsWindows)`
	`40`	`+ var result = ProcessHelper.RunAndCaptureOutput("dotnet", $"pack \"{specFile}\" -o \"{pathToPackagesOutputFolder}\"");`
	`41`	`+ if (result.ExitCode != 0)`
`44`	`42`	`{`
`45`		`- command = pathtoNuget430;`
`46`		`- _ = ProcessHelper.RunAndCaptureOutput(command, $"pack \"{specFile}\" -OutputDirectory \"{pathToPackagesOutputFolder}\"");`
	`43`	`+ throw new InvalidOperationException($"Failed to pack {specFile}: {result.Output}");`
`47`	`44`	`}`
`48`		`- else`
`49`		`- {`
`50`		`- command = "mono";`
`51`		`- _ = ProcessHelper.RunAndCaptureOutput(command, $"\"{pathtoNuget430}\" pack \"{specFile}\" -OutputDirectory \"{pathToPackagesOutputFolder}\"");`
`52`		`- }`
`53`		`-`
`54`	`45`	`}`
`55`	`46`	`}`
`56`	`47`
`@@ -91,7 +82,8 @@ private static IReadOnlyList<string> GetSpecFiles()`
`91`	`82`	`{`
`92`	`83`	`var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;`
`93`	`84`	`var pathToScriptPackages = Path.Combine(baseDirectory, "..", "..", "..", "ScriptPackages");`
`94`		`- return Directory.GetFiles(pathToScriptPackages, "*.nuspec", SearchOption.AllDirectories);`
	`85`	`+ // The csproj files contains the nuspec references`
	`86`	`+ return Directory.GetFiles(pathToScriptPackages, "*.csproj", SearchOption.AllDirectories);`
`95`	`87`	`}`
`96`	`88`	`}`
`97`	`89`	`}`