From 2a63cd48160bf8ebf8176c4f473e3058f11f170a Mon Sep 17 00:00:00 2001 From: Maksym Kucherov Date: Wed, 13 Sep 2023 11:46:05 +0300 Subject: [PATCH 1/5] Redirect `System.Runtime.CompilerServices.Unsafe` assembly reference from `4.0.4.1` to `6.0.0.0` in `FiftyOne.Pipeline.Web.Framework.Tests` --- .../Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config b/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config index 41f83a8c..3aac064b 100644 --- a/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config +++ b/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file From ef5b953cbfc49dfc4b231fa79a17a019dad704c3 Mon Sep 17 00:00:00 2001 From: Maksym Kucherov Date: Wed, 13 Sep 2023 12:41:46 +0300 Subject: [PATCH 2/5] Disable `AutoGenerateBindingRedirects`. --- .../FiftyOne.Pipeline.Web.Framework.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/FiftyOne.Pipeline.Web.Framework.Tests.csproj b/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/FiftyOne.Pipeline.Web.Framework.Tests.csproj index b63a8533..f7b4f169 100644 --- a/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/FiftyOne.Pipeline.Web.Framework.Tests.csproj +++ b/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/FiftyOne.Pipeline.Web.Framework.Tests.csproj @@ -41,7 +41,7 @@ true - true + false From 00d656471a310916a0c8a496e15bf6268c5b1777 Mon Sep 17 00:00:00 2001 From: Maksym Kucherov Date: Wed, 13 Sep 2023 14:05:05 +0300 Subject: [PATCH 3/5] Uppercase assembly publicKeyToken. --- .../Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config b/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config index 3aac064b..6c2e45bf 100644 --- a/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config +++ b/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/app.config @@ -7,7 +7,7 @@ - + From 2652aba967bc1ea6569f608e1bd1f30ca3050ed6 Mon Sep 17 00:00:00 2001 From: Maksym Kucherov Date: Wed, 13 Sep 2023 14:05:32 +0300 Subject: [PATCH 4/5] Revert "Disable `AutoGenerateBindingRedirects`." This reverts commit ef5b953cbfc49dfc4b231fa79a17a019dad704c3. --- .../FiftyOne.Pipeline.Web.Framework.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/FiftyOne.Pipeline.Web.Framework.Tests.csproj b/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/FiftyOne.Pipeline.Web.Framework.Tests.csproj index f7b4f169..b63a8533 100644 --- a/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/FiftyOne.Pipeline.Web.Framework.Tests.csproj +++ b/Web Integration/Tests/FiftyOne.Pipeline.Web.Framework.Tests/FiftyOne.Pipeline.Web.Framework.Tests.csproj @@ -41,7 +41,7 @@ true - false + true From 2a5f1d59df872b7e222e9dd8565f76adefde6f7c Mon Sep 17 00:00:00 2001 From: Maksym Kucherov Date: Wed, 13 Sep 2023 16:25:35 +0300 Subject: [PATCH 5/5] Check temp file does not exist before running actually tested logic. --- .../Services/DataUpdateServiceTests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/FiftyOne.Pipeline.Engines.Tests/Services/DataUpdateServiceTests.cs b/Tests/FiftyOne.Pipeline.Engines.Tests/Services/DataUpdateServiceTests.cs index f4e62445..a8b17cf2 100644 --- a/Tests/FiftyOne.Pipeline.Engines.Tests/Services/DataUpdateServiceTests.cs +++ b/Tests/FiftyOne.Pipeline.Engines.Tests/Services/DataUpdateServiceTests.cs @@ -663,6 +663,7 @@ public void DataUpdateService_UpdateFromUrl_UpdateAvailable() Mock engine = new Mock(); string tempPath = Path.GetTempPath(); string dataFile = Path.GetTempFileName(); + if (File.Exists(dataFile)) { File.Delete(dataFile); } try { // Configure the engine to return the relevant paths. @@ -847,6 +848,7 @@ public void DataUpdateService_UpdateFromUrl_HttpException() Mock engine = new Mock(); string tempPath = Path.GetTempPath(); string dataFile = Path.GetTempFileName(); + if (File.Exists(dataFile)) { File.Delete(dataFile); } try { // Configure the engine to return the relevant paths.