File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ variables:
48
48
InstallerArtifactName : installers
49
49
TestAssembliesArtifactName : test-assemblies
50
50
NUnitConsoleVersion : 3.9.0
51
- DotNetCoreVersion : 3.1.200
51
+ DotNetCoreVersion : 3.1.100
52
52
HostedMacMojave : Hosted Mac Internal Mojave
53
53
HostedMac : Hosted Mac Internal
54
54
HostedWinVS2019 : Hosted Windows 2019 with VS2019
Original file line number Diff line number Diff line change 335
335
<ProjectReference Include =" ..\..\build-tools\api-merge\api-merge.csproj" ReferenceOutputAssembly =" false" />
336
336
<ProjectReference Include =" ..\..\build-tools\api-xml-adjuster\api-xml-adjuster.csproj" ReferenceOutputAssembly =" false" />
337
337
<ProjectReference Include =" ..\..\build-tools\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly =" false" />
338
- <ProjectReference Include =" ..\..\external\Java.Interop\tools\generator\generator.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" />
339
- <ProjectReference Include =" ..\..\external\Java.Interop\tools\jcw-gen\jcw-gen.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" />
338
+ <!-- Explicitly pass the target framework of the project so we don't have conflicts with the multiple targets in this file. -->
339
+ <ProjectReference Include =" ..\..\external\Java.Interop\tools\generator\generator.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" AdditionalProperties =" TargetFramework=net472" />
340
+ <ProjectReference Include =" ..\..\external\Java.Interop\tools\jcw-gen\jcw-gen.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" AdditionalProperties =" TargetFramework=net472" />
340
341
<ProjectReference Include =" ..\..\src\java-runtime\java-runtime.csproj" ReferenceOutputAssembly =" false" />
341
342
</ItemGroup >
342
343
You can’t perform that action at this time.
0 commit comments