Fix tool path. Changed up a level since props file moved.

ikvmnet · Aug 11, 2023 · 1c27e0a · 1c27e0a
1 parent b6815c7
commit 1c27e0a
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 22 deletions.
diff --git a/...SBuild.Tools.runtime.linux-arm/buildTransitive/IKVM.MSBuild.Tools.runtime.linux-arm.props b/...SBuild.Tools.runtime.linux-arm/buildTransitive/IKVM.MSBuild.Tools.runtime.linux-arm.props
@@ -4,8 +4,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net6.0\linux-arm\" TargetFramework="net6.0" RuntimeIdentifier="linux-arm" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net6.0\linux-arm\" TargetFramework="net6.0" RuntimeIdentifier="linux-arm" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net6.0\linux-arm\" TargetFramework="net6.0" RuntimeIdentifier="linux-arm" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net6.0\linux-arm\" TargetFramework="net6.0" RuntimeIdentifier="linux-arm" />
     </ItemGroup>
 
 </Project>
diff --git a/...ld.Tools.runtime.linux-arm64/buildTransitive/IKVM.MSBuild.Tools.runtime.linux-arm64.props b/...ld.Tools.runtime.linux-arm64/buildTransitive/IKVM.MSBuild.Tools.runtime.linux-arm64.props
@@ -4,10 +4,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net472\linux-arm64\" TargetFramework="net472" RuntimeIdentifier="linux-arm64" />
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net6.0\linux-arm64\" TargetFramework="net6.0" RuntimeIdentifier="linux-arm64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net472\linux-arm64\" TargetFramework="net472" RuntimeIdentifier="linux-arm64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net6.0\linux-arm64\" TargetFramework="net6.0" RuntimeIdentifier="linux-arm64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net472\linux-arm64\" TargetFramework="net472" RuntimeIdentifier="linux-arm64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net6.0\linux-arm64\" TargetFramework="net6.0" RuntimeIdentifier="linux-arm64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net472\linux-arm64\" TargetFramework="net472" RuntimeIdentifier="linux-arm64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net6.0\linux-arm64\" TargetFramework="net6.0" RuntimeIdentifier="linux-arm64" />
     </ItemGroup>
 
 </Project>
diff --git a/...SBuild.Tools.runtime.linux-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.linux-x64.props b/...SBuild.Tools.runtime.linux-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.linux-x64.props
@@ -4,10 +4,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net472\linux-x64\" TargetFramework="net472" RuntimeIdentifier="linux-x64" />
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net6.0\linux-x64\" TargetFramework="net6.0" RuntimeIdentifier="linux-x64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net472\linux-x64\" TargetFramework="net472" RuntimeIdentifier="linux-x64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net6.0\linux-x64\" TargetFramework="net6.0" RuntimeIdentifier="linux-x64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net472\linux-x64\" TargetFramework="net472" RuntimeIdentifier="linux-x64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net6.0\linux-x64\" TargetFramework="net6.0" RuntimeIdentifier="linux-x64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net472\linux-x64\" TargetFramework="net472" RuntimeIdentifier="linux-x64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net6.0\linux-x64\" TargetFramework="net6.0" RuntimeIdentifier="linux-x64" />
     </ItemGroup>
 
 </Project>
diff --git a/...SBuild.Tools.runtime.osx-arm64/buildTransitive/IKVM.MSBuild.Tools.runtime.osx-arm64.props b/...SBuild.Tools.runtime.osx-arm64/buildTransitive/IKVM.MSBuild.Tools.runtime.osx-arm64.props
@@ -4,10 +4,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net472\osx-arm64\" TargetFramework="net472" RuntimeIdentifier="osx-arm64" />
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net6.0\osx-arm64\" TargetFramework="net6.0" RuntimeIdentifier="osx-arm64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net472\osx-arm64\" TargetFramework="net472" RuntimeIdentifier="osx-arm64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net6.0\osx-arm64\" TargetFramework="net6.0" RuntimeIdentifier="osx-arm64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net472\osx-arm64\" TargetFramework="net472" RuntimeIdentifier="osx-arm64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net6.0\osx-arm64\" TargetFramework="net6.0" RuntimeIdentifier="osx-arm64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net472\osx-arm64\" TargetFramework="net472" RuntimeIdentifier="osx-arm64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net6.0\osx-arm64\" TargetFramework="net6.0" RuntimeIdentifier="osx-arm64" />
     </ItemGroup>
 
 </Project>
diff --git a/...VM.MSBuild.Tools.runtime.osx-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.osx-x64.props b/...VM.MSBuild.Tools.runtime.osx-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.osx-x64.props
@@ -4,10 +4,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net472\osx-x64\" TargetFramework="net472" RuntimeIdentifier="osx-x64" />
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net6.0\osx-x64\" TargetFramework="net6.0" RuntimeIdentifier="osx-x64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net472\osx-x64\" TargetFramework="net472" RuntimeIdentifier="osx-x64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net6.0\osx-x64\" TargetFramework="net6.0" RuntimeIdentifier="osx-x64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net472\osx-x64\" TargetFramework="net472" RuntimeIdentifier="osx-x64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net6.0\osx-x64\" TargetFramework="net6.0" RuntimeIdentifier="osx-x64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net472\osx-x64\" TargetFramework="net472" RuntimeIdentifier="osx-x64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net6.0\osx-x64\" TargetFramework="net6.0" RuntimeIdentifier="osx-x64" />
     </ItemGroup>
 
 </Project>
diff --git a/....MSBuild.Tools.runtime.win7-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.win7-x64.props b/....MSBuild.Tools.runtime.win7-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.win7-x64.props
@@ -4,10 +4,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net472\win7-x64\" TargetFramework="net472" RuntimeIdentifier="win7-x64" />
-        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmc\net6.0\win7-x64\" TargetFramework="net6.0" RuntimeIdentifier="win7-x64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net472\win7-x64\" TargetFramework="net472" RuntimeIdentifier="win7-x64" />
-        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\..\ikvmstub\net6.0\win7-x64\" TargetFramework="net6.0" RuntimeIdentifier="win7-x64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net472\win7-x64\" TargetFramework="net472" RuntimeIdentifier="win7-x64" />
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net6.0\win7-x64\" TargetFramework="net6.0" RuntimeIdentifier="win7-x64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net472\win7-x64\" TargetFramework="net472" RuntimeIdentifier="win7-x64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net6.0\win7-x64\" TargetFramework="net6.0" RuntimeIdentifier="win7-x64" />
     </ItemGroup>
 
 </Project>
diff --git a/testenvironments.json b/testenvironments.json
@@ -10,6 +10,12 @@
             "name": "Debian",
             "type": "wsl",
             "wslDistribution": "Debian"
+        },
+        {
+            "name": "linux-arm64",
+            "type": "ssh",
+            "remoteUri": "ssh://[email protected]:22/",
+            "localRoot": "/home/sysadmin/vs/"
         }
     ]
 }