Combine local repo tests.

ikvmnet · Dec 4, 2023 · 2b66110 · 2b66110
1 parent 9efb4e3
commit 2b66110
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 311 deletions.
diff --git a/src/IKVM.Maven.Sdk.Tests/IKVM.Maven.Sdk.Tests.csproj b/src/IKVM.Maven.Sdk.Tests/IKVM.Maven.Sdk.Tests.csproj
@@ -8,8 +8,6 @@
     <ItemGroup>
         <Compile Remove="Project\**\*" />
         <None Include="Project\**\*" CopyToOutputDirectory="PreserveNewest" />
-        <Compile Remove="LocalRepoProject\**\*" />
-        <None Include="LocalRepoProject\**\*" CopyToOutputDirectory="PreserveNewest" />
         <Compile Remove="PackProject\**\*" />
         <None Include="PackProject\**\*" CopyToOutputDirectory="PreserveNewest" />
         <Compile Remove="PackageReferenceProject\**\*" />
@@ -32,18 +30,6 @@
         </PackageProjectReference>
     </ItemGroup>
 
-    <ItemGroup>
-      <None Update="LocalRepoProject\repository\hellotest\1.0\hellotest-1.0.jar">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-      <None Update="LocalRepoProject\repository\hellotest\1.0\hellotest-1.0.pom">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-      <None Update="LocalRepoProject\repository\hellotest\maven-metadata-local.xml">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-
     <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
     <!-- Generate a file the Tests can use to retrieve various MSBuild properties. -->

diff --git a/src/IKVM.Maven.Sdk.Tests/LocalRepoProject/Exe/Program.cs b/src/IKVM.Maven.Sdk.Tests/LocalRepoProject/Exe/Program.cs
diff --git a/src/IKVM.Maven.Sdk.Tests/LocalRepoProject/Exe/ProjectExe.csproj b/src/IKVM.Maven.Sdk.Tests/LocalRepoProject/Exe/ProjectExe.csproj
diff --git a/src/IKVM.Maven.Sdk.Tests/LocalRepoProject/Lib/Helloworld.cs b/src/IKVM.Maven.Sdk.Tests/LocalRepoProject/Lib/Helloworld.cs
diff --git a/src/IKVM.Maven.Sdk.Tests/LocalRepoProject/Lib/ProjectLib.csproj b/src/IKVM.Maven.Sdk.Tests/LocalRepoProject/Lib/ProjectLib.csproj
diff --git a/src/IKVM.Maven.Sdk.Tests/LocalRepoProjectTests.cs b/src/IKVM.Maven.Sdk.Tests/LocalRepoProjectTests.cs
diff --git a/src/IKVM.Maven.Sdk.Tests/Project/Exe/ProjectExe.csproj b/src/IKVM.Maven.Sdk.Tests/Project/Exe/ProjectExe.csproj
@@ -3,6 +3,7 @@
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net48;net6.0;net7.0</TargetFrameworks>
         <RuntimeIdentifiers>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+        <MavenAdditionalRepositories>local=file:///$(MSBuildThisFileDirectory.Replace('\', '/'))../repository</MavenAdditionalRepositories>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/IKVM.Maven.Sdk.Tests/Project/Lib/ProjectLib.csproj b/src/IKVM.Maven.Sdk.Tests/Project/Lib/ProjectLib.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net472;net48;net6.0;net7.0</TargetFrameworks>
+        <MavenAdditionalRepositories>local=file:///$(MSBuildThisFileDirectory.Replace('\', '/'))../repository</MavenAdditionalRepositories>
     </PropertyGroup>
 
     <ItemGroup>
@@ -10,6 +11,7 @@
     <ItemGroup>
         <MavenReference Include="org.apache.maven:maven-core" Version="3.8.6" />
         <MavenReference Include="com.yahoo.vespa:documentapi" Version="8.12.48" />
+        <MavenReference Include="hellotest:hellotest" Version="1.0" />
     </ItemGroup>
 
 </Project>
diff --git a/...epository/hellotest/1.0/hellotest-1.0.jar → ...epository/hellotest/1.0/hellotest-1.0.jar b/...epository/hellotest/1.0/hellotest-1.0.jar → ...epository/hellotest/1.0/hellotest-1.0.jar
diff --git a/...epository/hellotest/1.0/hellotest-1.0.pom → ...epository/hellotest/1.0/hellotest-1.0.pom b/...epository/hellotest/1.0/hellotest-1.0.pom → ...epository/hellotest/1.0/hellotest-1.0.pom
diff --git a/...sitory/hellotest/maven-metadata-local.xml → ...sitory/hellotest/maven-metadata-local.xml b/...sitory/hellotest/maven-metadata-local.xml → ...sitory/hellotest/maven-metadata-local.xml
diff --git a/src/IKVM.Maven.Sdk.Tests/ProjectTests.cs b/src/IKVM.Maven.Sdk.Tests/ProjectTests.cs
@@ -215,6 +215,7 @@ public void CanBuildProject(EnvironmentPreference env, string tfm, string rid, s
                 File.Exists(Path.Combine(outDir, "org.apache.commons.logging.dll")).Should().BeFalse();
                 File.Exists(Path.Combine(outDir, "org.slf4j.dll")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "xml.apis.dll")).Should().BeFalse();
+                File.Exists(Path.Combine(outDir, "hellotest.dll")).Should().BeTrue();
 
                 // ikvm libraries
                 File.Exists(Path.Combine(outDir, "IKVM.Runtime.dll")).Should().BeTrue();