Skip to content

Commit 1368144

Browse files
committed
Pass TargetFramework to JI tool projects
1 parent 22fcdf2 commit 1368144

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ variables:
4848
InstallerArtifactName: installers
4949
TestAssembliesArtifactName: test-assemblies
5050
NUnitConsoleVersion: 3.9.0
51-
DotNetCoreVersion: 3.1.200
51+
DotNetCoreVersion: 3.1.100
5252
HostedMacMojave: Hosted Mac Internal Mojave
5353
HostedMac: Hosted Mac Internal
5454
HostedWinVS2019: Hosted Windows 2019 with VS2019

src/Mono.Android/Mono.Android.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,9 @@
335335
<ProjectReference Include="..\..\build-tools\api-merge\api-merge.csproj" ReferenceOutputAssembly="false" />
336336
<ProjectReference Include="..\..\build-tools\api-xml-adjuster\api-xml-adjuster.csproj" ReferenceOutputAssembly="false" />
337337
<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" />
340341
<ProjectReference Include="..\..\src\java-runtime\java-runtime.csproj" ReferenceOutputAssembly="false" />
341342
</ItemGroup>
342343

0 commit comments

Comments
 (0)