Merge remote-tracking branch 'origin/netcore' into 3.7

1 files changed, 6 insertions, 2 deletions

diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py
index 7af2d88383b..02e72c8fce7 100644
--- a/scripts/IceGridUtil.py
+++ b/scripts/IceGridUtil.py
@@ -228,12 +228,13 @@ class IceGridTestCase(TestCase):
             variables = {
                 "test.dir" : self.getPath(),
                 "java.exe" : os.path.join(javaHome, "bin", "java") if javaHome else "java",
+                "dotnet.exe" : platform.getDotnetExe(),
                 "icebox.exe" : IceBox().getCommandLine(current),
                 "icegridnode.exe" : IceGridNode().getCommandLine(current),
                 "glacier2router.exe" : Glacier2Router().getCommandLine(current),
                 "icepatch2server.exe" : IcePatch2Server().getCommandLine(current),
                 "icegridregistry.exe" : IceGridRegistryMaster().getCommandLine(current),
-                "properties-override" : self.icegridnode[0].getPropertiesOverride(current)
+                "properties-override" : self.icegridnode[0].getPropertiesOverride(current),
             }
 
             # Add variables that point to the directories containing the built executables
@@ -243,7 +244,10 @@ class IceGridTestCase(TestCase):
             variables.update(self.variables)
             varStr = " ".join(["{0}={1}".format(k, val(v, True)) for k,v in variables.items()])
             targets = " ".join(self.targets)
-            self.runadmin(current, "application add -n {0} {1} {2}".format(self.application, varStr, targets))
+            application = self.application
+            if current.config.netframework == "netcoreapp2.0":
+                application = application.replace(".xml", ".{0}.xml".format("netcoreapp2.0"))
+            self.runadmin(current, "application add -n {0} {1} {2}".format(application, varStr, targets))
 
     def teardownClientSide(self, current, success):
         if self.application: