WIP: BuildMaster v6 Support

InedoCore/BuildMasterExtension/BuildMasterExtension.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Inedo.Extensions</RootNamespace>
     <AssemblyName>InedoCore</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -30,36 +31,40 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BuildMaster.Web.Controls, Version=5.8.0.4, Culture=neutral, PublicKeyToken=112cfb71329714a6, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.BuildMaster.SDK.5.8.0\lib\net45\BuildMaster.Web.Controls.dll</HintPath>
+    <Reference Include="BuildMaster.Web.Controls, Version=6.0.0.11, Culture=neutral, PublicKeyToken=112cfb71329714a6, processorArchitecture=MSIL">
+      <HintPath>..\packages\Inedo.BuildMaster.SDK.6.0.0\lib\net452\BuildMaster.Web.Controls.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="BuildMasterCore, Version=5.8.0.4, Culture=neutral, PublicKeyToken=112cfb71329714a6, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.BuildMaster.SDK.5.8.0\lib\net45\BuildMasterCore.dll</HintPath>
+    <Reference Include="BuildMasterCore, Version=6.0.0.11, Culture=neutral, PublicKeyToken=112cfb71329714a6, processorArchitecture=MSIL">
+      <HintPath>..\packages\Inedo.BuildMaster.SDK.6.0.0\lib\net452\BuildMasterCore.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Inedo.Agents.Client, Version=503.1.0.0, Culture=neutral, PublicKeyToken=9de986a2f8db80fc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.BuildMaster.SDK.5.8.0\lib\net45\Inedo.Agents.Client.dll</HintPath>
+    <Reference Include="Inedo.Agents.Client, Version=1000.0.0.0, Culture=neutral, PublicKeyToken=9de986a2f8db80fc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Inedo.SDK.1.0.4-pre0017\lib\net452\Inedo.Agents.Client.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Inedo.ExecutionEngine, Version=60.2.0.0, Culture=neutral, PublicKeyToken=68703f0e52007e75, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.BuildMaster.SDK.5.8.0\lib\net45\Inedo.ExecutionEngine.dll</HintPath>
+    <Reference Include="Inedo.ExecutionEngine, Version=64.0.0.0, Culture=neutral, PublicKeyToken=68703f0e52007e75, processorArchitecture=MSIL">
+      <HintPath>..\packages\Inedo.SDK.1.0.4-pre0017\lib\net452\Inedo.ExecutionEngine.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="InedoLib, Version=503.1.0.0, Culture=neutral, PublicKeyToken=112cfb71329714a6, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.BuildMaster.SDK.5.8.0\lib\net45\InedoLib.dll</HintPath>
+    <Reference Include="Inedo.SDK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=29fae5dec3001603, processorArchitecture=MSIL">
+      <HintPath>..\packages\Inedo.SDK.1.0.4-pre0017\lib\net452\Inedo.SDK.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="InedoLib, Version=1000.0.0.0, Culture=neutral, PublicKeyToken=112cfb71329714a6, processorArchitecture=MSIL">
+      <HintPath>..\packages\Inedo.SDK.1.0.4-pre0017\lib\net452\InedoLib.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Inedo.SDK.1.0.4-pre0017\lib\net452\Newtonsoft.Json.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

InedoCore/BuildMasterExtension/Legacy/Actions/Files/ConcatenateFilesAction.cs

@@ -16,7 +16,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.ConcatenateFiles))]
     [DisplayName("Concatenate Files")]
     [Description("Concatenates a collection of text files on disk using an optional separator.")]
-    [CustomEditor(typeof(ConcatenateFilesActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(ConcatenateFilesActionEditor))]
     [Tag(Tags.Files)]
     public sealed class ConcatenateFilesAction : RemoteActionBase
     {

InedoCore/BuildMasterExtension/Legacy/Actions/Files/CopyFilesAction.cs

@@ -17,7 +17,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [DisplayName("Copy Files")]
     [Description("Copies files from one directory to another on the same server.")]
     [Tag(Tags.Files)]
-    [CustomEditor(typeof(CopyFilesActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(CopyFilesActionEditor))]
     public sealed class CopyFilesAction : RemoteActionBase
     {
         private int filesCopied;

InedoCore/BuildMasterExtension/Legacy/Actions/Files/CreateFileAction.cs

@@ -13,7 +13,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.CreateFile))]
     [DisplayName("Create File")]
     [Description("Creates a text file.")]
-    [CustomEditor(typeof(CreateFileActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(CreateFileActionEditor))]
     [RequiresInterface(typeof(IFileOperationsExecuter))]
     [Tag(Tags.Files)]
     public sealed class CreateFileAction : AgentBasedActionBase

InedoCore/BuildMasterExtension/Legacy/Actions/Files/CreateZipFileAction.cs

@@ -10,7 +10,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.CreateZip))]
     [DisplayName("Create Zip File")]
     [Description("Creates a .zip archive of a folder.")]
-    [CustomEditor(typeof(CreateZipFileActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(CreateZipFileActionEditor))]
     [RequiresInterface(typeof(IFileOperationsExecuter))]
     [Tag(Tags.Files)]
     public sealed class CreateZipFileAction : AgentBasedActionBase

InedoCore/BuildMasterExtension/Legacy/Actions/Files/DeleteFilesAction.cs

@@ -13,7 +13,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.DeleteFiles))]
     [DisplayName("Delete Files/Folders")]
     [Description("Deletes files and folders in a directory based on one or more specified file masks.")]
-    [CustomEditor(typeof(DeleteFilesActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(DeleteFilesActionEditor))]
     [RequiresInterface(typeof(IFileOperationsExecuter))]
     [Tag(Tags.Files)]
     public sealed class DeleteFilesAction : AgentBasedActionBase

InedoCore/BuildMasterExtension/Legacy/Actions/Files/RenameFilesAction.cs

@@ -12,7 +12,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.RenameFiles))]
     [DisplayName("Rename Files")]
     [Description("Renames one or more files.")]
-    [CustomEditor(typeof(RenameFilesActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(RenameFilesActionEditor))]
     [Tag(Tags.Files)]
     public sealed class RenameFilesAction : RemoteActionBase
     {

InedoCore/BuildMasterExtension/Legacy/Actions/Files/ReplaceFileAction.cs

@@ -13,7 +13,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.ReplaceText))]
     [DisplayName("Search/Replace File Contents")]
     [Description("Searches a text file for a specified string and replaces it.")]
-    [CustomEditor(typeof(ReplaceFileActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(ReplaceFileActionEditor))]
     [Tag(Tags.Files)]
     public sealed class ReplaceFileAction : RemoteActionBase
     {

InedoCore/BuildMasterExtension/Legacy/Actions/Files/SetFileAttributesAction.cs

@@ -15,7 +15,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.SetAttributes))]
     [DisplayName("Change File Attributes")]
     [Description("Sets or clears the read-only, system, or hidden attributes on one or more files.")]
-    [CustomEditor(typeof(SetFileAttributesActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(SetFileAttributesActionEditor))]
     [Tag(Tags.Files)]
     public sealed class SetFileAttributesAction : RemoteActionBase, IMissingPersistentPropertyHandler
     {

InedoCore/BuildMasterExtension/Legacy/Actions/Files/TransferFilesAction.cs

@@ -17,7 +17,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.TransferFiles))]
     [DisplayName("Transfer/Synchronize Files")]
     [Description("Synchronizes the contents of a source directory with a target directory on the same or different server, similar to rsync or robocopy.")]
-    [CustomEditor(typeof(TransferFilesActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(TransferFilesActionEditor))]
     [Tag(Tags.Files)]
     public sealed class TransferFilesAction : DualAgentBasedActionBase
     {

InedoCore/BuildMasterExtension/Legacy/Actions/Files/UnZipFileAction.cs

@@ -10,7 +10,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.Files
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.Files.ExtractZip))]
     [DisplayName("Unzip File")]
     [Description("Extracts a .zip archive to a directory.")]
-    [CustomEditor(typeof(UnZipFileActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(UnZipFileActionEditor))]
     [RequiresInterface(typeof(IFileOperationsExecuter))]
     [Tag(Tags.Files)]
     public sealed class UnZipFileAction : AgentBasedActionBase

InedoCore/BuildMasterExtension/Legacy/Actions/General/CommandLineAction.cs

@@ -16,7 +16,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.General
     [PersistFrom("Inedo.BuildMaster.Extensibility.Actions.General.CommandLineAction,BuildMasterExtensions")]
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.General.CommandLine))]
     [DisplayName("Execute Command Line"), Description("Runs a process via command line with arguments on the target server.")]
-    [CustomEditor(typeof(CommandLineActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(CommandLineActionEditor))]
     [RequiresInterface(typeof(IFileOperationsExecuter))]
     [RequiresInterface(typeof(IRemoteProcessExecuter))]
     [Tag(Tags.Files)]

InedoCore/BuildMasterExtension/Legacy/Actions/General/SendEmailAction.cs

@@ -16,7 +16,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.General
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.General.SendEmail))]
     [DisplayName("Send Email")]
     [Description("Sends an email message.")]
-    [CustomEditor(typeof(SendEmailActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(SendEmailActionEditor))]
     [Tag(Tags.Email)]
     [Tag(Tags.General)]
     public sealed class SendEmailAction : ActionBase

InedoCore/BuildMasterExtension/Legacy/Actions/General/SleepAction.cs

@@ -9,7 +9,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.General
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.General.Sleep))]
     [DisplayName("Sleep")]
     [Description("Halts the execution for a specified number of seconds.")]
-    [CustomEditor(typeof(SleepActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(SleepActionEditor))]
     [Tag(Tags.General)]
     public sealed class SleepAction : ActionBase
     {

InedoCore/BuildMasterExtension/Legacy/Actions/HTTP/HttpFileUploadAction.cs

@@ -16,7 +16,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.HTTP
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.HTTP.Upload))]
     [DisplayName("Upload File to URL")]
     [Description("Uploads a file to a specified URL using an HTTP POST.")]
-    [CustomEditor(typeof(HttpFileUploadActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(HttpFileUploadActionEditor))]
     [Tag(Tags.Http)]
     [Tag(Tags.Files)]
     public sealed class HttpFileUploadAction : HttpActionBase

InedoCore/BuildMasterExtension/Legacy/Actions/HTTP/HttpGetAction.cs

@@ -11,7 +11,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.HTTP
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.HTTP.Get))]
     [DisplayName("HTTP GET/DELETE/HEAD Request")]
     [Description("Executes an HTTP GET/DELETE/HEAD request against a URL, typically used for RESTful operations.")]
-    [CustomEditor(typeof(HttpGetActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(HttpGetActionEditor))]
     [Tag(Tags.Http)]
     public sealed class HttpGetAction : HttpActionBase
     {

InedoCore/BuildMasterExtension/Legacy/Actions/HTTP/HttpPostAction.cs

@@ -14,7 +14,7 @@ namespace Inedo.BuildMaster.Extensibility.Actions.HTTP
     [ConvertibleToOperation(typeof(Inedo.Extensions.Legacy.ActionImporters.HTTP.Post))]
     [DisplayName("HTTP POST/PUT/PATCH to URL")]
     [Description("Executes an HTTP POST/PUT/PATCH request to a URL, typically used for RESTful operations.")]
-    [CustomEditor(typeof(HttpPostActionEditor))]
+    [Inedo.Web.CustomEditor(typeof(HttpPostActionEditor))]
     [Tag(Tags.Http)]
     public sealed class HttpPostAction : HttpActionBase
     {

InedoCore/BuildMasterExtension/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Inedo.BuildMaster.SDK" version="5.8.0" targetFramework="net45" />
+  <package id="Inedo.BuildMaster.SDK" version="6.0.0" targetFramework="net452" />
+  <package id="Inedo.SDK" version="1.0.4-pre0017" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
 </packages>

InedoCore/Common.BuildMasterOtterProGet/UserDirectories/ADUserDirectory.cs

@@ -5,10 +5,7 @@
 using System.DirectoryServices.ActiveDirectory;
 using System.Linq;
 using System.Text;
-#if BuildMaster
-using Inedo.BuildMaster.Extensibility.Credentials;
-using Inedo.BuildMaster.Extensibility.UserDirectories;
-#elif Hedgehog
+#if BuildMaster || Hedgehog
 using Inedo.Extensibility.Credentials;
 using Inedo.Extensibility.UserDirectories;
 #elif Otter

InedoCore/Common/Configurations/Files/DirectoryConfiguration.cs

@@ -1,15 +1,7 @@
 using System.ComponentModel;
 using Inedo.Documentation;
-#if Otter
-using Inedo.Otter.Extensibility;
-using Inedo.Otter.Extensibility.Configurations;
-#elif BuildMaster
-using Inedo.BuildMaster.Extensibility;
-using Inedo.BuildMaster.Extensibility.Configurations;
-#elif Hedgehog
 using Inedo.Extensibility;
 using Inedo.Extensibility.Configurations;
-#endif
 using Inedo.Serialization;
 
 namespace Inedo.Extensions.Configurations.Files

InedoCore/Common/Configurations/Files/FileConfiguration.cs

@@ -2,16 +2,8 @@
 using System.ComponentModel;
 using System.IO;
 using Inedo.Documentation;
-#if Otter
-using Inedo.Otter.Extensibility;
-using Inedo.Otter.Extensibility.Configurations;
-#elif BuildMaster
-using Inedo.BuildMaster.Extensibility;
-using Inedo.BuildMaster.Extensibility.Configurations;
-#elif Hedgehog
 using Inedo.Extensibility;
 using Inedo.Extensibility.Configurations;
-#endif
 using Inedo.Serialization;
 
 namespace Inedo.Extensions.Configurations.Files

InedoCore/Common/Configurations/Network/HostsEntryConfiguration.cs

@@ -1,14 +1,6 @@
 using System.ComponentModel;
-#if BuildMaster
-using Inedo.BuildMaster.Extensibility;
-using Inedo.BuildMaster.Extensibility.Configurations;
-#elif Otter
-using Inedo.Otter.Extensibility;
-using Inedo.Otter.Extensibility.Configurations;
-#elif Hedgehog
 using Inedo.Extensibility;
 using Inedo.Extensibility.Configurations;
-#endif
 using Inedo.Documentation;
 using Inedo.Serialization;
 

InedoCore/Common/Configurations/ProGet/ProGetPackageConfiguration.cs

@@ -4,17 +4,10 @@
 using Inedo.Extensions.SuggestionProviders;
 using Inedo.Extensions.UniversalPackages;
 using Inedo.Serialization;
-#if BuildMaster
-using Inedo.BuildMaster.Extensibility;
-using Inedo.BuildMaster.Extensibility.Configurations;
-using Inedo.BuildMaster.Extensibility.Credentials;
-using Inedo.BuildMaster.Web.Controls;
-#elif Hedgehog
 using Inedo.Extensibility;
 using Inedo.Extensibility.Configurations;
 using Inedo.Extensibility.Credentials;
-using SuggestibleValueAttribute = Inedo.Web.SuggestableValueAttribute;
-#endif
+using Inedo.Web;
 
 namespace Inedo.Extensions.Configurations.ProGet
 {
@@ -24,9 +17,7 @@ namespace Inedo.Extensions.Configurations.ProGet
 #pragma warning disable CS0618 // Type or member is obsolete
     public sealed class ProGetPackageConfiguration : PersistedConfiguration, IHasCredentials<ProGetCredentials>, IProGetPackageInstallTemplate
 #pragma warning restore CS0618 // Type or member is obsolete
-#if Hedgehog
         , IHasCredentials<InedoProductCredentials>
-#endif
     {
         [Persistent]
         [ScriptAlias("Credentials")]
@@ -37,21 +28,21 @@ public sealed class ProGetPackageConfiguration : PersistedConfiguration, IHasCre
         [Persistent]
         [ScriptAlias("Feed")]
         [DisplayName("Feed name")]
-        [SuggestibleValue(typeof(FeedNameSuggestionProvider))]
+        [SuggestableValue(typeof(FeedNameSuggestionProvider))]
         public string FeedName { get; set; }
 
         [Required]
         [Persistent]
         [ScriptAlias("Name")]
         [DisplayName("Package name")]
-        [SuggestibleValue(typeof(PackageNameSuggestionProvider))]
+        [SuggestableValue(typeof(PackageNameSuggestionProvider))]
         public string PackageName { get; set; }
 
         [Persistent]
         [ScriptAlias("Version")]
         [DisplayName("Package version")]
         [PlaceholderText("latest")]
-        [SuggestibleValue(typeof(PackageVersionSuggestionProvider))]
+        [SuggestableValue(typeof(PackageVersionSuggestionProvider))]
         public string PackageVersion { get; set; }
 
         [Persistent]

InedoCore/Common/Operations/Files/ConcatenateFilesOperation.cs

@@ -8,21 +8,9 @@
 using Inedo.Agents;
 using Inedo.Diagnostics;
 using Inedo.Documentation;
-using Inedo.IO;
-#if BuildMaster
-using Inedo.BuildMaster;
-using Inedo.BuildMaster.Extensibility;
-using Inedo.BuildMaster.Extensibility.Operations;
-#elif Otter
-using Inedo.Otter.Documentation;
-using Inedo.Otter.Extensibility;
-using Inedo.Otter.Extensibility.Operations;
-#elif Hedgehog
 using Inedo.Extensibility;
-using Inedo.Extensibility.Configurations;
-using Inedo.Extensibility.Credentials;
 using Inedo.Extensibility.Operations;
-#endif
+using Inedo.IO;
 
 namespace Inedo.Extensions.Operations.Files
 {
@@ -54,18 +42,10 @@ public sealed class ConcatenateFilesOperation : ExecuteOperation
         public string SourceDirectory { get; set; }
         [ScriptAlias("Include")]
         [PlaceholderText("* (top-level items)")]
-#if Hedgehog
         [MaskingDescription]
-#else
-        [Description(CommonDescriptions.MaskingHelp)]
-#endif
         public IEnumerable<string> Includes { get; set; }
         [ScriptAlias("Exclude")]
-#if Hedgehog
         [MaskingDescription]
-#else
-        [Description(CommonDescriptions.MaskingHelp)]
-#endif
         public IEnumerable<string> Excludes { get; set; }
         [ScriptAlias("Encoding")]
         [DisplayName("Encoding")]