Move zipping of rewrite server into .net build

Author: macsux

_build/Build.cs

@@ -118,7 +118,7 @@ IEnumerable<AbsolutePath> GetSubDirectories(params string[] patterns)
 
     Target Pack => _ => _
         .Description("Creates nuget packages inside artifacts directory")
-        .DependsOn(Restore)
+        .DependsOn(Restore, PublishServer)
         .Executes(() =>
         {
             DotNetPack(x => x
@@ -135,6 +135,8 @@ IEnumerable<AbsolutePath> GetSubDirectories(params string[] patterns)
                 .SetVersion("0.0.1")
                 .SetAssemblyVersion(Version.AssemblyVersion)
                 .SetOutputDirectory(ArtifactsDirectory / "test"));
+
+
         });
 
     Target PublishServer => _ => _
@@ -146,6 +148,9 @@ IEnumerable<AbsolutePath> GetSubDirectories(params string[] patterns)
             DotNetPublish(c => c
                 .SetProject(Solution.src.Rewrite_Server)
                 .SetVersion(Version.NuGetPackageVersion));
+
+            var publishDir = Solution.src.Rewrite_Server.Directory / "bin" / "Release" / "net8.0" / "publish";
+            publishDir.ZipTo(ArtifactsDirectory / "DotnetServer.zip");
         });
 
     Target StopServer => _ => _

rewrite-csharp-remote-server/build.gradle.kts

@@ -36,17 +36,18 @@ dependencies {
 }
 
 
-tasks.register<Zip>("zipDotnetServer") {
-    archiveFileName.set("DotnetServer.zip")
-    destinationDirectory.set(layout.buildDirectory.dir("tmp"))
-    from(rootProject.file("Rewrite/src/Rewrite.Server/bin/Release/net8.0/publish"))
-    include("*")
-    include("*/*") //to include contents of a folder present inside Reports directory
-}
+//tasks.register<Zip>("zipDotnetServer") {
+//    archiveFileName.set("DotnetServer.zip")
+//    destinationDirectory.set(layout.buildDirectory.dir("tmp"))
+//    from(rootProject.file("Rewrite/src/Rewrite.Server/bin/Release/net8.0/publish"))
+//    include("*")
+//    include("*/*") //to include contents of a folder present inside Reports directory
+//}
 
 tasks.processResources {
-    dependsOn("zipDotnetServer")
-    from(layout.buildDirectory.file("tmp/DotnetServer.zip"))
+//    dependsOn("zipDotnetServer")
+//    from(layout.buildDirectory.file("tmp/DotnetServer.zip"))
+    from(layout.buildDirectory.file(rootProject.file("artifacts/DotnetServer.zip").absolutePath))
 }
 
 tasks.compileJava {

rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/RemotingRecipeRunTest.java

@@ -36,6 +36,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -58,9 +59,13 @@ public void testRemotingRecipeInstallAndRun() throws IOException {
         port = 54321;
         Path extractedDotnetBinaryDir = Paths.get("./build/dotnet-servet-archive");
         extractedDotnetBinaryDir.toFile().mkdirs();
+        Path artifactsFolder = GitRootFinder.getGitRoot().resolve("artifacts").toAbsolutePath();
+        URL test = Thread.currentThread()
+                .getContextClassLoader()
+                .getResource("DotnetServer.zip");
         var serverConfig = DotNetRemotingServerEngine.Config.builder()
                 .extractedDotnetBinaryDir(extractedDotnetBinaryDir)
-                .logFilePath(Paths.get("./build/test.log").toAbsolutePath().toString())
+                .logFilePath(artifactsFolder.resolve( "test-results").resolve("csharp-server.log").toAbsolutePath().toString())
                 .nugetPackagesFolder(nuPkgLocation.toPath().toAbsolutePath().normalize().toString())
                 .port(port)
                 .build();
@@ -76,7 +81,6 @@ public void testRemotingRecipeInstallAndRun() throws IOException {
 
             RemotingRecipeManager manager = new RemotingRecipeManager(server, () -> server);
 
-            Path artifactsFolder = GitRootFinder.getGitRoot().resolve("artifacts");
 
             InstallableRemotingRecipe recipes = manager.install(
               "Rewrite.Recipes",