[genproj] Update the generator to handle the net_4_x profile.

diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index 32d6d8574b31add493ef6ccdba2d132f41a86920..6f134efec932ec36a1d5f5432f2e35a8d557963e 100644 (file)
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -104,7 +104,7 @@ class MsbuildGenerator {
        public const string profile_2_0 = "_2_0";
        public const string profile_3_5 = "_3_5";
        public const string profile_4_0 = "_4_0";
-       public const string profile_4_5 = "_4_5";
+       public const string profile_4_x = "_4_x";
 
        static void Usage ()
        {
@@ -663,9 +663,9 @@ class MsbuildGenerator {
                        } else if (response.Contains (profile_4_0)) {
                                fx_version = "4.0";
                                profile = "net_4_0";
-                       } else if (response.Contains (profile_4_5)) {
+                       } else if (response.Contains (profile_4_x)) {
                                fx_version = "4.5";
-                               profile = "net_4_5";
+                               profile = "net_4_x";
                        }
                }
                //
@@ -934,7 +934,7 @@ class MsbuildGenerator {
 
        MsbuildGenerator GetMatchingCsproj (string dllReferenceName, Dictionary<string,MsbuildGenerator> projects, bool explicitPath = false)
        {
-               // libDir would be "./../../class/lib/net_4_5 for example
+               // libDir would be "./../../class/lib/net_4_x for example
                // project 
                if (!dllReferenceName.EndsWith (".dll"))
                        dllReferenceName += ".dll";
@@ -999,7 +999,7 @@ public class Driver {
                        // The next ones are to make debugging easier for now
                        if (profile == "basic")
                                continue;
-                       if (profile != "net_4_5" || library.Contains ("tests"))
+                       if (profile != "net_4_x" || library.Contains ("tests"))
                                continue;
 
                        yield return project;
@@ -1061,7 +1061,7 @@ public class Driver {
                Func<MsbuildGenerator.VsCsproj, bool> additionalFilter;
                additionalFilter = fullSolutions ? (Func<MsbuildGenerator.VsCsproj, bool>)null : IsCommonLibrary;
 
-               FillSolution (four_five_sln_gen, MsbuildGenerator.profile_4_5, projects.Values, additionalFilter);
+               FillSolution (four_five_sln_gen, MsbuildGenerator.profile_4_x, projects.Values, additionalFilter);
 
                var sb = new StringBuilder ();
                sb.AppendLine ("WARNING: Skipped some project references, apparent duplicates in order.xml:");
@@ -1070,7 +1070,7 @@ public class Driver {
                }
                Console.WriteLine (sb.ToString ());
 
-               WriteSolution (four_five_sln_gen, MakeSolutionName (MsbuildGenerator.profile_4_5));
+               WriteSolution (four_five_sln_gen, MakeSolutionName (MsbuildGenerator.profile_4_x));
 
                if (makefileDeps){
                        const string classDirPrefix = "./../../";