Fix snapshotty github action (#2016)

elastic · Feb 24, 2023 · 22f7e69 · 22f7e69
1 parent a3f1d60
commit 22f7e69
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/.ci/windows/testnet461.bat b/.ci/windows/testnet461.bat
@@ -2,7 +2,7 @@
 :: This script runs the tests and stored them in an xml file defined in the
 :: LogFilePath property
 ::
-dotnet publish -c Release test\Elastic.Apm.Tests --framework net461 -o outtestnet461
+dotnet publish -c Release test\Elastic.Apm.Tests --framework net461 --property:PublishDir=..\..\outtestnet461
 
 dotnet test outtestnet461\Elastic.Apm.Tests.dll ^
  --logger:"junit;LogFilePath=test\junit-{framework}-{assembly}.xml;MethodFormat=Class;FailureBodyFormat=Verbose" ^

diff --git a/build/scripts/Build.fs b/build/scripts/Build.fs
@@ -118,7 +118,7 @@ module Build =
                              "-c"; "Release"
                              "-f"; framework
                              "-v"; "q"
-                             "-o"; output
+                             $"--property:PublishDir=%s{output}"
                              "--nologo"; "--force"]
             )
         )
@@ -174,7 +174,7 @@ module Build =
                     |> Path.GetFullPath
 
                 printfn "Publishing %s %s..." proj framework
-                DotNet.Exec ["publish" ; proj; "-c"; "Release"; "-f"; framework; "-v"; "q"; "--nologo"; "-o"; output]
+                DotNet.Exec ["publish" ; proj; "-c"; "Release"; "-f"; framework; "-v"; "q"; "--nologo"; $"--property:PublishDir=%s{output}"]
             )
         )
 
@@ -186,7 +186,7 @@ module Build =
     /// Packages projects into nuget packages
     let Pack (canary:bool) =
         let arguments =
-            let a = ["pack" ; Paths.Solution; "-c"; "Release"; "-o"; Paths.NugetOutput]
+            let a = ["pack" ; Paths.Solution; "-c"; "Release"; $"--property:PackageOutputPath=%s{Paths.NugetOutput}"]
             if canary then List.append a ["--version-suffix"; versionSuffix]
             else a      
         DotNet.Exec arguments

diff --git a/build/scripts/Paths.fs b/build/scripts/Paths.fs
@@ -16,11 +16,14 @@ module Paths =
     let SampleFolder = "sample"
 
     let BuildOutputFolder = sprintf "%s/output" BuildFolder
+    let PublishOutputFolder = sprintf "../../%s/output" BuildFolder
 
     /// A path to a folder in the build output folder
     let BuildOutput folder = sprintf "%s/%s" BuildOutputFolder folder
+    /// Used by --property:PublishDir relative to csproject
+    let PublishDir folder = sprintf "../../%s" <| BuildOutput folder
 
-    let NugetOutput = sprintf "%s/_packages" BuildOutputFolder
+    let NugetOutput = sprintf "%s/_packages" PublishOutputFolder
 
     /// All .NET Core and .NET Framework projects
     let Solution = "ElasticApmAgent.sln"

diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/ProfiledApplication.cs b/test/Elastic.Apm.Profiler.Managed.Tests/ProfiledApplication.cs
@@ -66,7 +66,7 @@ private void Publish(string targetFramework, string outputDirectory, string msBu
 			var processInfo = new ProcessStartInfo
 			{
 				FileName = "dotnet",
-				Arguments = $"publish -c Release -f {targetFramework} -o {outputDirectory} {msBuildProperties}",
+				Arguments = $"publish -c Release -f {targetFramework} --property:PublishDir={outputDirectory} {msBuildProperties}",
 				WorkingDirectory = _projectDirectory
 			};
 

diff --git a/test/Elastic.Apm.StartupHook.Tests/DotnetProject.cs b/test/Elastic.Apm.StartupHook.Tests/DotnetProject.cs
@@ -59,7 +59,7 @@ private void Publish()
 				var processInfo = new ProcessStartInfo
 				{
 					FileName = "dotnet",
-					Arguments = $"publish -c Release -o {_publishDirectory}",
+					Arguments = $"publish -c Release --property:PublishDir={_publishDirectory}",
 					WorkingDirectory = Directory
 				};
 

diff --git a/test/Elastic.Apm.StartupHook.Tests/SampleApplication.cs b/test/Elastic.Apm.StartupHook.Tests/SampleApplication.cs
@@ -40,7 +40,7 @@ private void Publish(string projectDirectory, string targetFramework)
 			var processInfo = new ProcessStartInfo
 			{
 				FileName = "dotnet",
-				Arguments = $"publish -c Release -f {targetFramework} -o {Path.Combine(_publishDirectory, targetFramework)}",
+				Arguments = $"publish -c Release -f {targetFramework} --property:PublishDir={Path.Combine(_publishDirectory, targetFramework)}",
 				WorkingDirectory = projectDirectory
 			};