From 9bc848afe60808c926fff5254531b2fe998b7810 Mon Sep 17 00:00:00 2001
From: Maros Sandor <maros.sandor@jetbrains.com>
Date: Mon, 15 Apr 2024 11:50:43 +0200
Subject: [PATCH] MPS-37020 Introducing build.jna.library.path property

---
 build/tests/mpsActions.xml                    |  3 +-
 build/tests/mpsBaseLanguage.xml               |  3 +-
 build/tests/mpsBehavior.xml                   |  3 +-
 build/tests/mpsBuild.xml                      |  3 +-
 build/tests/mpsConsole.xml                    |  3 +-
 build/tests/mpsConstraints.xml                |  3 +-
 build/tests/mpsDataFlow.xml                   |  3 +-
 build/tests/mpsEditor.xml                     |  3 +-
 build/tests/mpsEditorDiagram.xml              |  3 +-
 build/tests/mpsEditorImageGen.xml             |  3 +-
 build/tests/mpsEditorTransformationMenu.xml   |  3 +-
 build/tests/mpsExecution.xml                  |  3 +-
 build/tests/mpsFeedback.xml                   |  3 +-
 build/tests/mpsGenerator.xml                  |  3 +-
 build/tests/mpsHttpSupport.xml                |  3 +-
 build/tests/mpsImplementationStripping.xml    |  3 +-
 build/tests/mpsJava.xml                       |  3 +-
 build/tests/mpsKotlin.xml                     |  3 +-
 build/tests/mpsPackaged.xml                   |  3 +-
 build/tests/mpsSModel.xml                     |  3 +-
 build/tests/mpsSmartRefAttrMigration_gen.xml  |  3 +-
 build/tests/mpsTest.xml                       |  3 +-
 build/tests/mpsTestModules.xml                |  3 +-
 build/tests/mpsText.xml                       |  3 +-
 build/tests/mpsToolTests.xml                  |  3 +-
 build/tests/mpsTypesystem.xml                 |  3 +-
 .../jetbrains/mps/build/mps/tests/generated   |  2 +-
 .../tests/generator/template/main/generated   |  2 +-
 .../generator/template/main@generator.mps     | 20 +++++++-
 .../tests/generatedTests/mpsTestModules.xml   |  3 +-
 .../ide/build/tests/generatedTests/trace.info |  2 +-
 .../mps/ide/build/tests/mpsActions.xml        |  3 +-
 .../mps/ide/build/tests/mpsBaseLanguage.xml   |  3 +-
 .../mps/ide/build/tests/mpsBehavior.xml       |  3 +-
 .../mps/ide/build/tests/mpsBuild.xml          |  3 +-
 .../mps/ide/build/tests/mpsConsole.xml        |  3 +-
 .../mps/ide/build/tests/mpsConstraints.xml    |  3 +-
 .../mps/ide/build/tests/mpsDataFlow.xml       |  3 +-
 .../mps/ide/build/tests/mpsEditor.xml         |  3 +-
 .../mps/ide/build/tests/mpsEditorDiagram.xml  |  3 +-
 .../mps/ide/build/tests/mpsEditorImageGen.xml |  3 +-
 .../tests/mpsEditorTransformationMenu.xml     |  3 +-
 .../mps/ide/build/tests/mpsExecution.xml      |  3 +-
 .../mps/ide/build/tests/mpsFeedback.xml       |  3 +-
 .../mps/ide/build/tests/mpsGenerator.xml      |  3 +-
 .../mps/ide/build/tests/mpsHttpSupport.xml    |  3 +-
 .../tests/mpsImplementationStripping.xml      |  3 +-
 .../jetbrains/mps/ide/build/tests/mpsJava.xml |  3 +-
 .../mps/ide/build/tests/mpsKotlin.xml         |  3 +-
 .../mps/ide/build/tests/mpsPackaged.xml       |  3 +-
 .../mps/ide/build/tests/mpsSModel.xml         |  3 +-
 .../build/tests/mpsSmartRefAttrMigration.xml  |  3 +-
 .../jetbrains/mps/ide/build/tests/mpsTest.xml |  3 +-
 .../jetbrains/mps/ide/build/tests/mpsText.xml |  3 +-
 .../mps/ide/build/tests/mpsToolTests.xml      |  3 +-
 .../mps/ide/build/tests/mpsTypesystem.xml     |  3 +-
 .../jetbrains/mps/ide/build/tests/trace.info  | 50 +++++++++----------
 57 files changed, 151 insertions(+), 81 deletions(-)

diff --git a/build/tests/mpsActions.xml b/build/tests/mpsActions.xml
index ac55491ee509..a4b93a6208a6 100644
--- a/build/tests/mpsActions.xml
+++ b/build/tests/mpsActions.xml
@@ -431,13 +431,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsBaseLanguage.xml b/build/tests/mpsBaseLanguage.xml
index ff140cce2654..76e5aee438e4 100644
--- a/build/tests/mpsBaseLanguage.xml
+++ b/build/tests/mpsBaseLanguage.xml
@@ -1906,13 +1906,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="${mps.junit.haltonfailure}" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsBehavior.xml b/build/tests/mpsBehavior.xml
index ab3ee7552e8b..d8352568ddf6 100644
--- a/build/tests/mpsBehavior.xml
+++ b/build/tests/mpsBehavior.xml
@@ -1393,13 +1393,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsBuild.xml b/build/tests/mpsBuild.xml
index 47784a22c4a2..4831fb0e881e 100644
--- a/build/tests/mpsBuild.xml
+++ b/build/tests/mpsBuild.xml
@@ -590,13 +590,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsConsole.xml b/build/tests/mpsConsole.xml
index 5ca5d33c5d38..8d4b6cf361c9 100644
--- a/build/tests/mpsConsole.xml
+++ b/build/tests/mpsConsole.xml
@@ -515,13 +515,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsConstraints.xml b/build/tests/mpsConstraints.xml
index 35e732543c9e..32aa98ba6558 100644
--- a/build/tests/mpsConstraints.xml
+++ b/build/tests/mpsConstraints.xml
@@ -1060,13 +1060,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsDataFlow.xml b/build/tests/mpsDataFlow.xml
index 9adfae2d219a..7c4601e2d9ab 100644
--- a/build/tests/mpsDataFlow.xml
+++ b/build/tests/mpsDataFlow.xml
@@ -866,13 +866,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsEditor.xml b/build/tests/mpsEditor.xml
index e552c40b30ab..34980ca20436 100644
--- a/build/tests/mpsEditor.xml
+++ b/build/tests/mpsEditor.xml
@@ -3332,6 +3332,7 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
@@ -3339,7 +3340,7 @@
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsEditorDiagram.xml b/build/tests/mpsEditorDiagram.xml
index 0f34c954e51d..0adee7a07902 100644
--- a/build/tests/mpsEditorDiagram.xml
+++ b/build/tests/mpsEditorDiagram.xml
@@ -837,13 +837,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsEditorImageGen.xml b/build/tests/mpsEditorImageGen.xml
index 7d0e44040026..a0146b2ea16a 100644
--- a/build/tests/mpsEditorImageGen.xml
+++ b/build/tests/mpsEditorImageGen.xml
@@ -750,13 +750,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsEditorTransformationMenu.xml b/build/tests/mpsEditorTransformationMenu.xml
index 536a275bc195..77f797207a6d 100644
--- a/build/tests/mpsEditorTransformationMenu.xml
+++ b/build/tests/mpsEditorTransformationMenu.xml
@@ -3197,13 +3197,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsExecution.xml b/build/tests/mpsExecution.xml
index 67198f4f983b..ed1465fd2b5e 100644
--- a/build/tests/mpsExecution.xml
+++ b/build/tests/mpsExecution.xml
@@ -1145,13 +1145,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsFeedback.xml b/build/tests/mpsFeedback.xml
index 8162b3f2422f..ca5053d55c28 100644
--- a/build/tests/mpsFeedback.xml
+++ b/build/tests/mpsFeedback.xml
@@ -663,13 +663,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsGenerator.xml b/build/tests/mpsGenerator.xml
index d3caae3a9a55..bcfdb826fded 100644
--- a/build/tests/mpsGenerator.xml
+++ b/build/tests/mpsGenerator.xml
@@ -3215,13 +3215,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsHttpSupport.xml b/build/tests/mpsHttpSupport.xml
index e7239ef634b6..48a524aac65a 100644
--- a/build/tests/mpsHttpSupport.xml
+++ b/build/tests/mpsHttpSupport.xml
@@ -505,13 +505,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsImplementationStripping.xml b/build/tests/mpsImplementationStripping.xml
index 815bf24a7767..10d99e2bba2f 100644
--- a/build/tests/mpsImplementationStripping.xml
+++ b/build/tests/mpsImplementationStripping.xml
@@ -874,13 +874,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsJava.xml b/build/tests/mpsJava.xml
index 57a93990ed0c..6855c7607b05 100644
--- a/build/tests/mpsJava.xml
+++ b/build/tests/mpsJava.xml
@@ -531,13 +531,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsKotlin.xml b/build/tests/mpsKotlin.xml
index 04dddd42787d..6737adc5186a 100644
--- a/build/tests/mpsKotlin.xml
+++ b/build/tests/mpsKotlin.xml
@@ -456,13 +456,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsPackaged.xml b/build/tests/mpsPackaged.xml
index 5c50d51dc5cc..d49cb18a7f2a 100644
--- a/build/tests/mpsPackaged.xml
+++ b/build/tests/mpsPackaged.xml
@@ -665,13 +665,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsSModel.xml b/build/tests/mpsSModel.xml
index 4c9028670d4b..a9b26b6e9324 100644
--- a/build/tests/mpsSModel.xml
+++ b/build/tests/mpsSModel.xml
@@ -951,13 +951,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsSmartRefAttrMigration_gen.xml b/build/tests/mpsSmartRefAttrMigration_gen.xml
index 65bcc37f7485..b0dfa7e62f28 100644
--- a/build/tests/mpsSmartRefAttrMigration_gen.xml
+++ b/build/tests/mpsSmartRefAttrMigration_gen.xml
@@ -430,13 +430,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsTest.xml b/build/tests/mpsTest.xml
index 309d0f1b2fdc..e571146aea58 100644
--- a/build/tests/mpsTest.xml
+++ b/build/tests/mpsTest.xml
@@ -413,13 +413,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsTestModules.xml b/build/tests/mpsTestModules.xml
index 9224a8a4b420..1f9f8e6b1582 100644
--- a/build/tests/mpsTestModules.xml
+++ b/build/tests/mpsTestModules.xml
@@ -1099,6 +1099,7 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xss2048k" />
@@ -1106,7 +1107,7 @@
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsText.xml b/build/tests/mpsText.xml
index 543aad006c7e..ff6de16cab1c 100644
--- a/build/tests/mpsText.xml
+++ b/build/tests/mpsText.xml
@@ -456,13 +456,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsToolTests.xml b/build/tests/mpsToolTests.xml
index 8e0814fc0226..b9fdf8bed8d2 100644
--- a/build/tests/mpsToolTests.xml
+++ b/build/tests/mpsToolTests.xml
@@ -584,6 +584,7 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xss2048k" />
@@ -591,7 +592,7 @@
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/build/tests/mpsTypesystem.xml b/build/tests/mpsTypesystem.xml
index 917769873355..e8e8d2a8e4ba 100644
--- a/build/tests/mpsTypesystem.xml
+++ b/build/tests/mpsTypesystem.xml
@@ -1881,13 +1881,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generated b/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generated
index 0e8f48b4a8cd..62c28ed9e44a 100644
--- a/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generated
+++ b/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-1en39qkvn40ar9dhzkbo4a8xei3gvtf">
+<product version="3" modelHash="4s72e1p9dyyawirloq6fgod9u6zf1cn">
   <files names="Generator.java" />
 </product>
 
diff --git a/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generator/template/main/generated b/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generator/template/main/generated
index 468749deeb44..dfb44741919a 100644
--- a/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generator/template/main/generated
+++ b/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generator/template/main/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="54ntv4nsgs16049n8g0786j1fw0l18v">
+<product version="3" modelHash="-1rd67ldrez833d3m6dnjghnfkrxbzm3">
   <files names="QueriesGenerated.java" />
 </product>
 
diff --git a/plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps b/plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps
index 0fb5c8d69a46..c22580200bd2 100644
--- a/plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps
+++ b/plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps
@@ -1761,6 +1761,24 @@
                 </node>
               </node>
             </node>
+            <node concept="2Vbh7Z" id="7pkhUJK_gDa" role="2VaTZU">
+              <node concept="2pNNFK" id="7pkhUJK_i7Z" role="2Vbh7K">
+                <property role="2pNNFO" value="property" />
+                <property role="qg3DV" value="true" />
+                <node concept="2pNUuL" id="7pkhUJK_icT" role="2pNNFR">
+                  <property role="2pNUuO" value="name" />
+                  <node concept="2pMdtt" id="7pkhUJK_icU" role="2pMdts">
+                    <property role="2pMdty" value="build.jna.library.path" />
+                  </node>
+                </node>
+                <node concept="2pNUuL" id="7pkhUJKNOoh" role="2pNNFR">
+                  <property role="2pNUuO" value="location" />
+                  <node concept="2pMdtt" id="7pkhUJKNOoi" role="2pMdts">
+                    <property role="2pMdty" value="${artifacts.mps}/lib/jna" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="2Vbh7Z" id="6u4p9jnUOcS" role="2VaTZU">
               <node concept="2pNNFK" id="6u4p9jnUOcW" role="2Vbh7K">
                 <property role="2pNNFO" value="junit" />
@@ -2368,7 +2386,7 @@
                   <node concept="2pNUuL" id="6OON6YVXP4d" role="2pNNFR">
                     <property role="2pNUuO" value="value" />
                     <node concept="2pMdtt" id="6OON6YVXP4e" role="2pMdts">
-                      <property role="2pMdty" value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+                      <property role="2pMdty" value="-Djna.boot.library.path=${build.jna.library.path}" />
                     </node>
                   </node>
                 </node>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
index 9224a8a4b420..1f9f8e6b1582 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
@@ -1099,6 +1099,7 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xss2048k" />
@@ -1106,7 +1107,7 @@
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
index 30e454a09d86..15627d7c89bb 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:12897c41-1d23-444a-8c3d-8a254e74f9b6(jetbrains.mps.ide.build.tests.generatedTests)/7136415284644172256">
     <file name="mpsTestModules.xml">
-      <unit id="7136415284644172256" at="1,0,1175,10" name="jetbrains.mps.ide.build.tests.generatedTests.mpsTestModules" />
+      <unit id="7136415284644172256" at="1,0,1176,10" name="jetbrains.mps.ide.build.tests.generatedTests.mpsTestModules" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
index ac55491ee509..a4b93a6208a6 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
@@ -431,13 +431,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
index ff140cce2654..76e5aee438e4 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
@@ -1906,13 +1906,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="${mps.junit.haltonfailure}" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
index ab3ee7552e8b..d8352568ddf6 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
@@ -1393,13 +1393,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
index 47784a22c4a2..4831fb0e881e 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
@@ -590,13 +590,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
index 5ca5d33c5d38..8d4b6cf361c9 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
@@ -515,13 +515,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
index 35e732543c9e..32aa98ba6558 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
@@ -1060,13 +1060,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
index 9adfae2d219a..7c4601e2d9ab 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
@@ -866,13 +866,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
index e552c40b30ab..34980ca20436 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
@@ -3332,6 +3332,7 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
@@ -3339,7 +3340,7 @@
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
index 0f34c954e51d..0adee7a07902 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
@@ -837,13 +837,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
index 7d0e44040026..a0146b2ea16a 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
@@ -750,13 +750,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
index 536a275bc195..77f797207a6d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
@@ -3197,13 +3197,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
index 67198f4f983b..ed1465fd2b5e 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
@@ -1145,13 +1145,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
index 8162b3f2422f..ca5053d55c28 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
@@ -663,13 +663,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
index d3caae3a9a55..bcfdb826fded 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
@@ -3215,13 +3215,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
index e7239ef634b6..48a524aac65a 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
@@ -505,13 +505,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
index 815bf24a7767..10d99e2bba2f 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
@@ -874,13 +874,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
index 57a93990ed0c..6855c7607b05 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
@@ -531,13 +531,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
index 04dddd42787d..6737adc5186a 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
@@ -456,13 +456,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
index 5c50d51dc5cc..d49cb18a7f2a 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
@@ -665,13 +665,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
index 4c9028670d4b..a9b26b6e9324 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
@@ -951,13 +951,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
index 65bcc37f7485..b0dfa7e62f28 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
@@ -430,13 +430,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
index 309d0f1b2fdc..e571146aea58 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
@@ -413,13 +413,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
index 543aad006c7e..ff6de16cab1c 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
@@ -456,13 +456,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
index 8e0814fc0226..b9fdf8bed8d2 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
@@ -584,6 +584,7 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xss2048k" />
@@ -591,7 +592,7 @@
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
index 917769873355..e8e8d2a8e4ba 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
@@ -1881,13 +1881,14 @@
         <attribute name="Class-Path" value="${manifest.classpath}" />
       </manifest>
     </jar>
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
       <jvmarg value="-ea" />
       <jvmarg value="-Xmx2048m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
       <jvmarg value="-Didea.config.path=${build.mps.config.path}" />
       <jvmarg value="-Didea.system.path=${build.mps.system.path}" />
-      <jvmarg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+      <jvmarg value="-Djna.boot.library.path=${build.jna.library.path}" />
       <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
index a73425d4cf56..8373ce4b1917 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
@@ -2,102 +2,102 @@
 <debug-info version="2">
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/141865155246494254">
     <file name="mpsDataFlow.xml">
-      <unit id="141865155246494254" at="1,0,935,10" name="jetbrains.mps.ide.build.tests.mpsDataFlow" />
+      <unit id="141865155246494254" at="1,0,936,10" name="jetbrains.mps.ide.build.tests.mpsDataFlow" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/1889888958307906528">
     <file name="mpsKotlin.xml">
-      <unit id="1889888958307906528" at="1,0,519,10" name="jetbrains.mps.ide.build.tests.mpsKotlin" />
+      <unit id="1889888958307906528" at="1,0,520,10" name="jetbrains.mps.ide.build.tests.mpsKotlin" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2085316548396374793">
     <file name="mpsImplementationStripping.xml">
-      <unit id="2085316548396374793" at="1,0,942,10" name="jetbrains.mps.ide.build.tests.mpsImplementationStripping" />
+      <unit id="2085316548396374793" at="1,0,943,10" name="jetbrains.mps.ide.build.tests.mpsImplementationStripping" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2201735946498405745">
     <file name="mpsTypesystem.xml">
-      <unit id="2201735946498405745" at="1,0,1956,10" name="jetbrains.mps.ide.build.tests.mpsTypesystem" />
+      <unit id="2201735946498405745" at="1,0,1957,10" name="jetbrains.mps.ide.build.tests.mpsTypesystem" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2883693069523015134">
     <file name="mpsConstraints.xml">
-      <unit id="2883693069523015134" at="1,0,1131,10" name="jetbrains.mps.ide.build.tests.mpsConstraints" />
+      <unit id="2883693069523015134" at="1,0,1132,10" name="jetbrains.mps.ide.build.tests.mpsConstraints" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3071492597344792659">
     <file name="mpsFeedback.xml">
-      <unit id="3071492597344792659" at="1,0,730,10" name="jetbrains.mps.ide.build.tests.mpsFeedback" />
+      <unit id="3071492597344792659" at="1,0,731,10" name="jetbrains.mps.ide.build.tests.mpsFeedback" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3197190366568000187">
     <file name="mpsBuild.xml">
-      <unit id="3197190366568000187" at="1,0,656,10" name="jetbrains.mps.ide.build.tests.mpsBuild" />
+      <unit id="3197190366568000187" at="1,0,657,10" name="jetbrains.mps.ide.build.tests.mpsBuild" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3474133302908391407">
     <file name="mpsExecution.xml">
-      <unit id="3474133302908391407" at="1,0,1213,10" name="jetbrains.mps.ide.build.tests.mpsExecution" />
+      <unit id="3474133302908391407" at="1,0,1214,10" name="jetbrains.mps.ide.build.tests.mpsExecution" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3856853424911912638">
     <file name="mpsEditorImageGen.xml">
-      <unit id="3856853424911912638" at="1,0,817,10" name="jetbrains.mps.ide.build.tests.mpsEditorImageGen" />
+      <unit id="3856853424911912638" at="1,0,818,10" name="jetbrains.mps.ide.build.tests.mpsEditorImageGen" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4074183641147971049">
     <file name="mpsSModel.xml">
-      <unit id="4074183641147971049" at="1,0,1022,10" name="jetbrains.mps.ide.build.tests.mpsSModel" />
+      <unit id="4074183641147971049" at="1,0,1023,10" name="jetbrains.mps.ide.build.tests.mpsSModel" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4286050570470716727">
     <file name="mpsText.xml">
-      <unit id="4286050570470716727" at="1,0,521,10" name="jetbrains.mps.ide.build.tests.mpsText" />
+      <unit id="4286050570470716727" at="1,0,522,10" name="jetbrains.mps.ide.build.tests.mpsText" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5003005296035786909">
     <file name="mpsEditorDiagram.xml">
-      <unit id="5003005296035786909" at="1,0,904,10" name="jetbrains.mps.ide.build.tests.mpsEditorDiagram" />
+      <unit id="5003005296035786909" at="1,0,905,10" name="jetbrains.mps.ide.build.tests.mpsEditorDiagram" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5332690376493680136">
     <file name="mpsSmartRefAttrMigration.xml">
-      <unit id="5332690376493680136" at="1,0,495,10" name="jetbrains.mps.ide.build.tests.mpsSmartRefAttrMigration" />
+      <unit id="5332690376493680136" at="1,0,496,10" name="jetbrains.mps.ide.build.tests.mpsSmartRefAttrMigration" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5624877018229105292">
     <file name="mpsEditorTransformationMenu.xml">
-      <unit id="5624877018229105292" at="1,0,3280,10" name="jetbrains.mps.ide.build.tests.mpsEditorTransformationMenu" />
+      <unit id="5624877018229105292" at="1,0,3281,10" name="jetbrains.mps.ide.build.tests.mpsEditorTransformationMenu" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5833628797344916224">
     <file name="mpsEditor.xml">
-      <unit id="5833628797344916224" at="1,0,3420,10" name="jetbrains.mps.ide.build.tests.mpsEditor" />
+      <unit id="5833628797344916224" at="1,0,3421,10" name="jetbrains.mps.ide.build.tests.mpsEditor" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5973657458022229901">
     <file name="mpsPackaged.xml">
-      <unit id="5973657458022229901" at="1,0,731,10" name="jetbrains.mps.ide.build.tests.mpsPackaged" />
+      <unit id="5973657458022229901" at="1,0,732,10" name="jetbrains.mps.ide.build.tests.mpsPackaged" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6147098677962246363">
     <file name="mpsHttpSupport.xml">
-      <unit id="6147098677962246363" at="1,0,571,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
+      <unit id="6147098677962246363" at="1,0,572,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353312053">
     <file name="mpsGenerator.xml">
-      <unit id="617882099353312053" at="1,0,3304,10" name="jetbrains.mps.ide.build.tests.mpsGenerator" />
+      <unit id="617882099353312053" at="1,0,3305,10" name="jetbrains.mps.ide.build.tests.mpsGenerator" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353331886">
     <file name="mpsJava.xml">
-      <unit id="617882099353331886" at="1,0,596,10" name="jetbrains.mps.ide.build.tests.mpsJava" />
+      <unit id="617882099353331886" at="1,0,597,10" name="jetbrains.mps.ide.build.tests.mpsJava" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6238501899265293051">
     <file name="mpsActions.xml">
-      <unit id="6238501899265293051" at="1,0,497,10" name="jetbrains.mps.ide.build.tests.mpsActions" />
+      <unit id="6238501899265293051" at="1,0,498,10" name="jetbrains.mps.ide.build.tests.mpsActions" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6390717532282583654">
@@ -107,27 +107,27 @@
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7210153263370654627">
     <file name="mpsBaseLanguage.xml">
-      <unit id="7210153263370654627" at="1,0,1986,10" name="jetbrains.mps.ide.build.tests.mpsBaseLanguage" />
+      <unit id="7210153263370654627" at="1,0,1987,10" name="jetbrains.mps.ide.build.tests.mpsBaseLanguage" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7438002853058266164">
     <file name="mpsBehavior.xml">
-      <unit id="7438002853058266164" at="1,0,1469,10" name="jetbrains.mps.ide.build.tests.mpsBehavior" />
+      <unit id="7438002853058266164" at="1,0,1470,10" name="jetbrains.mps.ide.build.tests.mpsBehavior" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7763823021514561033">
     <file name="mpsTest.xml">
-      <unit id="7763823021514561033" at="1,0,478,10" name="jetbrains.mps.ide.build.tests.mpsTest" />
+      <unit id="7763823021514561033" at="1,0,479,10" name="jetbrains.mps.ide.build.tests.mpsTest" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/9064011936883918541">
     <file name="mpsToolTests.xml">
-      <unit id="9064011936883918541" at="1,0,652,10" name="jetbrains.mps.ide.build.tests.mpsToolTests" />
+      <unit id="9064011936883918541" at="1,0,653,10" name="jetbrains.mps.ide.build.tests.mpsToolTests" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/9219004022556570565">
     <file name="mpsConsole.xml">
-      <unit id="9219004022556570565" at="1,0,580,10" name="jetbrains.mps.ide.build.tests.mpsConsole" />
+      <unit id="9219004022556570565" at="1,0,581,10" name="jetbrains.mps.ide.build.tests.mpsConsole" />
     </file>
   </root>
 </debug-info>