diff --git a/DevProxy.Abstractions/DevProxy.Abstractions.csproj b/DevProxy.Abstractions/DevProxy.Abstractions.csproj
index f4cf58854..8798c4aa0 100644
--- a/DevProxy.Abstractions/DevProxy.Abstractions.csproj
+++ b/DevProxy.Abstractions/DevProxy.Abstractions.csproj
@@ -45,7 +45,7 @@
-
+
diff --git a/DevProxy.Abstractions/packages.lock.json b/DevProxy.Abstractions/packages.lock.json
index 64e507d53..e0b6f6d64 100644
--- a/DevProxy.Abstractions/packages.lock.json
+++ b/DevProxy.Abstractions/packages.lock.json
@@ -119,9 +119,9 @@
},
"YamlDotNet": {
"type": "Direct",
- "requested": "[18.0.0, )",
- "resolved": "18.0.0",
- "contentHash": "ptHVgcYmLejGuWXV7RMFoEqFKYMXnieOlWLPzEslfDtzZ9ngMhjYwykfqjBN2+fMEAEyobozkj07lKEpR4dssA=="
+ "requested": "[18.1.0, )",
+ "resolved": "18.1.0",
+ "contentHash": "5K+9KFg2TdTl7VXv88Qzi/0lqK6JFoNP3lRuImPYGRV7K/QYklDyTrj4+A+KAki1JsQi6qKY+hDyY7d6WRqjrw=="
},
"BouncyCastle.Cryptography": {
"type": "Transitive",
diff --git a/DevProxy.Plugins/packages.lock.json b/DevProxy.Plugins/packages.lock.json
index 0bed3622a..7faa5597c 100644
--- a/DevProxy.Plugins/packages.lock.json
+++ b/DevProxy.Plugins/packages.lock.json
@@ -522,8 +522,8 @@
},
"YamlDotNet": {
"type": "Transitive",
- "resolved": "18.0.0",
- "contentHash": "ptHVgcYmLejGuWXV7RMFoEqFKYMXnieOlWLPzEslfDtzZ9ngMhjYwykfqjBN2+fMEAEyobozkj07lKEpR4dssA=="
+ "resolved": "18.1.0",
+ "contentHash": "5K+9KFg2TdTl7VXv88Qzi/0lqK6JFoNP3lRuImPYGRV7K/QYklDyTrj4+A+KAki1JsQi6qKY+hDyY7d6WRqjrw=="
},
"devproxy.abstractions": {
"type": "Project",
@@ -541,7 +541,7 @@
"Scriban": "[7.2.5, )",
"System.CommandLine": "[2.0.9, )",
"Unobtanium.Web.Proxy": "[0.1.5, )",
- "YamlDotNet": "[18.0.0, )"
+ "YamlDotNet": "[18.1.0, )"
}
}
}
diff --git a/DevProxy/DevProxy.csproj b/DevProxy/DevProxy.csproj
index e899693da..82da92dd8 100644
--- a/DevProxy/DevProxy.csproj
+++ b/DevProxy/DevProxy.csproj
@@ -36,7 +36,7 @@
-
+
diff --git a/DevProxy/Proxy/CertificateDiskCache.cs b/DevProxy/Proxy/CertificateDiskCache.cs
index e7442a63e..0a7abebc3 100644
--- a/DevProxy/Proxy/CertificateDiskCache.cs
+++ b/DevProxy/Proxy/CertificateDiskCache.cs
@@ -21,7 +21,7 @@ internal sealed class CertificateDiskCache : ICertificateCache
public Task LoadRootCertificateAsync(string pathOrName, string password, X509KeyStorageFlags storageFlags, CancellationToken cancellationToken)
{
var path = GetRootCertificatePath(pathOrName, false);
- return Task.FromResult(LoadCertificate(path, password, storageFlags));
+ return LoadCertificateAsync(path, password, storageFlags, cancellationToken);
}
public async Task SaveRootCertificateAsync(string pathOrName, string password, X509Certificate2 certificate, CancellationToken cancellationToken)
@@ -34,7 +34,7 @@ public async Task SaveRootCertificateAsync(string pathOrName, string password, X
public Task LoadCertificateAsync(string subjectName, X509KeyStorageFlags storageFlags, CancellationToken cancellationToken)
{
var filePath = Path.Combine(GetCertificatePath(false), subjectName + DefaultCertificateFileExtension);
- return Task.FromResult(LoadCertificate(filePath, string.Empty, storageFlags));
+ return LoadCertificateAsync(filePath, string.Empty, storageFlags, cancellationToken);
}
public async Task SaveCertificateAsync(string subjectName, X509Certificate2 certificate, CancellationToken cancellationToken)
@@ -118,7 +118,7 @@ private string GetRootCertificateDirectory(bool create)
return rootCertificatePath;
}
- private static X509Certificate2? LoadCertificate(string path, string password, X509KeyStorageFlags storageFlags)
+ private static async Task LoadCertificateAsync(string path, string password, X509KeyStorageFlags storageFlags, CancellationToken cancellationToken)
{
byte[] exported;
@@ -129,7 +129,7 @@ private string GetRootCertificateDirectory(bool create)
try
{
- exported = File.ReadAllBytes(path);
+ exported = await File.ReadAllBytesAsync(path, cancellationToken);
}
catch (IOException)
{
diff --git a/DevProxy/packages.lock.json b/DevProxy/packages.lock.json
index 6d433fdc9..441046d2d 100644
--- a/DevProxy/packages.lock.json
+++ b/DevProxy/packages.lock.json
@@ -35,13 +35,13 @@
},
"Microsoft.VisualStudio.Threading": {
"type": "Direct",
- "requested": "[17.14.15, )",
- "resolved": "17.14.15",
- "contentHash": "1DrCusT3xNLSlaJg77BsUSAzrhjdZBAvvsS0PMzyPM+fGais6SnISOhqdZQop8VVMIBLsYm2gyF9W7THjgavwA==",
+ "requested": "[18.7.23, )",
+ "resolved": "18.7.23",
+ "contentHash": "IiK1otNipjvDIk8SClYwOP1uRZLpVA3luVMKSTPhhjhxqv2pp8/tzfLy/IB7HW+voeEodCTHh0q9LbLIBdGNKA==",
"dependencies": {
- "Microsoft.VisualStudio.Threading.Analyzers": "17.14.15",
- "Microsoft.VisualStudio.Threading.Only": "17.14.15",
- "Microsoft.VisualStudio.Validation": "17.8.8"
+ "Microsoft.VisualStudio.Threading.Analyzers": "18.7.23",
+ "Microsoft.VisualStudio.Threading.Only": "18.7.23",
+ "Microsoft.VisualStudio.Validation": "17.13.22"
}
},
"Newtonsoft.Json": {
@@ -247,21 +247,21 @@
},
"Microsoft.VisualStudio.Threading.Analyzers": {
"type": "Transitive",
- "resolved": "17.14.15",
- "contentHash": "mXQPJsbuUD2ydq4/ffd8h8tSOFCXec+2xJOVNCvXjuMOq/+5EKHq3D2m2MC2+nUaXeFMSt66VS/J4HdKBixgcw=="
+ "resolved": "18.7.23",
+ "contentHash": "dyj6z8m+LFjpeH69hdnciCcRCmD0YgMlvuQEywiEshjqj/blgQ+PuWX8Vd5gkWQFoBN4e+TFxx6DvGNSv/gIKg=="
},
"Microsoft.VisualStudio.Threading.Only": {
"type": "Transitive",
- "resolved": "17.14.15",
- "contentHash": "NqONyw1RXyj9P3k5e1uU2k9kc1ptwuU5NJQzG+MPq7vQVHUzBY8HLuJf/N2Rw5H/myD96CVxziDxmjawPuzntw==",
+ "resolved": "18.7.23",
+ "contentHash": "iOaVAQLPt1KxFyYqZqKxqNu8BgQUiPLNeT8XhX+549eWaGw49e1MxjlkjTIBwvlfrU4lPp+Nm99oRpmsgN7RJw==",
"dependencies": {
- "Microsoft.VisualStudio.Validation": "17.8.8"
+ "Microsoft.VisualStudio.Validation": "17.13.22"
}
},
"Microsoft.VisualStudio.Validation": {
"type": "Transitive",
- "resolved": "17.8.8",
- "contentHash": "rWXThIpyQd4YIXghNkiv2+VLvzS+MCMKVRDR0GAMlflsdo+YcAN2g2r5U1Ah98OFjQMRexTFtXQQ2LkajxZi3g=="
+ "resolved": "17.13.22",
+ "contentHash": "fC20ITOxlUpGQ0ltAxITQbeFxwuB6OjLT3lByC4+/Gm46o/Mwv9hlIVrBhiUhnqdQzUUvr4EHkdiYe7WOSMLmw=="
},
"Newtonsoft.Json.Schema": {
"type": "Transitive",
@@ -341,8 +341,8 @@
},
"YamlDotNet": {
"type": "Transitive",
- "resolved": "18.0.0",
- "contentHash": "ptHVgcYmLejGuWXV7RMFoEqFKYMXnieOlWLPzEslfDtzZ9ngMhjYwykfqjBN2+fMEAEyobozkj07lKEpR4dssA=="
+ "resolved": "18.1.0",
+ "contentHash": "5K+9KFg2TdTl7VXv88Qzi/0lqK6JFoNP3lRuImPYGRV7K/QYklDyTrj4+A+KAki1JsQi6qKY+hDyY7d6WRqjrw=="
},
"devproxy.abstractions": {
"type": "Project",
@@ -355,7 +355,7 @@
"Scriban": "[7.2.5, )",
"System.CommandLine": "[2.0.9, )",
"Unobtanium.Web.Proxy": "[0.1.5, )",
- "YamlDotNet": "[18.0.0, )"
+ "YamlDotNet": "[18.1.0, )"
}
}
}