Cleaned up .gitignore. Added logic to include Prerelease if it is set. Added validation for FunctionsToExport. Change @Class variables to targetClass.

MiYanni · MiYanni · commit c580c815ddeb · 2018-04-19T14:38:27.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -222,15 +222,10 @@ groupMapping*.json
 *.wixpdb
 
 .vscode/
-/tools/AutomationTestFramework/RunBooks
-/tools/AutomationTestFramework/TestHelpers/TestHelpers.zip
+/tools/AutomationTestFramework/Runbooks
 Results
 Package
 .DS_Store
 .idea
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Logger/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/bin
-/tools/NetCorePsd1Sync/NetCorePsd1Sync/Properties/launchSettings.json
+/src/ResourceManager/RecoveryServices.Backup/**/bin
+launchSettings.json
diff --git a/tools/NetCorePsd1Sync/NetCorePsd1Sync/NetCoreDefinitionGenerator.cs b/tools/NetCorePsd1Sync/NetCorePsd1Sync/NetCoreDefinitionGenerator.cs
@@ -109,7 +109,8 @@ public static PsDefinition CreateNetCoreDefinition(Hashtable desktopData)
                     Tags = desktopPsData.GetValueAsStringList("Tags"),
                     LicenseUri = new Uri(desktopPsData.GetValueAsString("LicenseUri")),
                     ProjectUri = new Uri(desktopPsData.GetValueAsString("ProjectUri")),
-                    ReleaseNotes = String.Empty
+                    ReleaseNotes = String.Empty,
+                    Prerelease = desktopPsData.ContainsKey("Prerelease") ? desktopPsData.GetValueAsString("Prerelease") : null
                 };
             }
 
diff --git a/tools/NetCorePsd1Sync/NetCorePsd1Sync/Program.cs b/tools/NetCorePsd1Sync/NetCorePsd1Sync/Program.cs
@@ -57,7 +57,8 @@ private static void ValidateDefinitionFiles(string rmPath)
 
                 var oldCmdletList = desktopHashtable.GetValueAsStringList("CmdletsToExport");
                 var oldAliasesList = desktopHashtable.GetValueAsStringList("AliasesToExport");
-                if (!File.Exists(netCorePath) || !(oldCmdletList.Any() || oldAliasesList.Any()))
+                var oldFunctionsList = desktopHashtable.GetValueAsStringList("FunctionsToExport");
+                if (!File.Exists(netCorePath) || !(oldCmdletList.Any() || oldAliasesList.Any() || oldFunctionsList.Any()))
                 {
                     var priorColor = Console.ForegroundColor;
                     Console.ForegroundColor = ConsoleColor.Yellow;
@@ -75,12 +76,14 @@ private static void ValidateDefinitionFiles(string rmPath)
 
                 var newCmdletList = netCoreHashtable.GetValueAsStringList("CmdletsToExport");
                 var newAliasesList = netCoreHashtable.GetValueAsStringList("AliasesToExport");
+                var newFunctionsList = netCoreHashtable.GetValueAsStringList("FunctionsToExport");
 
                 var missingCmdlets = oldCmdletList.Where(oc => !newCmdletList.Contains(oc)).ToList();
                 var missingAliases = oldAliasesList.Where(oa => !newAliasesList.Contains(oa)).ToList();
+                var missingFunctions = oldFunctionsList.Where(of => !newFunctionsList.Contains(of)).ToList();
 
                 // ReSharper disable once InvertIf
-                if (missingCmdlets.Any() || missingAliases.Any())
+                if (missingCmdlets.Any() || missingAliases.Any() || missingFunctions.Any())
                 {
                     var priorColor = Console.ForegroundColor;
                     Console.ForegroundColor = ConsoleColor.Red;
@@ -92,6 +95,10 @@ private static void ValidateDefinitionFiles(string rmPath)
                     {
                         Console.WriteLine($"Missing aliases: {String.Join(", ", missingAliases)} : {netCoreFileName}");
                     }
+                    if (missingFunctions.Any())
+                    {
+                        Console.WriteLine($"Missing functions: {String.Join(", ", missingFunctions)} : {netCoreFileName}");
+                    }
                     Console.ForegroundColor = priorColor;
                     Environment.ExitCode = 1;
                 }
diff --git a/tools/NetCorePsd1Sync/NetCorePsd1Sync/Utility/StringExtensions.cs b/tools/NetCorePsd1Sync/NetCorePsd1Sync/Utility/StringExtensions.cs
@@ -32,39 +32,39 @@ private static bool GetDescription<TClass, TProp>(Expression<Func<TClass, TProp>
             return hasDescription;
         }
 
-        private static (TProp value, string firstLeader) GetValue<TClass, TProp>(TClass @class, Expression<Func<TClass, TProp>> propertySelector)
+        private static (TProp value, string firstLeader) GetValue<TClass, TProp>(TClass targetClass, Expression<Func<TClass, TProp>> propertySelector)
         {
-            var value = propertySelector.Compile()(@class);
+            var value = propertySelector.Compile()(targetClass);
             // https://stackoverflow.com/a/7580347/294804
             var firstLeader = value != null ? String.Empty : CommentPrefix;
             var hasDisplayName = TryGetPropertyAttributeValue<TClass, TProp, DisplayNameAttribute, string>(propertySelector, attr => attr.DisplayName, out var displayName);
             return (value, $"{firstLeader}{(hasDisplayName ? $"{displayName}{NameValueDelimiter}" : String.Empty)}");
         }
 
         // https://blogs.msdn.microsoft.com/csharpfaq/2010/03/11/how-can-i-get-objects-and-property-values-from-expression-trees/
-        public static IEnumerable<string> ToDefinitionEntry<TClass, TProp>(this TClass @class, Expression<Func<TClass, TProp>> propertySelector)
+        public static IEnumerable<string> ToDefinitionEntry<TClass, TProp>(this TClass targetClass, Expression<Func<TClass, TProp>> propertySelector)
         {
             if (GetDescription(propertySelector, out var description)) yield return description;
-            (var value, var firstLeader) = GetValue(@class, propertySelector);
+            (var value, var firstLeader) = GetValue(targetClass, propertySelector);
             yield return $"{firstLeader}{CreateValue(value, ElementPrefix, ElementPostfix)}";
             yield return String.Empty;
         }
 
         private static string CreateValue<TProp>(TProp value, string valuePrefix, string valuePostfix) =>
             $"{valuePrefix}{(value == null ? String.Empty : value.ToString())}{valuePostfix}";
 
-        public static IEnumerable<string> ToDefinitionEntry<TClass>(this TClass @class, Expression<Func<TClass, bool?>> propertySelector)
+        public static IEnumerable<string> ToDefinitionEntry<TClass>(this TClass targetClass, Expression<Func<TClass, bool?>> propertySelector)
         {
             if (GetDescription(propertySelector, out var description)) yield return description;
-            (var value, var firstLeader) = GetValue(@class, propertySelector);
+            (var value, var firstLeader) = GetValue(targetClass, propertySelector);
             var boolValue = value != null && value.Value;
             yield return $"{firstLeader}{(boolValue ? "$true" : "$false")}";
             yield return String.Empty;
         }
 
-        public static IEnumerable<string> ToDefinitionEntry<TClass>(this TClass @class, Expression<Func<TClass, PsDefinitionHeader>> propertySelector)
+        public static IEnumerable<string> ToDefinitionEntry<TClass>(this TClass targetClass, Expression<Func<TClass, PsDefinitionHeader>> propertySelector)
         {
-            (var header, var _) = GetValue(@class, propertySelector);
+            (var header, var _) = GetValue(targetClass, propertySelector);
             if (header == null) yield break;
 
             foreach (var headerLine in header.ToDefinitionEntry())
@@ -88,10 +88,10 @@ public static IEnumerable<string> ToDefinitionEntry(this PsDefinition psDefiniti
             yield return String.Empty;
         }
 
-        public static IEnumerable<string> ToDefinitionEntry<TClass, TList>(this TClass @class, Expression<Func<TClass, List<TList>>> propertySelector)
+        public static IEnumerable<string> ToDefinitionEntry<TClass, TList>(this TClass targetClass, Expression<Func<TClass, List<TList>>> propertySelector)
         {
             if (GetDescription(propertySelector, out var description)) yield return description;
-            (var values, var firstLeader) = GetValue(@class, propertySelector);
+            (var values, var firstLeader) = GetValue(targetClass, propertySelector);
 
             var isStringList = typeof(TList) == typeof(string);
             var listPrefix = isStringList ? String.Empty : ObjectListPrefix;

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,8 @@ public static PsDefinition CreateNetCoreDefinition(Hashtable desktopData)`
`109`	`109`	`Tags = desktopPsData.GetValueAsStringList("Tags"),`
`110`	`110`	`LicenseUri = new Uri(desktopPsData.GetValueAsString("LicenseUri")),`
`111`	`111`	`ProjectUri = new Uri(desktopPsData.GetValueAsString("ProjectUri")),`
`112`		`- ReleaseNotes = String.Empty`
	`112`	`+ ReleaseNotes = String.Empty,`
	`113`	`+ Prerelease = desktopPsData.ContainsKey("Prerelease") ? desktopPsData.GetValueAsString("Prerelease") : null`
`113`	`114`	`};`
`114`	`115`	`}`
`115`	`116`
Original file line number	Diff line number	Diff line change
`@@ -32,39 +32,39 @@ private static bool GetDescription<TClass, TProp>(Expression<Func<TClass, TProp>`
`32`	`32`	`return hasDescription;`
`33`	`33`	`}`
`34`	`34`
`35`		`- private static (TProp value, string firstLeader) GetValue<TClass, TProp>(TClass @class, Expression<Func<TClass, TProp>> propertySelector)`
	`35`	`+ private static (TProp value, string firstLeader) GetValue<TClass, TProp>(TClass targetClass, Expression<Func<TClass, TProp>> propertySelector)`
`36`	`36`	`{`
`37`		`- var value = propertySelector.Compile()(@class);`
	`37`	`+ var value = propertySelector.Compile()(targetClass);`
`38`	`38`	`// https://stackoverflow.com/a/7580347/294804`
`39`	`39`	`var firstLeader = value != null ? String.Empty : CommentPrefix;`
`40`	`40`	`var hasDisplayName = TryGetPropertyAttributeValue<TClass, TProp, DisplayNameAttribute, string>(propertySelector, attr => attr.DisplayName, out var displayName);`
`41`	`41`	`return (value, $"{firstLeader}{(hasDisplayName ? $"{displayName}{NameValueDelimiter}" : String.Empty)}");`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// https://blogs.msdn.microsoft.com/csharpfaq/2010/03/11/how-can-i-get-objects-and-property-values-from-expression-trees/`
`45`		`- public static IEnumerable<string> ToDefinitionEntry<TClass, TProp>(this TClass @class, Expression<Func<TClass, TProp>> propertySelector)`
	`45`	`+ public static IEnumerable<string> ToDefinitionEntry<TClass, TProp>(this TClass targetClass, Expression<Func<TClass, TProp>> propertySelector)`
`46`	`46`	`{`
`47`	`47`	`if (GetDescription(propertySelector, out var description)) yield return description;`
`48`		`- (var value, var firstLeader) = GetValue(@class, propertySelector);`
	`48`	`+ (var value, var firstLeader) = GetValue(targetClass, propertySelector);`
`49`	`49`	`yield return $"{firstLeader}{CreateValue(value, ElementPrefix, ElementPostfix)}";`
`50`	`50`	`yield return String.Empty;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private static string CreateValue<TProp>(TProp value, string valuePrefix, string valuePostfix) =>`
`54`	`54`	`$"{valuePrefix}{(value == null ? String.Empty : value.ToString())}{valuePostfix}";`
`55`	`55`
`56`		`- public static IEnumerable<string> ToDefinitionEntry<TClass>(this TClass @class, Expression<Func<TClass, bool?>> propertySelector)`
	`56`	`+ public static IEnumerable<string> ToDefinitionEntry<TClass>(this TClass targetClass, Expression<Func<TClass, bool?>> propertySelector)`
`57`	`57`	`{`
`58`	`58`	`if (GetDescription(propertySelector, out var description)) yield return description;`
`59`		`- (var value, var firstLeader) = GetValue(@class, propertySelector);`
	`59`	`+ (var value, var firstLeader) = GetValue(targetClass, propertySelector);`
`60`	`60`	`var boolValue = value != null && value.Value;`
`61`	`61`	`yield return $"{firstLeader}{(boolValue ? "$true" : "$false")}";`
`62`	`62`	`yield return String.Empty;`
`63`	`63`	`}`
`64`	`64`
`65`		`- public static IEnumerable<string> ToDefinitionEntry<TClass>(this TClass @class, Expression<Func<TClass, PsDefinitionHeader>> propertySelector)`
	`65`	`+ public static IEnumerable<string> ToDefinitionEntry<TClass>(this TClass targetClass, Expression<Func<TClass, PsDefinitionHeader>> propertySelector)`
`66`	`66`	`{`
`67`		`- (var header, var _) = GetValue(@class, propertySelector);`
	`67`	`+ (var header, var _) = GetValue(targetClass, propertySelector);`
`68`	`68`	`if (header == null) yield break;`
`69`	`69`
`70`	`70`	`foreach (var headerLine in header.ToDefinitionEntry())`
`@@ -88,10 +88,10 @@ public static IEnumerable<string> ToDefinitionEntry(this PsDefinition psDefiniti`
`88`	`88`	`yield return String.Empty;`
`89`	`89`	`}`
`90`	`90`
`91`		`- public static IEnumerable<string> ToDefinitionEntry<TClass, TList>(this TClass @class, Expression<Func<TClass, List<TList>>> propertySelector)`
	`91`	`+ public static IEnumerable<string> ToDefinitionEntry<TClass, TList>(this TClass targetClass, Expression<Func<TClass, List<TList>>> propertySelector)`
`92`	`92`	`{`
`93`	`93`	`if (GetDescription(propertySelector, out var description)) yield return description;`
`94`		`- (var values, var firstLeader) = GetValue(@class, propertySelector);`
	`94`	`+ (var values, var firstLeader) = GetValue(targetClass, propertySelector);`
`95`	`95`
`96`	`96`	`var isStringList = typeof(TList) == typeof(string);`
`97`	`97`	`var listPrefix = isStringList ? String.Empty : ObjectListPrefix;`