Revert quote changes for nmake defines (#19859)

* Revert quote changes for nmake defines

* Bump patch

* Fix tests

Author: AbrilRBS

conan/__init__.py

@@ -2,5 +2,5 @@
 from conan.internal.model.workspace import Workspace
 from conan.internal.model.version import Version
 
-__version__ = '2.27.0'
+__version__ = '2.27.1'
 conan_version = Version(__version__)

conan/tools/microsoft/nmakedeps.py

@@ -5,7 +5,7 @@
 from conan.tools.env import Environment
 
 
-def format_defines(defines):
+def format_defines(defines, toolchain=False):
     def is_hex_or_numeric(s):
         try:
             # Check for Hexadecimal (base 16)
@@ -22,7 +22,7 @@ def is_hex_or_numeric(s):
             macro, value = define.split("=", 1)
             if value and not is_hex_or_numeric(value):
                 # value quotes are escaped
-                value = f'\\"{value}\\"'
+                value = f'\\"{value}\\"' if toolchain else f'\"{value}\"'
             define = f"{macro}#{value}"
         formated_defines.append(f'/D"{define}"')
     return formated_defines

conan/tools/microsoft/nmaketoolchain.py

@@ -58,7 +58,7 @@ def _cl(self):
         defines.extend(self.extra_defines)
 
         return (["/nologo"] + self._format_options(bt_flags + rt_flags + cflags + cxxflags) +
-                format_defines(defines))
+                format_defines(defines, toolchain=True))
 
     @property
     def _link(self):

test/integration/toolchains/microsoft/test_nmakedeps.py

@@ -43,9 +43,9 @@ def package_info(self):
     # Checking that defines are added to CL
     for flag in (
         r'/D"TEST_DEFINITION1"', '/D"TEST_DEFINITION2#0"',
-        r'/D"TEST_DEFINITION3#"', r'/D"TEST_DEFINITION4#\"foo\""',
-        r'/D"TEST_DEFINITION5#\"__declspec(dllexport)\""',
-        r'/D"TEST_DEFINITION6#\"foo bar\""',
+        r'/D"TEST_DEFINITION3#"', '/D"TEST_DEFINITION4#"foo""',
+        r'/D"TEST_DEFINITION5#"__declspec(dllexport)""',
+        r'/D"TEST_DEFINITION6#"foo bar""',
         r'/D"TEST_DEFINITION7#7"',
         r'/D"TEST_WINVER#0x0601"'
     ):