Skip to content

Commit 441dddf

Browse files
pjcollinspjcollins
committed
Revert majority of AppendTargetFrameworkToOutputPath related changes
1 parent 1bef910 commit 441dddf

File tree

35 files changed

+120
-76
lines changed

35 files changed

+120
-76
lines changed

‎Makefile‎

Lines changed: 43 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ NATIVE_EXT = .so
1212
DLLMAP_OS_NAME = linux
1313
endif
1414

15-
JAVA_INTEROP_LIB = libjava-interop$(NATIVE_EXT)
16-
NATIVE_TIMING_LIB = libNativeTiming$(NATIVE_EXT)
17-
18-
TFNETFRAMEWORK = net472
19-
TFNETSTANDARD = netstandard2.0
20-
2115
PACKAGES = \
2216
packages/NUnit.3.11.0/NUnit.3.11.0.nupkg \
2317
packages/NUnit.Console.3.9.0/NUnit.Console.3.9.0.nupkg
@@ -26,24 +20,24 @@ PREPARE_EXTERNAL_FILES = \
2620
external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj
2721

2822
DEPENDENCIES = \
29-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/$(NATIVE_TIMING_LIB)
23+
bin/Test$(CONFIGURATION)/libNativeTiming$(NATIVE_EXT)
3024

3125
TESTS = \
32-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop-Tests.dll \
33-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop.Dynamic-Tests.dll \
34-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop.Export-Tests.dll \
35-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll \
36-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop.Tools.JavaSource-Tests.dll \
37-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/logcat-parse-Tests.dll \
38-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator-Tests.dll \
39-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll \
40-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Xamarin.Android.Tools.Bytecode-Tests.dll
26+
bin/Test$(CONFIGURATION)/Java.Interop-Tests.dll \
27+
bin/Test$(CONFIGURATION)/Java.Interop.Dynamic-Tests.dll \
28+
bin/Test$(CONFIGURATION)/Java.Interop.Export-Tests.dll \
29+
bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll \
30+
bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaSource-Tests.dll \
31+
bin/Test$(CONFIGURATION)/logcat-parse-Tests.dll \
32+
bin/Test$(CONFIGURATION)/generator-Tests.dll \
33+
bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll \
34+
bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.Bytecode-Tests.dll
4135

4236
PTESTS = \
43-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop-PerformanceTests.dll
37+
bin/Test$(CONFIGURATION)/Java.Interop-PerformanceTests.dll
4438

4539
ATESTS = \
46-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Android.Interop-Tests.dll
40+
bin/Test$(CONFIGURATION)/Android.Interop-Tests.dll
4741

4842
NUNIT_CONSOLE = packages/NUnit.ConsoleRunner.3.9.0/tools/nunit3-console.exe
4943

@@ -100,13 +94,16 @@ src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config: src/Java.Runti
10094
bin/Build$(CONFIGURATION)/JdkInfo.props
10195
sed -e 's#@JI_JVM_PATH@#$(JI_JVM_PATH)#g' -e 's#@OS_NAME@#$(DLLMAP_OS_NAME)#g' -e $(JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE_CMD) < $< > $@
10296

103-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/$(NATIVE_TIMING_LIB): tests/NativeTiming/timing.c $(wildcard $(JI_JDK_INCLUDE_PATHS)/jni.h)
97+
JAVA_INTEROP_LIB = libjava-interop$(NATIVE_EXT)
98+
NATIVE_TIMING_LIB = libNativeTiming$(NATIVE_EXT)
99+
100+
bin/Test$(CONFIGURATION)/$(NATIVE_TIMING_LIB): tests/NativeTiming/timing.c $(wildcard $(JI_JDK_INCLUDE_PATHS)/jni.h)
104101
mkdir -p `dirname "$@"`
105102
gcc -g -shared -m64 -fPIC -o $@ $< $(JI_JDK_INCLUDE_PATHS:%=-I%)
106103

107104
# Usage: $(call TestAssemblyTemplate,assembly-basename)
108105
define TestAssemblyTemplate
109-
bin/Test$$(CONFIGURATION)/$$(TFNETFRAMEWORK)/$(1)-Tests.dll: $(wildcard src/$(1)/*/*.cs src/$(1)/Test*/*/*.cs)
106+
bin/Test$$(CONFIGURATION)/$(1)-Tests.dll: $(wildcard src/$(1)/*/*.cs src/$(1)/Test*/*/*.cs)
110107
$$(MSBUILD) $$(MSBUILD_FLAGS)
111108
touch $$@
112109
endef # TestAssemblyTemplate
@@ -116,22 +113,22 @@ $(eval $(call TestAssemblyTemplate,Java.Interop.Dynamic))
116113
$(eval $(call TestAssemblyTemplate,Java.Interop.Export))
117114
$(eval $(call TestAssemblyTemplate,Java.Interop.Tools.JavaCallableWrappers))
118115

119-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop-PerformanceTests.dll: $(wildcard tests/Java.Interop-PerformanceTests/*.cs) bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/$(NATIVE_TIMING_LIB)
116+
bin/Test$(CONFIGURATION)/Java.Interop-PerformanceTests.dll: $(wildcard tests/Java.Interop-PerformanceTests/*.cs) bin/Test$(CONFIGURATION)/$(NATIVE_TIMING_LIB)
120117
$(MSBUILD) $(MSBUILD_FLAGS)
121118
touch $@
122119

123-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Android.Interop-Tests.dll: $(wildcard src/Android.Interop/*/*.cs src/Android.Interop/Tests/*/*.cs)
120+
bin/Test$(CONFIGURATION)/Android.Interop-Tests.dll: $(wildcard src/Android.Interop/*/*.cs src/Android.Interop/Tests/*/*.cs)
124121
$(MSBUILD) $(MSBUILD_FLAGS)
125122
touch $@
126123

127-
bin/$(CONFIGURATION)/$(TFNETSTANDARD)/Java.Interop.dll: $(wildcard src/Java.Interop/*/*.cs) src/Java.Interop/Java.Interop.csproj
124+
bin/$(CONFIGURATION)/Java.Interop.dll: $(wildcard src/Java.Interop/*/*.cs) src/Java.Interop/Java.Interop.csproj
128125
$(MSBUILD) $(if $(V),/v:diag,) /p:Configuration=$(CONFIGURATION) $(if $(SNK),"/p:AssemblyOriginatorKeyFile=$(SNK)",)
129126

130127
CSHARP_REFS = \
131-
bin/$(CONFIGURATION)/$(TFNETSTANDARD)/Java.Interop.dll \
132-
bin/$(CONFIGURATION)/$(TFNETSTANDARD)/Java.Interop.Export.dll \
133-
bin/$(CONFIGURATION)/$(TFNETSTANDARD)/Java.Runtime.Environment.dll \
134-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/TestJVM.dll \
128+
bin/$(CONFIGURATION)/Java.Interop.dll \
129+
bin/$(CONFIGURATION)/Java.Interop.Export.dll \
130+
bin/$(CONFIGURATION)/Java.Runtime.Environment.dll \
131+
bin/Test$(CONFIGURATION)/TestJVM.dll \
135132
$(PTESTS) \
136133
$(TESTS)
137134

@@ -144,30 +141,30 @@ define RUN_TEST
144141
$(MSBUILD) $(MSBUILD_FLAGS) build-tools/scripts/RunNUnitTests.targets /p:TestAssembly=$(1) || r=1;
145142
endef
146143

147-
run-tests: $(TESTS) bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/$(JAVA_INTEROP_LIB)
144+
run-tests: $(TESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
148145
r=0; \
149146
$(foreach t,$(TESTS), $(call RUN_TEST,$(t),1)) \
150147
exit $$r;
151148

152-
run-ptests: $(PTESTS) bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/$(JAVA_INTEROP_LIB)
149+
run-ptests: $(PTESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
153150
r=0; \
154151
$(foreach t,$(PTESTS), $(call RUN_TEST,$(t))) \
155152
exit $$r;
156153

157-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/$(JAVA_INTEROP_LIB): bin/$(CONFIGURATION)/$(TFNETFRAMEWORK)/$(JAVA_INTEROP_LIB)
154+
bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB): bin/$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
158155
cp $< $@
159156

160-
JRE_DLL_CONFIG=bin/$(CONFIGURATION)/$(TFNETSTANDARD)/Java.Runtime.Environment.dll.config
157+
JRE_DLL_CONFIG=bin/$(CONFIGURATION)/Java.Runtime.Environment.dll.config
161158

162159
$(JRE_DLL_CONFIG): src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
163160
$(MSBUILD) $(MSBUILD_FLAGS) $<
164161

165162
define run-jnimarshalmethod-gen
166163
MONO_TRACE_LISTENER=Console.Out \
167-
$(RUNTIME) bin/$(CONFIGURATION)/$(TFNETFRAMEWORK)/jnimarshalmethod-gen.exe -v --jvm "$(JI_JVM_PATH)" -L "$(JI_MONO_LIB_PATH)mono/4.5" -L "$(JI_MONO_LIB_PATH)mono/4.5/Facades" $(2) $(1)
164+
$(RUNTIME) bin/$(CONFIGURATION)/jnimarshalmethod-gen.exe -v --jvm "$(JI_JVM_PATH)" -L "$(JI_MONO_LIB_PATH)mono/4.5" -L "$(JI_MONO_LIB_PATH)mono/4.5/Facades" $(2) $(1)
168165
endef
169166

170-
run-test-jnimarshal: bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop.Export-Tests.dll bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/$(JAVA_INTEROP_LIB) $(JRE_DLL_CONFIG)
167+
run-test-jnimarshal: bin/Test$(CONFIGURATION)/Java.Interop.Export-Tests.dll bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB) $(JRE_DLL_CONFIG)
171168
mkdir -p test-jni-output
172169
$(call run-jnimarshalmethod-gen,"$<",-f -o test-jni-output --keeptemp)
173170
(test -f test-jni-output/$(notdir $<) && test -f test-jni-output/Java.Interop.Export-Tests-JniMarshalMethods.dll) || { echo "jnimarshalmethod-gen did not create the expected assemblies in the test-jni-output directory"; exit 1; }
@@ -178,37 +175,37 @@ run-test-jnimarshal: bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/Java.Interop.Exp
178175
define GEN_CORE_OUTPUT
179176
-$(RM) -Rf $(1)
180177
mkdir -p $(1)
181-
$(RUNTIME) bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator.exe -o $(1) $(3) --api-level=20 tests/generator-Tests/Tests-Core/api$(2).xml \
178+
$(RUNTIME) bin/Test$(CONFIGURATION)/generator.exe -o $(1) $(3) --api-level=20 tests/generator-Tests/Tests-Core/api$(2).xml \
182179
--enummethods=tests/generator-Tests/Tests-Core/methods$(2).xml \
183180
--enumfields=tests/generator-Tests/Tests-Core/fields$(2).xml \
184181
--enumdir=$(1)
185182
endef
186183

187-
run-test-generator-core: bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator.exe
188-
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator-core)
189-
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator-core
190-
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator-core,,--codegen-target=JavaInterop1)
191-
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected.ji bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator-core
192-
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator-core,-cp)
193-
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected.cp bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator-core
184+
run-test-generator-core: bin/Test$(CONFIGURATION)/generator.exe
185+
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core)
186+
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected bin/Test$(CONFIGURATION)/generator-core
187+
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core,,--codegen-target=JavaInterop1)
188+
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected.ji bin/Test$(CONFIGURATION)/generator-core
189+
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core,-cp)
190+
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected.cp bin/Test$(CONFIGURATION)/generator-core
194191

195-
bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator.exe: bin/$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator.exe
192+
bin/Test$(CONFIGURATION)/generator.exe: bin/$(CONFIGURATION)/generator.exe
196193
cp $<* `dirname "$@"`
197194

198195
update-test-generator-core:
199196
$(call GEN_CORE_OUTPUT,tests/generator-Tests/Tests-Core/expected)
200197
$(call GEN_CORE_OUTPUT,tests/generator-Tests/Tests-Core/expected.ji,--codegen-target=JavaInterop1)
201198

202199
update-test-generator-nunit:
203-
-$(MAKE) run-tests TESTS=bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/generator-Tests.dll
200+
-$(MAKE) run-tests TESTS=bin/Test$(CONFIGURATION)/generator-Tests.dll
204201
for f in `find tests/generator-Tests/expected -name \*.cs` ; do \
205-
source=`echo $$f | sed 's#^tests/generator-Tests/expected#bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/out#'` ; \
202+
source=`echo $$f | sed 's#^tests/generator-Tests/expected#bin/Test$(CONFIGURATION)/out#'` ; \
206203
if [ -f "$$source" ]; then \
207204
cp -f "$$source" "$$f" ; \
208205
fi; \
209206
done
210-
for source in `find bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/out.ji -type f` ; do \
211-
f=`echo $$source | sed 's#^bin/Test$(CONFIGURATION)/$(TFNETFRAMEWORK)/out.ji#tests/generator-Tests/expected.ji#'` ; \
207+
for source in `find bin/Test$(CONFIGURATION)/out.ji -type f` ; do \
208+
f=`echo $$source | sed 's#^bin/Test$(CONFIGURATION)/out.ji#tests/generator-Tests/expected.ji#'` ; \
212209
mkdir -p `dirname $$f`; \
213210
cp -f "$$source" "$$f" ; \
214211
done

‎build-tools/automation/azure-pipelines.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ jobs:
5151
inputs:
5252
solution: Java.Interop.sln
5353
configuration: $(Build.Configuration)
54-
msbuildArguments: /restore
54+
msbuildArguments: '/t:Restore,Build'
5555

5656
- task: MSBuild@1
5757
displayName: MSBuild RunNUnitTests.targets
5858
inputs:
5959
solution: build-tools/scripts/RunNUnitTests.targets
6060
configuration: $(Build.Configuration)
61-
msbuildArguments: /p:TestAssembly="bin\Test$(Build.Configuration)\net472\generator-Tests.dll;bin\Test$(Build.Configuration)\net472\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(Build.Configuration)\net472\logcat-parse-Tests.dll;bin\Test$(Build.Configuration)\net472\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(Build.Configuration)\net472\Xamarin.Android.Tools.Bytecode-Tests.dll"
61+
msbuildArguments: /p:TestAssembly="bin\Test$(Build.Configuration)\generator-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(Build.Configuration)\logcat-parse-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.Bytecode-Tests.dll"
6262
condition: succeededOrFailed()
6363

6464
- task: PublishTestResults@2

‎samples/Hello/Hello.csproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,16 @@
33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
55
<OutputType>Exe</OutputType>
6+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
67
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7-
<OutputPath>..\..\bin\Test$(Configuration)</OutputPath>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
11+
<OutputPath>..\..\bin\TestDebug</OutputPath>
12+
</PropertyGroup>
13+
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
15+
<OutputPath>..\..\bin\TestRelease</OutputPath>
816
</PropertyGroup>
917

1018
<ItemGroup>

‎src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<Company>Microsoft Corporation</Company>
1111
<Copyright>Microsoft Corporation</Copyright>
1212
<AssemblyVersion>0.1.0.0</AssemblyVersion>
13+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1314
</PropertyGroup>
1415
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1516
<OutputPath>..\..\bin\Debug</OutputPath>

‎src/Java.Interop.Export/Java.Interop.Export.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<Company>Microsoft Corporation</Company>
1010
<Copyright>Microsoft Corporation</Copyright>
1111
<AssemblyVersion>0.1.0.0</AssemblyVersion>
12+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1213
</PropertyGroup>
1314
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1415
<OutputPath>..\..\bin\Debug</OutputPath>

‎src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<Company>Microsoft Corporation</Company>
1111
<Copyright>Microsoft Corporation</Copyright>
1212
<AssemblyVersion>0.1.0.0</AssemblyVersion>
13+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1314
</PropertyGroup>
1415
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1516
<OutputPath>..\..\bin\Debug</OutputPath>

‎src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
56
</PropertyGroup>
67

78
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>

‎src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
56
</PropertyGroup>
67

78
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎src/Java.Interop/Java.Interop.csproj‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,20 @@
88
<DefineConstants>INTEROP;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11-
<OutputPath>..\..\bin\$(Configuration)</OutputPath>
12-
<JNIEnvGenPath>..\..\bin\Build$(Configuration)</JNIEnvGenPath>
13-
<DocumentationFile>$(OutputPath)Java.Interop.xml</DocumentationFile>
11+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
12+
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14+
<OutputPath>..\..\bin\Debug</OutputPath>
15+
<DocumentationFile>..\..\bin\Debug\Java.Interop.xml</DocumentationFile>
16+
<JNIEnvGenPath>..\..\bin\BuildDebug</JNIEnvGenPath>
17+
<DefineConstants>$(DefineConstants);DEBUG;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
18+
<LangVersion>8.0</LangVersion>
19+
<Nullable>enable</Nullable>
20+
</PropertyGroup>
21+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
22+
<OutputPath>..\..\bin\Release</OutputPath>
23+
<DocumentationFile>..\..\bin\Release\Java.Interop.xml</DocumentationFile>
24+
<JNIEnvGenPath>..\..\bin\BuildRelease</JNIEnvGenPath>
1425
<LangVersion>8.0</LangVersion>
1526
<Nullable>enable</Nullable>
1627
</PropertyGroup>

0 commit comments

Comments
 (0)