diff options
| author | Jose <pepone@users.noreply.github.com> | 2020-11-18 14:35:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 14:35:45 +0100 |
| commit | 61f46a49e07d422bfb5ca7b32234b9ad1405fa07 (patch) | |
| tree | 27b9db4b875d757dc3b51fa16b72decea248cb9f /scripts/IceBoxUtil.py | |
| parent | Fixed invalid Python 3.9 macro (diff) | |
| download | ice-61f46a49e07d422bfb5ca7b32234b9ad1405fa07.tar.bz2 ice-61f46a49e07d422bfb5ca7b32234b9ad1405fa07.tar.xz ice-61f46a49e07d422bfb5ca7b32234b9ad1405fa07.zip | |
Add .NET 5.0 support (#1154)
Diffstat (limited to 'scripts/IceBoxUtil.py')
| -rw-r--r-- | scripts/IceBoxUtil.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/IceBoxUtil.py b/scripts/IceBoxUtil.py index 91c5d18ac7d..083e5f25e42 100644 --- a/scripts/IceBoxUtil.py +++ b/scripts/IceBoxUtil.py @@ -16,9 +16,8 @@ class IceBox(ProcessFromBinDir, Server): mapping = self.getMapping(current) # - # If running IceBox tests with .NET Core we need to generate a config - # file that use the service for the .NET Framework used to build the - # tests + # If running IceBox tests with non default framweork we need to generate a custom config + # file. # if self.configFile: if isinstance(mapping, CSharpMapping) and (current.config.dotnetcore or current.config.framework): @@ -29,7 +28,10 @@ class IceBox(ProcessFromBinDir, Server): newConfigFile = "{}.{}".format(configFile, framework) with open(newConfigFile, 'w') as target: for line in source.readlines(): - target.write(line.replace("\\net45\\", "\\netstandard2.0\\{0}\\".format(libframework))) + if current.config.framework == "net5.0": + target.write(line.replace("\\net45\\", "\\net5.0\\")) + else: + target.write(line.replace("\\net45\\", "\\netstandard2.0\\{0}\\".format(libframework))) current.files.append(newConfigFile) def getExe(self, current): |