Merge pull request #12 from Inedo/1.11

1.11

Subversion/InedoExtension/Credentials/SubversionCredentials.cs → Subversion/InedoExtension/Credentials/SubversionLegacyCredentials.cs

@@ -10,10 +10,11 @@
 namespace Inedo.Extensions.Subversion.Credentials
 {
     [ScriptAlias("Subversion")]
-    [DisplayName("Subversion")]
+    [DisplayName("Subversion (Legacy)")]
     [Description("Credentials for Subversion.")]
     [PersistFrom("Inedo.BuildMasterExtensions.Subversion.Credentials.SubversionCredentials,Subversion")]
-    public sealed class SubversionCredentials : ResourceCredentials
+    [PersistFrom("Inedo.Extensions.Subversion.Credentials.SubversionCredentials,Subversion")]
+    public sealed class SubversionLegacyCredentials : ResourceCredentials
     {
         [Required]
         [Persistent]

Subversion/InedoExtension/ISvnConfiguration.cs

@@ -32,7 +32,7 @@ public static (UsernamePasswordCredentials, SubversionSecureResource) GetCredent
                 resource = (SubversionSecureResource)SecureResource.TryCreate(config.ResourceName, context);
                 if (resource == null)
                 {
-                    var rc = SecureCredentials.TryCreate(config.ResourceName, context) as SubversionCredentials;
+                    var rc = SecureCredentials.TryCreate(config.ResourceName, context) as SubversionLegacyCredentials;
                     resource = (SubversionSecureResource)rc?.ToSecureResource();
                     credentials = (UsernamePasswordCredentials)rc?.ToSecureCredentials();
                 }

Subversion/InedoExtension/InedoExtension.csproj

@@ -1,108 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6BD69568-AA94-449C-AE86-382A4757572B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Inedo.Extensions.Subversion</RootNamespace>
     <AssemblyName>Subversion</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <RootNamespace>Inedo.Extensions.Subversion</RootNamespace>
+    <TargetFrameworks>net50;net452</TargetFrameworks>
+    <OutputType>Library</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Inedo.Agents, Version=46.0.0.0, Culture=neutral, PublicKeyToken=9de986a2f8db80fc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.SDK.1.7.0\lib\net452\Inedo.Agents.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Inedo.Agents.Client, Version=1000.0.0.0, Culture=neutral, PublicKeyToken=9de986a2f8db80fc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.SDK.1.7.0\lib\net452\Inedo.Agents.Client.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Inedo.ExecutionEngine, Version=1000.0.0.0, Culture=neutral, PublicKeyToken=68703f0e52007e75, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.SDK.1.7.0\lib\net452\Inedo.ExecutionEngine.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Inedo.SDK, Version=1.7.0.0, Culture=neutral, PublicKeyToken=29fae5dec3001603, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.SDK.1.7.0\lib\net452\Inedo.SDK.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="InedoLib, Version=1000.0.0.0, Culture=neutral, PublicKeyToken=112cfb71329714a6, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.SDK.1.7.0\lib\net452\InedoLib.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.SDK.1.7.0\lib\net452\Newtonsoft.Json.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Inedo.SDK.1.7.0\lib\net452\System.Management.Automation.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Credentials\SubversionSecureResource.cs" />
-    <Compile Include="Credentials\SubversionCredentials.cs" />
-    <Compile Include="ISvnConfiguration.cs" />
-    <Compile Include="Operations\SvnCheckoutOperation.cs" />
-    <Compile Include="Operations\SvnClient.cs" />
-    <Compile Include="Operations\SvnDeleteOperation.cs" />
-    <Compile Include="Operations\SvnCopyOperation.cs" />
-    <Compile Include="Operations\SvnExportOperation.cs" />
-    <Compile Include="Operations\SvnOperation.cs" />
-    <Compile Include="Operations\SvnUpdateOperation.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RemoteMethods.cs" />
-    <Compile Include="RepositoryMonitors\SvnRepositoryCommit.cs" />
-    <Compile Include="RepositoryMonitors\SvnRepositoryMonitor.cs" />
-    <Compile Include="SuggestionProviders\SvnPathBrowser.cs" />
-    <Compile Include="SvnArgumentBuilder.cs" />
-    <Compile Include="VariableFunctions\SvnDefaultServerNameVariableFunction.cs" />
-    <Compile Include="VariableFunctions\SvnExePathVariableFunction.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Licenses\Plink.txt" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Licenses\Subversion.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\plink.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -156,8 +60,13 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>powershell -Command "if ((Test-Path C:\LocalDev\Tools\inedoxpack\inedoxpack.exe) -And (Test-Path C:\LocalDev\BuildMaster\Extensions -PathType Container)) { C:\LocalDev\Tools\inedoxpack\inedoxpack.exe '$(TargetPath)' 'C:\LocalDev\BuildMaster\Extensions\$(TargetName).upack' 0.0.0 }"</PostBuildEvent>
-  </PropertyGroup>
+  <ItemGroup >
+    <PackageReference Include="Inedo.SDK" Version="1.11.0" >
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework) == 'net452'">
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+
+  </ItemGroup>
 </Project>

Subversion/InedoExtension/Operations/SvnCheckoutOperation.cs

@@ -4,9 +4,7 @@
 using Inedo.Documentation;
 using Inedo.Extensibility;
 using Inedo.Extensibility.Operations;
-using Inedo.Extensions.Subversion.SuggestionProviders;
 using Inedo.Web;
-using Inedo.Web.Plans.ArgumentEditors;
 
 namespace Inedo.Extensions.Subversion.Operations
 {
@@ -27,11 +25,10 @@ public sealed class SvnCheckoutOperation : SvnOperation
         [ScriptAlias("SourcePath")]
         [DisplayName("Source path")]
         [PlaceholderText("Repository root")]
-        [BrowsablePath(typeof(SvnPathBrowser))]
         public string SourcePath { get; set; }
         [ScriptAlias("DiskPath")]
         [DisplayName("Working copy directory")]
-        [FilePathEditor]
+        [FieldEditMode(FieldEditMode.ServerDirectoryPath)]
         [PlaceholderText("$WorkingDirectory")]
         public string DestinationPath { get; set; }
         [Output]

Subversion/InedoExtension/Operations/SvnCopyOperation.cs

@@ -4,8 +4,6 @@
 using Inedo.Documentation;
 using Inedo.Extensibility;
 using Inedo.Extensibility.Operations;
-using Inedo.Extensions.Subversion.SuggestionProviders;
-using Inedo.Web;
 
 namespace Inedo.Extensions.Subversion.Operations
 {
@@ -33,12 +31,10 @@ public sealed class SvnCopyOperation : SvnOperation
         [Required]
         [ScriptAlias("From")]
         [DisplayName("From path")]
-        [BrowsablePath(typeof(SvnPathBrowser))]
         public string SourcePath { get; set; }
         [Required]
         [ScriptAlias("To")]
         [DisplayName("To path")]
-        [BrowsablePath(typeof(SvnPathBrowser))]
         public string DestinationPath { get; set; }
         [Required]
         [ScriptAlias("Message")]

Subversion/InedoExtension/Operations/SvnDeleteOperation.cs

@@ -4,8 +4,6 @@
 using Inedo.Documentation;
 using Inedo.Extensibility;
 using Inedo.Extensibility.Operations;
-using Inedo.Extensions.Subversion.SuggestionProviders;
-using Inedo.Web;
 
 namespace Inedo.Extensions.Subversion.Operations
 {
@@ -18,7 +16,6 @@ public sealed class SvnDeleteOperation : SvnOperation
         [Required]
         [ScriptAlias("Path")]
         [DisplayName("File path")]
-        [BrowsablePath(typeof(SvnPathBrowser))]
         public string Path { get; set; }
         [Required]
         [ScriptAlias("Message")]

Subversion/InedoExtension/Operations/SvnExportOperation.cs

@@ -4,7 +4,6 @@
 using Inedo.Documentation;
 using Inedo.Extensibility;
 using Inedo.Extensibility.Operations;
-using Inedo.Extensions.Subversion.SuggestionProviders;
 using Inedo.Web;
 using Inedo.Web.Plans.ArgumentEditors;
 
@@ -26,12 +25,11 @@ public sealed class SvnExportOperation : SvnOperation
     {
         [Required]
         [ScriptAlias("SourcePath")]
-        [DisplayName("Source path")] 
-        [BrowsablePath(typeof(SvnPathBrowser))]
+        [DisplayName("Source path")]
         public string SourcePath { get; set; }
         [ScriptAlias("DiskPath")]
         [DisplayName("Export to directory")]
-        [FilePathEditor]
+        [FieldEditMode(FieldEditMode.ServerDirectoryPath)]
         [PlaceholderText("$WorkingDirectory")]
         public string DestinationPath { get; set; }
 

Subversion/InedoExtension/Operations/SvnUpdateOperation.cs

@@ -4,6 +4,7 @@
 using Inedo.Documentation;
 using Inedo.Extensibility;
 using Inedo.Extensibility.Operations;
+using Inedo.Web;
 using Inedo.Web.Plans.ArgumentEditors;
 
 namespace Inedo.Extensions.Subversion.Operations
@@ -23,7 +24,7 @@ public sealed class SvnUpdateOperation : SvnOperation
     {
         [ScriptAlias("DiskPath")]
         [DisplayName("Working copy directory")]
-        [FilePathEditor]
+        [FieldEditMode(FieldEditMode.ServerDirectoryPath)]
         [PlaceholderText("$WorkingDirectory")]
         public string DiskPath { get; set; }