diff options
| author | Jose <jose@zeroc.com> | 2017-12-13 21:47:41 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-12-13 21:47:41 +0100 |
| commit | b633b4744135ec0e2e533b82e4aa718f12334183 (patch) | |
| tree | 89ba2cb87094e69e39e2d8f6aac2e1f1f86e5628 /scripts/IceGridUtil.py | |
| parent | Only build and run .Net Core when the SDK is installed (diff) | |
| download | ice-b633b4744135ec0e2e533b82e4aa718f12334183.tar.bz2 ice-b633b4744135ec0e2e533b82e4aa718f12334183.tar.xz ice-b633b4744135ec0e2e533b82e4aa718f12334183.zip | |
Rework C# project structure
- .NET 4.5 projects go to msbuild\net45
- .NET Standard 2.0 projects go to msbuild\netstandard2.0
- .NET Standard projects can be build for different target
frameworks the default is .NET Core 2.0 but this can be
override setting IceTestsFramworks MSBuild property
Diffstat (limited to 'scripts/IceGridUtil.py')
| -rw-r--r-- | scripts/IceGridUtil.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index ac676439358..02e72c8fce7 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -244,10 +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) - framework = "netcoreapp2.0" if current.config.netcore else "" - self.runadmin(current, "application add -n {0} {1} {2}".format( - self.application.replace(".xml", ".{0}.xml".format(framework)) if framework else 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: |