diff --git a/build.gradle b/build.gradle index e0e6904..c52b066 100644 --- a/build.gradle +++ b/build.gradle @@ -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') diff --git a/src/main/groovy/com/ullink/IExecutableResolver.groovy b/src/main/groovy/com/ullink/IExecutableResolver.groovy index 556e7c0..b98cbfe 100644 --- a/src/main/groovy/com/ullink/IExecutableResolver.groovy +++ b/src/main/groovy/com/ullink/IExecutableResolver.groovy @@ -3,7 +3,5 @@ package com.ullink interface IExecutableResolver { ProcessBuilder executeDotNet(File exe) - ProcessBuilder executeDotNetApp(File exe) - void setupExecutable(Msbuild msbuild); } diff --git a/src/main/groovy/com/ullink/Msbuild.groovy b/src/main/groovy/com/ullink/Msbuild.groovy index 38ef47b..e26e7a4 100644 --- a/src/main/groovy/com/ullink/Msbuild.groovy +++ b/src/main/groovy/com/ullink/Msbuild.groovy @@ -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()) { @@ -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() diff --git a/src/main/groovy/com/ullink/MsbuildResolver.groovy b/src/main/groovy/com/ullink/MsbuildResolver.groovy index 267588e..3001a2a 100644 --- a/src/main/groovy/com/ullink/MsbuildResolver.groovy +++ b/src/main/groovy/com/ullink/MsbuildResolver.groovy @@ -85,11 +85,6 @@ class MsbuildResolver implements IExecutableResolver { return new ProcessBuilder(exe.toString()) } - @Override - ProcessBuilder executeDotNetApp(File exe) { - return executeDotNet(exe) - } - static List getMsBuildVersionsFromRegistry(String key) { (Registry.getKeys(Registry.HKEY_LOCAL_MACHINE, key) ?: []).sort({ -parseFloat(it) }).collect({ key + it }) } diff --git a/src/main/groovy/com/ullink/PosixMsbuildResolver.groovy b/src/main/groovy/com/ullink/PosixMsbuildResolver.groovy index 146dd38..6acc38a 100644 --- a/src/main/groovy/com/ullink/PosixMsbuildResolver.groovy +++ b/src/main/groovy/com/ullink/PosixMsbuildResolver.groovy @@ -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) { diff --git a/src/main/groovy/com/ullink/XbuildResolver.groovy b/src/main/groovy/com/ullink/XbuildResolver.groovy index 58f5451..7145abd 100644 --- a/src/main/groovy/com/ullink/XbuildResolver.groovy +++ b/src/main/groovy/com/ullink/XbuildResolver.groovy @@ -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()) {