Skip to content

Commit b16b09c

Browse files
jpobstjpobst
committed
Convert Test projects to SDK style projects.
1 parent 439bd83 commit b16b09c

File tree

735 files changed

+535
-1912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

735 files changed

+535
-1912
lines changed

‎Java.Interop.sln‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28010.2003
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29424.173
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{C8F58966-94BF-407F-914A-8654F8B8AE3B}"
77
EndProject
@@ -25,16 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Dynamic", "src
2525
EndProject
2626
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Export", "src\Java.Interop.Export\Java.Interop.Export.csproj", "{B501D075-6183-4E1D-92C9-F7B5002475B1}"
2727
EndProject
28-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core-Tests", "Core-Tests", "{647B3EED-85D7-45E6-A297-44DC70C79503}"
29-
EndProject
30-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Interop-Tests", "src\Java.Interop\Tests\Interop-Tests.shproj", "{0ADB8D72-7479-49AF-8809-E03AE4A4EAE2}"
31-
EndProject
32-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Dynamic-Tests", "src\Java.Interop.Dynamic\Tests\Dynamic-Tests.shproj", "{8A190F28-74C7-45D8-A701-5864CDF4124A}"
33-
EndProject
34-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Export-Tests", "src\Java.Interop.Export\Tests\Export-Tests.shproj", "{849ABEDC-6A9C-44F0-8543-5298C096A3FB}"
35-
EndProject
36-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PerformanceTests", "tests\PerformanceTests\PerformanceTests.shproj", "{0FBECD2A-7C91-41AB-A4B4-B781E8EC8479}"
37-
EndProject
3828
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Desktop", "Desktop", "{0998E45F-8BCE-4791-A944-962CD54E2D80}"
3929
EndProject
4030
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Runtime.Environment", "src\Java.Runtime.Environment\Java.Runtime.Environment.csproj", "{5887B410-D448-4257-A46B-EAC03C80BE93}"
@@ -59,13 +49,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Dynamic-Tests"
5949
EndProject
6050
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Export-Tests", "tests\Java.Interop.Export-Tests\Java.Interop.Export-Tests.csproj", "{82F24161-F0CA-44CC-AEC3-885D613605E0}"
6151
EndProject
62-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogcatParse-Tests", "tools\logcat-parse\Tests\LogcatParse-Tests.csproj", "{DB05D566-0BA0-4935-868D-689E2F03688E}"
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogcatParse-Tests", "tests\logcat-parse-Tests\LogcatParse-Tests.csproj", "{DB05D566-0BA0-4935-868D-689E2F03688E}"
6353
EndProject
64-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Bytecode-Tests", "src\Xamarin.Android.Tools.Bytecode\Tests\Xamarin.Android.Tools.Bytecode-Tests.csproj", "{C9FA4492-DEB0-4932-A6B8-E2C4E0581692}"
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Bytecode-Tests", "tests\Xamarin.Android.Tools.Bytecode-Tests\Xamarin.Android.Tools.Bytecode-Tests.csproj", "{C9FA4492-DEB0-4932-A6B8-E2C4E0581692}"
6555
EndProject
66-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.ApiXmlAdjuster-Tests", "src\Xamarin.Android.Tools.ApiXmlAdjuster\Tests\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj", "{891F2E04-5614-4A26-A78F-3778025ECF43}"
56+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.ApiXmlAdjuster-Tests", "tests\Xamarin.Android.Tools.ApiXmlAdjuster-Tests\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj", "{891F2E04-5614-4A26-A78F-3778025ECF43}"
6757
EndProject
68-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator-Tests", "tools\generator\Tests\generator-Tests.csproj", "{4EEAB1A7-99C1-4302-9C18-01A7B481409B}"
58+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator-Tests", "tests\generator-Tests\generator-Tests.csproj", "{4EEAB1A7-99C1-4302-9C18-01A7B481409B}"
6959
EndProject
7060
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{D5A93398-AEB1-49F3-89DC-3904A47DB0C7}"
7161
EndProject
@@ -85,7 +75,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.Diagnost
8575
EndProject
8676
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jcw-gen", "tools\jcw-gen\jcw-gen.csproj", "{52C7D9B6-E8C8-47D0-9471-652D278D7D77}"
8777
EndProject
88-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers-Tests", "src\Java.Interop.Tools.JavaCallableWrappers\Test\Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}"
78+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers-Tests", "tests\Java.Interop.Tools.JavaCallableWrappers-Tests\Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}"
8979
EndProject
9080
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Cecil", "src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj", "{15945D4B-FF56-4BCC-B598-2718D199DD08}"
9181
EndProject
@@ -99,21 +89,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Andro
9989
EndProject
10090
Global
10191
GlobalSection(SharedMSBuildProjectFiles) = preSolution
102-
src\Java.Interop\Tests\Interop-Tests.projitems*{04e28441-36ff-4964-add7-efbb47cce406}*SharedItemsImports = 4
103-
src\Java.Interop\Tests\Interop-Tests.projitems*{0adb8d72-7479-49af-8809-e03ae4a4eae2}*SharedItemsImports = 13
104-
tests\PerformanceTests\PerformanceTests.projitems*{0fbecd2a-7c91-41ab-a4b4-b781e8ec8479}*SharedItemsImports = 13
10592
src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 4
106-
tests\PerformanceTests\PerformanceTests.projitems*{6970466b-f6d1-417a-8a27-4fed8555ebd0}*SharedItemsImports = 4
107-
src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{82b1dd53-69ca-4a61-b6b1-f06f1525ef4d}*SharedItemsImports = 4
108-
src\Java.Interop.Export\Tests\Export-Tests.projitems*{82f24161-f0ca-44cc-aec3-885d613605e0}*SharedItemsImports = 4
109-
src\Java.Interop.Export\Tests\Export-Tests.projitems*{849abedc-6a9c-44f0-8543-5298c096a3fb}*SharedItemsImports = 13
110-
src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{8a190f28-74c7-45d8-a701-5864cdf4124a}*SharedItemsImports = 13
111-
src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4
112-
src\Java.Interop.Export\Tests\Export-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4
113-
src\Java.Interop\Tests\Interop-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4
114-
tests\PerformanceTests\PerformanceTests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4
11593
src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{d1295a8f-4f42-461d-a046-564476c10002}*SharedItemsImports = 4
116-
src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{d18fcf91-8876-48a0-a693-2dc1e7d3d80a}*SharedItemsImports = 4
11794
src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{fe789f04-5e95-42c5-aef1-e33f8df06b3f}*SharedItemsImports = 13
11895
EndGlobalSection
11996
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -157,10 +134,6 @@ Global
157134
{B501D075-6183-4E1D-92C9-F7B5002475B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
158135
{B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
159136
{B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|Any CPU.Build.0 = Release|Any CPU
160-
{5FBF138D-1119-4C29-99E1-E928B5209D06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
161-
{5FBF138D-1119-4C29-99E1-E928B5209D06}.Release|Any CPU.ActiveCfg = Release|Any CPU
162-
{C5176170-4025-4A87-B143-11DC64F9BDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
163-
{C5176170-4025-4A87-B143-11DC64F9BDD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
164137
{5887B410-D448-4257-A46B-EAC03C80BE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165138
{5887B410-D448-4257-A46B-EAC03C80BE93}.Debug|Any CPU.Build.0 = Debug|Any CPU
166139
{5887B410-D448-4257-A46B-EAC03C80BE93}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -279,10 +252,6 @@ Global
279252
{BB0AB9F7-0979-41A7-B7A9-877260655F94} = {4C173212-371D-45D8-BA83-9226194F48DC}
280253
{AD4468F8-8883-434B-9D4C-E1801BB3B52A} = {4C173212-371D-45D8-BA83-9226194F48DC}
281254
{B501D075-6183-4E1D-92C9-F7B5002475B1} = {4C173212-371D-45D8-BA83-9226194F48DC}
282-
{0ADB8D72-7479-49AF-8809-E03AE4A4EAE2} = {647B3EED-85D7-45E6-A297-44DC70C79503}
283-
{8A190F28-74C7-45D8-A701-5864CDF4124A} = {647B3EED-85D7-45E6-A297-44DC70C79503}
284-
{849ABEDC-6A9C-44F0-8543-5298C096A3FB} = {647B3EED-85D7-45E6-A297-44DC70C79503}
285-
{0FBECD2A-7C91-41AB-A4B4-B781E8EC8479} = {647B3EED-85D7-45E6-A297-44DC70C79503}
286255
{5887B410-D448-4257-A46B-EAC03C80BE93} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
287256
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
288257
{07BC4495-1267-4B78-9EA6-B76FEEA2A64A} = {0998E45F-8BCE-4791-A944-962CD54E2D80}

‎Makefile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,37 +174,37 @@ run-test-jnimarshal: bin/Test$(CONFIGURATION)/Java.Interop.Export-Tests.dll bin/
174174
define GEN_CORE_OUTPUT
175175
-$(RM) -Rf $(1)
176176
mkdir -p $(1)
177-
$(RUNTIME) bin/Test$(CONFIGURATION)/generator.exe -o $(1) $(3) --api-level=20 tools/generator/Tests-Core/api$(2).xml \
178-
--enummethods=tools/generator/Tests-Core/methods$(2).xml \
179-
--enumfields=tools/generator/Tests-Core/fields$(2).xml \
177+
$(RUNTIME) bin/Test$(CONFIGURATION)/generator.exe -o $(1) $(3) --api-level=20 tests/generator-Tests/Tests-Core/api$(2).xml \
178+
--enummethods=tests/generator-Tests/Tests-Core/methods$(2).xml \
179+
--enumfields=tests/generator-Tests/Tests-Core/fields$(2).xml \
180180
--enumdir=$(1)
181181
endef
182182

183183
run-test-generator-core: bin/Test$(CONFIGURATION)/generator.exe
184184
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core)
185-
diff -rup --strip-trailing-cr tools/generator/Tests-Core/expected bin/Test$(CONFIGURATION)/generator-core
185+
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected bin/Test$(CONFIGURATION)/generator-core
186186
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core,,--codegen-target=JavaInterop1)
187-
diff -rup --strip-trailing-cr tools/generator/Tests-Core/expected.ji bin/Test$(CONFIGURATION)/generator-core
187+
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected.ji bin/Test$(CONFIGURATION)/generator-core
188188
$(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core,-cp)
189-
diff -rup --strip-trailing-cr tools/generator/Tests-Core/expected.cp bin/Test$(CONFIGURATION)/generator-core
189+
diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected.cp bin/Test$(CONFIGURATION)/generator-core
190190

191191
bin/Test$(CONFIGURATION)/generator.exe: bin/$(CONFIGURATION)/generator.exe
192192
cp $<* `dirname "$@"`
193193

194194
update-test-generator-core:
195-
$(call GEN_CORE_OUTPUT,tools/generator/Tests-Core/expected)
196-
$(call GEN_CORE_OUTPUT,tools/generator/Tests-Core/expected.ji,--codegen-target=JavaInterop1)
195+
$(call GEN_CORE_OUTPUT,tests/generator-Tests/Tests-Core/expected)
196+
$(call GEN_CORE_OUTPUT,tests/generator-Tests/Tests-Core/expected.ji,--codegen-target=JavaInterop1)
197197

198198
update-test-generator-nunit:
199199
-$(MAKE) run-tests TESTS=bin/Test$(CONFIGURATION)/generator-Tests.dll
200-
for f in `find tools/generator/Tests/expected -name \*.cs` ; do \
201-
source=`echo $$f | sed 's#^tools/generator/Tests/expected#bin/Test$(CONFIGURATION)/out#'` ; \
200+
for f in `find tests/generator-Tests/expected -name \*.cs` ; do \
201+
source=`echo $$f | sed 's#^tests/generator-Tests/expected#bin/Test$(CONFIGURATION)/out#'` ; \
202202
if [ -f "$$source" ]; then \
203203
cp -f "$$source" "$$f" ; \
204204
fi; \
205205
done
206206
for source in `find bin/Test$(CONFIGURATION)/out.ji -type f` ; do \
207-
f=`echo $$source | sed 's#^bin/Test$(CONFIGURATION)/out.ji#tools/generator/Tests/expected.ji#'` ; \
207+
f=`echo $$source | sed 's#^bin/Test$(CONFIGURATION)/out.ji#tests/generator-Tests/expected.ji#'` ; \
208208
mkdir -p `dirname $$f`; \
209209
cp -f "$$source" "$$f" ; \
210210
done

‎NuGet.Config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Our testing infrastructure depends on a known location for:
4+
- NUnit.Console
5+
- csc.exe
6+
-->
7+
<configuration>
8+
<config>
9+
<add key="globalPackagesFolder" value="$\..\packages" />
10+
</config>
11+
</configuration>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ jobs:
3838
inputs:
3939
solution: Java.Interop.sln
4040
configuration: $(Build.Configuration)
41-
41+
msbuildArguments: '/t:Restore,Build'
42+
4243
- task: MSBuild@1
4344
displayName: MSBuild RunNUnitTests.targets
4445
inputs:

‎build-tools/scripts/RunNUnitTests.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<_TopDir>$(MSBuildThisFileDirectory)..\..</_TopDir>
66
<_Runtime Condition=" '$(RUNTIME)' != '' ">$(RUNTIME)</_Runtime>
77
<_Runtime Condition=" '$(RUNTIME)' == '' And '$(OS)' != 'Windows_NT' ">mono --debug</_Runtime>
8-
<_NUnit>$(_Runtime) packages\NUnit.ConsoleRunner.3.9.0\tools\nunit3-console.exe</_NUnit>
8+
<_NUnit>$(_Runtime) packages\nunit.consolerunner\3.9.0\tools\nunit3-console.exe</_NUnit>
99
<_Run Condition=" '$(RUN)' != '' ">--run=&quot;$(RUN)&quot;</_Run>
1010
</PropertyGroup>
1111
<Import
@@ -33,7 +33,7 @@
3333
<SetEnvironmentVariable Name="JAVA_INTEROP_LREF_LOG" Value="bin\Test$(Configuration)\l-%(_TestAssembly.Filename).txt" />
3434
<SetEnvironmentVariable Name="JI_JVM_PATH" Value="$(JdkJvmPath)" />
3535
<Exec
36-
Command="$(_NUnit) $(NUNIT_EXTRA) %(_TestAssembly.Identity) $(_Run) --result=&quot;TestResult-%(Filename).xml;format=nunit2&quot; --output=&quot;bin\Test$(Configuration)\TestOutput-%(Filename).txt&quot;"
36+
Command="$(_NUnit) $(NUNIT_EXTRA) %(_TestAssembly.Identity) $(_Run) --result=&quot;TestResult-%(Filename).xml&quot; --output=&quot;bin\Test$(Configuration)\TestOutput-%(Filename).txt&quot;"
3737
WorkingDirectory="$(_TopDir)"
3838
ContinueOnError="ErrorAndContinue"
3939
/>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1818
<OutputPath>..\..\bin\Release</OutputPath>
1919
</PropertyGroup>
20-
<ItemGroup>
21-
<Compile Remove="Tests\**\*.cs" />
22-
</ItemGroup>
2320
<ItemGroup>
2421
<ProjectReference Include="..\Java.Interop\Java.Interop.csproj">
2522
<Project>{94BD81F7-B06F-4295-9636-F8A3B6BDC762}</Project>

‎src/Java.Interop.Dynamic/Tests/Dynamic-Tests.projitems‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/Java.Interop.Dynamic/Tests/Dynamic-Tests.shproj‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 71 deletions
This file was deleted.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1717
<OutputPath>..\..\bin\Release</OutputPath>
1818
</PropertyGroup>
19-
<ItemGroup>
20-
<Compile Remove="Tests\**\*.cs" />
21-
<Compile Remove="Java.Interop\JniLocationException.cs" />
22-
</ItemGroup>
2319
<ItemGroup>
2420
<ProjectReference Include="..\Java.Interop\Java.Interop.csproj">
2521
<Project>{94BD81F7-B06F-4295-9636-F8A3B6BDC762}</Project>

0 commit comments

Comments
 (0)