Merge branch 'netcore_support' into 'main'

Added proper netcore support for C++/CLI projects. See merge request Sharpmake/sharpmake!483
ubisoft · Dec 15, 2023 · 4f8ad2b · 4f8ad2b
2 parents 0aa2ebf + c0e75d6
commit 4f8ad2b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 19 deletions.
diff --git a/Sharpmake.Generators/VisualStudio/ProjectOptionsGenerator.cs b/Sharpmake.Generators/VisualStudio/ProjectOptionsGenerator.cs
@@ -419,7 +419,8 @@ private void GenerateCompilerOptions(IGenerationContext context, ProjectOptionsG
             Options.Option(Options.Vc.General.CommonLanguageRuntimeSupport.NoClrSupport, () => { context.Options["CLRSupport"] = FileGeneratorUtilities.RemoveLineTag; context.CommandLineOptions["CLRSupport"] = FileGeneratorUtilities.RemoveLineTag; }),
             Options.Option(Options.Vc.General.CommonLanguageRuntimeSupport.ClrSupport, () => { context.Options["CLRSupport"] = "true"; context.CommandLineOptions["CLRSupport"] = "/clr"; }),
             Options.Option(Options.Vc.General.CommonLanguageRuntimeSupport.PureMsilClrSupport, () => { context.Options["CLRSupport"] = "Pure"; context.CommandLineOptions["CLRSupport"] = "/clr:pure"; }),
-            Options.Option(Options.Vc.General.CommonLanguageRuntimeSupport.SafeMsilClrSupport, () => { context.Options["CLRSupport"] = "Safe"; context.CommandLineOptions["CLRSupport"] = "/clr:safe"; })
+            Options.Option(Options.Vc.General.CommonLanguageRuntimeSupport.SafeMsilClrSupport, () => { context.Options["CLRSupport"] = "Safe"; context.CommandLineOptions["CLRSupport"] = "/clr:safe"; }),
+            Options.Option(Options.Vc.General.CommonLanguageRuntimeSupport.ClrNetCoreSupport, () => { context.Options["CLRSupport"] = "NetCore"; context.CommandLineOptions["CLRSupport"] = "/clr:netcore"; })
             );
 
             context.SelectOption

diff --git a/Sharpmake.Generators/VisualStudio/Vcxproj.cs b/Sharpmake.Generators/VisualStudio/Vcxproj.cs
@@ -431,6 +431,17 @@ private void GenerateImpl(GenerationContext context, IList<string> generatedFile
             fileGenerator.Write(Template.Project.PropertyGroupEnd);
             // xml end header
 
+            if (clrSupport && firstConf.FrameworkReferences.Count > 0)
+            {
+                fileGenerator.Write(Template.Project.ItemGroupBegin);
+
+                foreach (var frameworkReference in firstConf.FrameworkReferences)
+                    using (fileGenerator.Declare("include", frameworkReference))
+                        fileGenerator.Write(CSproj.Template.ItemGroups.FrameworkReference);
+
+                fileGenerator.Write(Template.Project.ItemGroupEnd);
+            }
+
             foreach (var platform in context.PresentPlatforms.Values)
                 platform.GeneratePlatformSpecificProjectDescription(context, fileGenerator);
 
@@ -454,20 +465,9 @@ private void GenerateImpl(GenerationContext context, IList<string> generatedFile
                 {
                     context.Configuration = conf;
 
-                    string clrSupportString = FileGeneratorUtilities.RemoveLineTag;
-
-                    if (!conf.IsFastBuild && clrSupport)
-                    {
-                        var dotnetFrameWork = firstConf.Target.GetFragment<DotNetFramework>();
-
-                        // .Net Core requires "NetCore" instead of "true", see: https://docs.microsoft.com/en-us/dotnet/core/porting/cpp-cli
-                        clrSupportString = dotnetFrameWork.IsDotNetCore() ? "NetCore" : clrSupport.ToString().ToLower();
-                    }
-
                     using (fileGenerator.Declare("platformName", Util.GetPlatformString(conf.Platform, conf.Project, conf.Target)))
                     using (fileGenerator.Declare("conf", conf))
                     using (fileGenerator.Declare("options", context.ProjectConfigurationOptions[conf]))
-                    using (fileGenerator.Declare("clrSupport", clrSupportString))
                     {
                         var platformVcxproj = context.PresentPlatforms[conf.Platform];
                         platformVcxproj.GenerateProjectConfigurationGeneral(context, fileGenerator);
@@ -622,7 +622,6 @@ private void GenerateImpl(GenerationContext context, IList<string> generatedFile
                         using (fileGenerator.Declare("project", conf.Project))
                         using (fileGenerator.Declare("target", conf.Target))
                         using (fileGenerator.Declare("options", context.ProjectConfigurationOptions[conf]))
-                        using (fileGenerator.Declare("clrSupport", !clrSupport ? FileGeneratorUtilities.RemoveLineTag : clrSupport.ToString().ToLower()))
                         using (fileGenerator.Declare("compileAsManaged", compileAsManagedString))
                         {
                             fileGenerator.Write(Template.Project.ProjectConfigurationBeginItemDefinition);

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs
@@ -175,7 +175,6 @@ public abstract partial class BasePlatform
     <TranslateIncludes>[options.TranslateIncludes]</TranslateIncludes>
     <CharacterSet>[options.CharacterSet]</CharacterSet>
     <UseOfMfc>[options.UseOfMfc]</UseOfMfc>
-    <CLRSupport>[clrSupport]</CLRSupport>
     <WholeProgramOptimization>[options.WholeProgramOptimization]</WholeProgramOptimization>
     <PlatformToolset>[options.PlatformToolset]</PlatformToolset>
     <TrackFileAccess>[options.TrackFileAccess]</TrackFileAccess>

diff --git a/Sharpmake/Options.Vc.cs b/Sharpmake/Options.Vc.cs
@@ -419,7 +419,15 @@ public enum CommonLanguageRuntimeSupport
                     SafeMsilClrSupport,  // clr:safe
 
                     [Obsolete("This option is not supported by msvc anymore.", true)]
-                    SafeMsilClrSupportOldSyntax  // clr:oldSyntax
+                    SafeMsilClrSupportOldSyntax,  // clr:oldSyntax
+
+                    /// <summary>
+                    /// Common Language RunTime Support for .NET Core
+                    /// </summary>
+                    /// <remarks>
+                    /// Creates metadata and code for the component using the latest cross-platform .NET framework, also known as .NET Core. The metadata can be consumed by other .NET Core applications. And, the option enables the component to consume types and data in the metadata of other .NET Core components.
+                    /// </remarks>
+                    ClrNetCoreSupport // clr:netcore
                 }
 
                 public enum MfcSupport

diff --git a/samples/CPPCLI/projects.sharpmake.cs b/samples/CPPCLI/projects.sharpmake.cs
@@ -112,6 +112,8 @@ public override void ConfigureAll(Configuration conf, Target target)
 
             // Force RTTI to be enabled
             conf.Options.Add(Sharpmake.Options.Vc.Compiler.RTTI.Enable);
+
+            conf.Options.Add(Sharpmake.Options.Vc.General.CommonLanguageRuntimeSupport.ClrSupport);
         }
     }
 

diff --git a/samples/CPPCLI/reference/projects/clrcppproj.vs2017.v4_6_2.vcxproj b/samples/CPPCLI/reference/projects/clrcppproj.vs2017.v4_6_2.vcxproj
@@ -26,17 +26,17 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
+    <CLRSupport>true</CLRSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
+    <CLRSupport>true</CLRSupport>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/samples/CPPCLI/reference/projects/clrcppproj.vs2019.v4_7_2.vcxproj b/samples/CPPCLI/reference/projects/clrcppproj.vs2019.v4_7_2.vcxproj
@@ -26,17 +26,17 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v142</PlatformToolset>
+    <CLRSupport>true</CLRSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v142</PlatformToolset>
+    <CLRSupport>true</CLRSupport>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-Original file line number
+Diff line change
@@ Expand Up @@
                 // Force RTTI to be enabled
                 conf.Options.Add(Sharpmake.Options.Vc.Compiler.RTTI.Enable);
+                conf.Options.Add(Sharpmake.Options.Vc.General.CommonLanguageRuntimeSupport.ClrSupport);
             }
         }
@@ Expand Down @@