Skip to content

Commit

Permalink
Fix execution of ProjectFileParser in linux
Browse files Browse the repository at this point in the history
Change-Id: I6ab6119f50e90a2c39e2ed8175606cf3e7fcc712
  • Loading branch information
ngyukman committed Jan 15, 2024
1 parent a9a41a8 commit 65cbfec
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 19 deletions.
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ description 'Gradle plugin for MSBuild project build.'

ext.dotnetPath = file('src/main/dotnet')

java {
sourceCompatibility = JavaVersion.VERSION_1_8
}

dependencies {
testImplementation(platform('org.junit:junit-bom:5.10.1'))
testImplementation('org.junit.jupiter:junit-jupiter')
Expand Down
2 changes: 0 additions & 2 deletions src/main/groovy/com/ullink/IExecutableResolver.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ package com.ullink
interface IExecutableResolver {
ProcessBuilder executeDotNet(File exe)

ProcessBuilder executeDotNetApp(File exe)

void setupExecutable(Msbuild msbuild);
}
8 changes: 6 additions & 2 deletions src/main/groovy/com/ullink/Msbuild.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ class Msbuild extends ConventionTask {
}
}

ProcessBuilder executeDotNetApp(File dll) {
return new ProcessBuilder('dotnet', dll.toString())
}

def parseProjectFile(def file) {
logger.info "Parsing file $file ..."
if (!file.exists()) {
Expand All @@ -137,8 +141,8 @@ class Msbuild extends ConventionTask {
}
}

def executable = new File(tempDir, 'ProjectFileParser.exe')
def builder = resolver.executeDotNet(executable)
def parserDll = new File(tempDir, 'ProjectFileParser.dll')
def builder = executeDotNetApp(parserDll)
builder.command().add(file.toString())
def proc = builder.start()

Expand Down
5 changes: 0 additions & 5 deletions src/main/groovy/com/ullink/MsbuildResolver.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ class MsbuildResolver implements IExecutableResolver {
return new ProcessBuilder(exe.toString())
}

@Override
ProcessBuilder executeDotNetApp(File exe) {
return executeDotNet(exe)
}

static List<String> getMsBuildVersionsFromRegistry(String key) {
(Registry.getKeys(Registry.HKEY_LOCAL_MACHINE, key) ?: []).sort({ -parseFloat(it) }).collect({ key + it })
}
Expand Down
5 changes: 0 additions & 5 deletions src/main/groovy/com/ullink/PosixMsbuildResolver.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ class PosixMsbuildResolver implements IExecutableResolver {
return new ProcessBuilder('mono', exe.toString())
}

@Override
ProcessBuilder executeDotNetApp(File exe) {
return new ProcessBuilder('dotnet', exe.toString())
}

void setupExecutable(Msbuild msbuild) {
msbuild.executable = 'MSBuild.dll'
if (msbuild.msbuildDir == null) {
Expand Down
5 changes: 0 additions & 5 deletions src/main/groovy/com/ullink/XbuildResolver.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ class XbuildResolver implements IExecutableResolver {
return new ProcessBuilder('mono', exe.toString())
}

@Override
ProcessBuilder executeDotNetApp(File exe) {
return new ProcessBuilder('dotnet', exe.toString())
}

void setupExecutable(Msbuild msbuild) {
def msBuildResolver = new PosixMsbuildResolver(msbuild.version)
if(msBuildResolver.msBuildFound()) {
Expand Down

0 comments on commit 65cbfec

Please sign in to comment.