summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWouter Tinus <wouter.tinus@gmail.com>2020-10-08 21:49:12 +0200
committerWouter Tinus <wouter.tinus@gmail.com>2020-10-08 21:49:12 +0200
commite9bffb82947e03f0dc8a79cc8173f67e33671121 (patch)
treece4f90fb2de5e1b091bd7b45a79ba05e2b7b44d0
parent1150ca6296db60379dd32a3defe07b04c89a4bc9 (diff)
downloadletsencrypt-win-simple-origin/2.1.12.zip
letsencrypt-win-simple-origin/2.1.12.tar.gz
letsencrypt-win-simple-origin/2.1.12.tar.bz2
update nuget packagesorigin/2.1.12
-rw-r--r--src/main.lib/Plugins/TargetPlugins/IIS/IISOptionsFactory.cs29
-rw-r--r--src/main.lib/wacs.lib.csproj18
-rw-r--r--src/main.test/wacs.test.csproj2
-rwxr-xr-xsrc/plugin.validation.dns.azure/wacs.validation.dns.azure.csproj2
-rw-r--r--src/plugin.validation.dns.route53/wacs.validation.dns.route53.csproj2
5 files changed, 30 insertions, 23 deletions
diff --git a/src/main.lib/Plugins/TargetPlugins/IIS/IISOptionsFactory.cs b/src/main.lib/Plugins/TargetPlugins/IIS/IISOptionsFactory.cs
index 8eebb99..f5163d2 100644
--- a/src/main.lib/Plugins/TargetPlugins/IIS/IISOptionsFactory.cs
+++ b/src/main.lib/Plugins/TargetPlugins/IIS/IISOptionsFactory.cs
@@ -171,20 +171,27 @@ namespace PKISharp.WACS.Plugins.TargetPlugins
return InputRegex(input, options);
}, "Pick bindings based on a regular expression", command: "R"));
}
- var chosen = await input.ChooseFromMenu(
- "Binding identifiers(s) or menu option",
- filters,
- (unknown) =>
+
+ // Handle undefined input
+ Choice<Func<Task>> processUnkown(string unknown) {
+ return Choice.Create<Func<Task>>(() =>
{
- return Choice.Create<Func<Task>>(() =>
- {
- askExclude = false;
- return ProcessInputHosts(
- unknown, allBindings, filtered, options,
- () => options.IncludeHosts, x => options.IncludeHosts = x);
- });
+ askExclude = false;
+ return ProcessInputHosts(
+ unknown,
+ allBindings,
+ filtered,
+ options,
+ () => options.IncludeHosts, x => options.IncludeHosts = x);
});
+ }
+
+ var chosen = await input.ChooseFromMenu(
+ "Binding identifiers(s) or menu option",
+ filters,
+ processUnkown);
await chosen.Invoke();
+
filtered = _iisHelper.FilterBindings(allBindings, options);
// Exclude specific bindings
diff --git a/src/main.lib/wacs.lib.csproj b/src/main.lib/wacs.lib.csproj
index 1b7752d..837e180 100644
--- a/src/main.lib/wacs.lib.csproj
+++ b/src/main.lib/wacs.lib.csproj
@@ -23,18 +23,18 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Autofac" Version="5.2.0" />
+ <PackageReference Include="Autofac" Version="6.0.0" />
<PackageReference Include="DnsClient" Version="1.3.2" />
- <PackageReference Include="MailKit" Version="2.8.0" />
- <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.6" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.6" />
- <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.6" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.6" />
+ <PackageReference Include="MailKit" Version="2.9.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.8" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
<PackageReference Include="Microsoft.Web.Administration" Version="11.1.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="Nager.PublicSuffix" Version="1.5.1" />
- <PackageReference Include="Portable.BouncyCastle" Version="1.8.6.7" />
- <PackageReference Include="Serilog" Version="2.9.0" />
+ <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
+ <PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
@@ -47,7 +47,7 @@
<PackageReference Include="System.Security.Cryptography.Cng" Version="4.7.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
- <PackageReference Include="TaskScheduler" Version="2.8.20" />
+ <PackageReference Include="TaskScheduler" Version="2.8.21" />
<PackageReference Include="WebDav.Client" Version="2.7.0" />
</ItemGroup>
diff --git a/src/main.test/wacs.test.csproj b/src/main.test/wacs.test.csproj
index 9b7b870..3364f45 100644
--- a/src/main.test/wacs.test.csproj
+++ b/src/main.test/wacs.test.csproj
@@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="coverlet.collector" Version="1.3.0">
diff --git a/src/plugin.validation.dns.azure/wacs.validation.dns.azure.csproj b/src/plugin.validation.dns.azure/wacs.validation.dns.azure.csproj
index 9a58aa7..04ca077 100755
--- a/src/plugin.validation.dns.azure/wacs.validation.dns.azure.csproj
+++ b/src/plugin.validation.dns.azure/wacs.validation.dns.azure.csproj
@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
- <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.5.0" />
+ <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
</ItemGroup>
diff --git a/src/plugin.validation.dns.route53/wacs.validation.dns.route53.csproj b/src/plugin.validation.dns.route53/wacs.validation.dns.route53.csproj
index 59abcbb..0876608 100644
--- a/src/plugin.validation.dns.route53/wacs.validation.dns.route53.csproj
+++ b/src/plugin.validation.dns.route53/wacs.validation.dns.route53.csproj
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="AWSSDK.Route53" Version="3.3.106.16" />
+ <PackageReference Include="AWSSDK.Route53" Version="3.5.0.25" />
</ItemGroup>
<ItemGroup>