adapt template & tests

Author: SpaceIm

conans/assets/templates/new_v2_msbuild.py

@@ -61,10 +61,6 @@
     <RootNamespace>{{name}}</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <ImportGroup Label="PropertySheets">
-      <Import Project="conan\\conantoolchain.props" />
-      {{dependencies}}
-  </ImportGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>{{type}}</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -399,14 +395,12 @@ def test(self):
 
 
 def get_msbuild_lib_files(name, version, package_name="Pkg"):
-    d = {"name": name, "version": version, "pkg_name": package_name, "type": "StaticLibrary",
-         "dependencies": ""}
+    d = {"name": name, "version": version, "pkg_name": package_name, "type": "StaticLibrary"}
     sln = Template(sln_file, keep_trailing_newline=True).render(d)
     vcp = Template(vcxproj, keep_trailing_newline=True).render(d)
     conanfile = Template(conanfile_sources_v2, keep_trailing_newline=True).render(d)
     test_d = {"name": "test_" + name, "version": version, "pkg_name": package_name,
-              "type": "Application",
-              "dependencies": '<Import Project="conan\\conandeps.props" />'}
+              "type": "Application"}
     test_sln = Template(sln_file, keep_trailing_newline=True).render(test_d)
     test_vcp = Template(vcxproj, keep_trailing_newline=True).render(test_d)
     test_conanfile = Template(test_conanfile_v2, keep_trailing_newline=True).render(test_d)
@@ -496,8 +490,7 @@ def test(self):
 
 
 def get_msbuild_exe_files(name, version, package_name="Pkg"):
-    d = {"name": name, "version": version, "pkg_name": package_name, "type": "Application",
-         "dependencies": ""}
+    d = {"name": name, "version": version, "pkg_name": package_name, "type": "Application"}
     sln = Template(sln_file, keep_trailing_newline=True).render(d)
     vcp = Template(vcxproj, keep_trailing_newline=True).render(d)
     conanfile = Template(conanfile_exe, keep_trailing_newline=True).render(d)

conans/test/functional/toolchains/microsoft/test_msbuild.py

@@ -132,12 +132,6 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <!-- Very IMPORTANT this should go BEFORE the Microsoft.Cpp.props.
-  If it goes after, the Toolset definition is ignored -->
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\conan\conan_hello.props" />
-    <Import Project="..\conan\conantoolchain.props" />
-  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -581,9 +575,13 @@ def test_toolchain_win_multi(self):
                 configuration = build_type
 
             # The "conan build" command is not good enough, cannot do the switch between configs
+            props_paths = ";".join([
+                os.path.join(client.current_folder, "conan", "conantoolchain.props"),
+                os.path.join(client.current_folder, "conan", "conandeps.props"),
+            ])
             cmd = ('set "VSCMD_START_DIR=%%CD%%" && '
-                   '"%s" x64 && msbuild "MyProject.sln" /p:Configuration=%s '
-                   '/p:Platform=%s ' % (vcvars_path, configuration, platform_arch))
+                   f'"{vcvars_path}" x64 && msbuild "MyProject.sln" /p:Configuration={configuration} '
+                   f'/p:Platform={platform_arch} /p:ForceImportBeforeCppTargets="{props_paths}"')
             client.run_command(cmd)
             self.assertIn("Visual Studio {ide_year}".format(ide_year=self.ide_year), client.out)
             self.assertIn("[vcvarsall.bat] Environment initialized for: 'x64'", client.out)

conans/test/functional/toolchains/microsoft/test_msbuilddeps.py

@@ -115,9 +115,6 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\conan_Hello3.props" />
-  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
     Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
@@ -286,9 +283,6 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\conan_Hello1.props" />
-  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
     Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
@@ -583,11 +577,9 @@ def build(self):
         myapp_cpp = gen_function_cpp(name="main", msg="MyApp")
         myproject_cpp = gen_function_cpp(name="main", msg="MyProject")
         files = {"MyProject.sln": sln_file,
-                 "MyProject/MyProject.vcxproj": myproject_vcxproj.replace("conan_Hello3.props",
-                                                                          "conandeps.props"),
+                 "MyProject/MyProject.vcxproj": myproject_vcxproj,
                  "MyProject/MyProject.cpp": myproject_cpp,
-                 "MyApp/MyApp.vcxproj": myapp_vcxproj.replace("conan_Hello1.props",
-                                                              "conandeps.props"),
+                 "MyApp/MyApp.vcxproj": myapp_vcxproj,
                  "MyApp/MyApp.cpp": myapp_cpp,
                  "conanfile.py": conanfile}
 
@@ -772,10 +764,6 @@ def build(self):
     main_cpp = gen_function_cpp(name="main", includes=["hello"], calls=["hello"])
     files["MyProject/main.cpp"] = main_cpp
     files["conanfile.py"] = consumer
-    props = os.path.join(client.current_folder, "conandeps.props")
-    old = r'<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />'
-    new = old + '<Import Project="{props}" />'.format(props=props)
-    files["MyProject/MyProject.vcxproj"] = files["MyProject/MyProject.vcxproj"].replace(old, new)
     client.save(files, clean_first=True)
     client.run('install . -s compiler="Visual Studio"'
                ' -s compiler.version={vs_version}'.format(vs_version=vs_version))
@@ -828,10 +816,6 @@ def build(self):
     main_cpp = gen_function_cpp(name="main", includes=["mydep_pkg_team"], calls=["mydep_pkg_team"])
     files["MyProject/main.cpp"] = main_cpp
     files["conanfile.py"] = consumer
-    props = os.path.join(client.current_folder, "conandeps.props")
-    old = r'<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />'
-    new = old + '<Import Project="{props}" />'.format(props=props)
-    files["MyProject/MyProject.vcxproj"] = files["MyProject/MyProject.vcxproj"].replace(old, new)
     client.save(files, clean_first=True)
     client.run('install .  -s compiler.version={vs_version}'.format(vs_version=vs_version))
     client.run("build .")
@@ -915,10 +899,6 @@ def build(self):
 
           <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
-          <ImportGroup Label="PropertySheets">
-            <Import Project="..\conandeps.props" />
-          </ImportGroup>
-
           <PropertyGroup Label="UserMacros" />
 
             <ItemGroup>

conans/test/functional/toolchains/microsoft/test_msbuilddeps_components.py

@@ -153,16 +153,9 @@ def package_info(self):
                                                     'requires="chat/1.0"\n'
                                                     '    generators = "MSBuildDeps"\n'
                                                     '    settings = ')
-    vcproj = client.load("greet.vcxproj")
-    vcproj2 = vcproj.replace(r'<Import Project="conan\\conantoolchain.props" />',
-                             r"""<Import Project="conan\\conantoolchain.props" />
-                               <Import Project="conan\\conandeps.props" />
-                             """)
-    assert vcproj2 != vcproj
     client.save({"conanfile.py": conanfile,
                  "src/greet.cpp": gen_function_cpp(name="main", includes=["chat"],
-                                                   calls=["chat"]),
-                 "greet.vcxproj": vcproj2})
+                                                   calls=["chat"])})
     client.run("create .")
     assert "main: Release!" in client.out
     assert "core/1.0: Hello World Release!" in client.out

conans/test/functional/toolchains/microsoft/test_msbuildtoolchain.py

@@ -1,22 +1,11 @@
 import platform
 import sys
 import textwrap
-import os
 
 import pytest
-try:
-    from unittest.mock import MagicMock
-except:
-    from mock import MagicMock
 
-from conan.tools.files import replace_in_file
 from conans.test.utils.tools import TestClient
 
-toolchain_props = """
-  <ImportGroup Label="PropertySheets">
-      <Import Project="conan\\conantoolchain_release_x64.props" />
-"""
-
 
 @pytest.mark.skipif(sys.version_info.major == 2, reason="Meson not supported in Py2")
 @pytest.mark.skipif(platform.system() not in ["Windows"], reason="Requires Windows")
@@ -42,9 +31,6 @@ def test_msbuildtoolchain_props_with_extra_flags():
     client.save({
         "myprofile": profile
     })
-    # Let's import manually the created conantoolchain_release_x64.props
-    replace_in_file(MagicMock(), os.path.join(client.current_folder, "hello.vcxproj"),
-                    r'  <ImportGroup Label="PropertySheets">', toolchain_props)
     client.run("create . -pr myprofile -tf None")
     assert "/analyze:quiet /doc src/hello.cpp" in client.out
     assert r"/VERBOSE:UNUSEDLIBS /PDB:mypdbfile x64\Release\hello.obj" in client.out