From 5eb52511d6e67c9894a63d8464b88fd160513346 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Sat, 17 Aug 2024 16:36:41 +0200 Subject: [PATCH 01/22] Replace wildcards to fix dependabot --- src/Orc.Extensibility/Orc.Extensibility.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orc.Extensibility/Orc.Extensibility.csproj b/src/Orc.Extensibility/Orc.Extensibility.csproj index 153f796f..9a1ec448 100644 --- a/src/Orc.Extensibility/Orc.Extensibility.csproj +++ b/src/Orc.Extensibility/Orc.Extensibility.csproj @@ -28,11 +28,11 @@ - + - + From 99fe1540820f3237cbebb7e2124b7a561c5c255c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 14:37:59 +0000 Subject: [PATCH 02/22] Bump Newtonsoft.Json from 13.0.1 to 13.0.3 in /src Bumps Newtonsoft.Json from 13.0.1 to 13.0.3. --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index c55c8847..28c9f5c6 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -20,6 +20,7 @@ + From 933878df3941de4865e4621d30b41c457685eb36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:55:57 +0000 Subject: [PATCH 03/22] Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.0 in /src Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.10.0 to 17.11.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.10.0...v17.11.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 28c9f5c6..01e8b65c 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers - + From 46414cd0e32144816367bcd2794b8dd163c2297d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:44:14 +0000 Subject: [PATCH 04/22] Bump NUnit from 4.1.0 to 4.2.0 in /src Bumps [NUnit](https://github.com/nunit/nunit) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/nunit/nunit/releases) - [Changelog](https://github.com/nunit/nunit/blob/main/CHANGES.md) - [Commits](https://github.com/nunit/nunit/compare/4.1.0...4.2.0) --- updated-dependencies: - dependency-name: NUnit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 01e8b65c..b3491f16 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -21,7 +21,7 @@ - + From ea4406b4998b2c96894bad5f0ed667cb833b3b2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 18:11:30 +0000 Subject: [PATCH 05/22] Bump NUnit from 4.2.0 to 4.2.1 in /src Bumps [NUnit](https://github.com/nunit/nunit) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/nunit/nunit/releases) - [Changelog](https://github.com/nunit/nunit/blob/main/CHANGES.md) - [Commits](https://github.com/nunit/nunit/compare/4.2.0...4.2.1) --- updated-dependencies: - dependency-name: NUnit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index b3491f16..29c01a2f 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -21,7 +21,7 @@ - + From 094ea6e59e0ae77ef9ae297b9e19c24dc0a925e3 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 28 Aug 2024 13:12:19 +0200 Subject: [PATCH 06/22] GitHubSync update --- deployment/cake/lib-msbuild.cake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/cake/lib-msbuild.cake b/deployment/cake/lib-msbuild.cake index b98443a6..8dcdd2f3 100644 --- a/deployment/cake/lib-msbuild.cake +++ b/deployment/cake/lib-msbuild.cake @@ -1,5 +1,5 @@ -#addin "nuget:?package=Cake.Issues&version=4.10.0" -#addin "nuget:?package=Cake.Issues.MsBuild&version=4.10.0" +#addin "nuget:?package=Cake.Issues&version=4.10.1" +#addin "nuget:?package=Cake.Issues.MsBuild&version=4.10.1" #addin "nuget:?package=System.Configuration.ConfigurationManager&version=8.0.0" #tool "nuget:?package=MSBuild.Extension.Pack&version=1.9.1" From afa8e67648c8f0cc66f532281e54395add48cda4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 18:41:22 +0000 Subject: [PATCH 07/22] Bump Verify.NUnit from 26.2.0 to 26.3.0 in /src Bumps [Verify.NUnit](https://github.com/VerifyTests/Verify) from 26.2.0 to 26.3.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/26.2.0...26.3.0) --- updated-dependencies: - dependency-name: Verify.NUnit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 29c01a2f..6da1a0f5 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -24,7 +24,7 @@ - + From c827e069b4f2b4d673370c39a7ea85a5b13d8d6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:16:00 +0000 Subject: [PATCH 08/22] Bump YamlDotNet from 16.0.0 to 16.1.0 in /src Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 16.0.0 to 16.1.0. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Commits](https://github.com/aaubry/YamlDotNet/compare/v16.0.0...v16.1.0) --- updated-dependencies: - dependency-name: YamlDotNet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Orc.Extensibility.Example.ExtensionA.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj index fcb0e909..81d1965b 100644 --- a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj +++ b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj @@ -29,7 +29,7 @@ - + From d9d0b08064cbbbabd4d4237e6823538df0d007d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:16:58 +0000 Subject: [PATCH 09/22] Bump NUnit from 4.2.1 to 4.2.2 in /src Bumps [NUnit](https://github.com/nunit/nunit) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/nunit/nunit/releases) - [Changelog](https://github.com/nunit/nunit/blob/main/CHANGES.md) - [Commits](https://github.com/nunit/nunit/compare/4.2.1...4.2.2) --- updated-dependencies: - dependency-name: NUnit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 6da1a0f5..666afd0e 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -21,7 +21,7 @@ - + From 3a6352fef5b5e39dd2501381cea7e8ffeb7bb813 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:05:47 +0000 Subject: [PATCH 10/22] Bump Verify.NUnit from 26.3.0 to 26.3.1 in /src Bumps [Verify.NUnit](https://github.com/VerifyTests/Verify) from 26.3.0 to 26.3.1. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/26.3.0...26.3.1) --- updated-dependencies: - dependency-name: Verify.NUnit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 666afd0e..fa2987b3 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -24,7 +24,7 @@ - + From 44d3dc94e9042a7ed9e4f6b1294f566816f89685 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:06:23 +0000 Subject: [PATCH 11/22] Bump Moq from 4.20.70 to 4.20.71 in /src Bumps [Moq](https://github.com/moq/moq) from 4.20.70 to 4.20.71. - [Release notes](https://github.com/moq/moq/releases) - [Changelog](https://github.com/devlooped/moq/blob/main/changelog.md) - [Commits](https://github.com/moq/moq/compare/v4.20.70...v4.20.71) --- updated-dependencies: - dependency-name: Moq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 666afd0e..26fb3947 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -19,7 +19,7 @@ - + From 6de4f15c0c1c839a5661c7404f2aa81ec67991f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:08:50 +0000 Subject: [PATCH 12/22] Bump Verify.NUnit from 26.3.1 to 26.4.0 in /src Bumps [Verify.NUnit](https://github.com/VerifyTests/Verify) from 26.3.1 to 26.4.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/26.3.1...26.4.0) --- updated-dependencies: - dependency-name: Verify.NUnit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index d2ce821c..466d69d4 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -24,7 +24,7 @@ - + From 8bf3e55c9d1fdf25bafc14f7b42a1037a6b429f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:09:18 +0000 Subject: [PATCH 13/22] Bump Microsoft.NET.Test.Sdk from 17.11.0 to 17.11.1 in /src Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.11.0 to 17.11.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.11.0...v17.11.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index d2ce821c..4474c8ca 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers - + From 02fdbe84a13864ea7ad285786ffe58f9d33d9812 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:02:50 +0000 Subject: [PATCH 14/22] Bump Moq from 4.20.71 to 4.20.72 in /src Bumps [Moq](https://github.com/moq/moq) from 4.20.71 to 4.20.72. - [Release notes](https://github.com/moq/moq/releases) - [Changelog](https://github.com/devlooped/moq/blob/main/changelog.md) - [Commits](https://github.com/moq/moq/compare/v4.20.71...v4.20.72) --- updated-dependencies: - dependency-name: Moq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 857f7bda..a19e8aff 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -19,7 +19,7 @@ - + From 95e142b61e7f1cd7e419aa74e88a0ca1f5b3f69e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:03:24 +0000 Subject: [PATCH 15/22] Bump Verify.NUnit from 26.4.0 to 26.4.2 in /src Bumps [Verify.NUnit](https://github.com/VerifyTests/Verify) from 26.4.0 to 26.4.2. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/26.4.0...26.4.2) --- updated-dependencies: - dependency-name: Verify.NUnit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 857f7bda..f9f392e0 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -24,7 +24,7 @@ - + From 9dc5f377a11d16f667fac372aa26d2faaf8ca349 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 18:55:06 +0000 Subject: [PATCH 16/22] Bump Verify.NUnit from 26.4.2 to 26.4.4 in /src Bumps [Verify.NUnit](https://github.com/VerifyTests/Verify) from 26.4.2 to 26.4.4. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/26.4.2...26.4.4) --- updated-dependencies: - dependency-name: Verify.NUnit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 37813d66..435cae59 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -24,7 +24,7 @@ - + From 1f74b3616c3b935150d6024a84e02ebc9c8d275f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 19:22:32 +0000 Subject: [PATCH 17/22] Bump Verify.NUnit from 26.4.4 to 26.4.5 in /src Bumps [Verify.NUnit](https://github.com/VerifyTests/Verify) from 26.4.4 to 26.4.5. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/26.4.4...26.4.5) --- updated-dependencies: - dependency-name: Verify.NUnit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 435cae59..5204baca 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -24,7 +24,7 @@ - + From 4d663175cd8f5fa1b7e1eef8de64974d893b8b90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 19:23:14 +0000 Subject: [PATCH 18/22] Bump YamlDotNet from 16.1.0 to 16.1.2 in /src Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 16.1.0 to 16.1.2. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Commits](https://github.com/aaubry/YamlDotNet/compare/v16.1.0...v16.1.2) --- updated-dependencies: - dependency-name: YamlDotNet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Orc.Extensibility.Example.ExtensionA.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj index 81d1965b..ba4b9251 100644 --- a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj +++ b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj @@ -29,7 +29,7 @@ - + From dcac04ec221170408aab222cf96f7f9ab8dc3c2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 18:49:35 +0000 Subject: [PATCH 19/22] Bump Fody from 6.8.1 to 6.8.2 in /src Bumps [Fody](https://github.com/Fody/Fody) from 6.8.1 to 6.8.2. - [Release notes](https://github.com/Fody/Fody/releases) - [Commits](https://github.com/Fody/Fody/compare/6.8.1...6.8.2) --- updated-dependencies: - dependency-name: Fody dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Orc.Extensibility.Example.Api.csproj | 2 +- .../Orc.Extensibility.Example.ExtensionA.csproj | 2 +- .../Orc.Extensibility.Example.ExtensionB.csproj | 2 +- .../Orc.Extensibility.Example.csproj | 2 +- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- src/Orc.Extensibility/Orc.Extensibility.csproj | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Orc.Extensibility.Example.Api/Orc.Extensibility.Example.Api.csproj b/src/Orc.Extensibility.Example.Api/Orc.Extensibility.Example.Api.csproj index 82cf30e2..be59fcdf 100644 --- a/src/Orc.Extensibility.Example.Api/Orc.Extensibility.Example.Api.csproj +++ b/src/Orc.Extensibility.Example.Api/Orc.Extensibility.Example.Api.csproj @@ -19,7 +19,7 @@ - + runtime; build; native; contentfiles; analyzers diff --git a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj index ba4b9251..f2f5c215 100644 --- a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj +++ b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj @@ -20,7 +20,7 @@ - + runtime; build; native; contentfiles; analyzers diff --git a/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj b/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj index d65604d1..9251ee90 100644 --- a/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj +++ b/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj @@ -20,7 +20,7 @@ - + runtime; build; native; contentfiles; analyzers diff --git a/src/Orc.Extensibility.Example/Orc.Extensibility.Example.csproj b/src/Orc.Extensibility.Example/Orc.Extensibility.Example.csproj index 2c557fde..d52d0fe5 100644 --- a/src/Orc.Extensibility.Example/Orc.Extensibility.Example.csproj +++ b/src/Orc.Extensibility.Example/Orc.Extensibility.Example.csproj @@ -18,7 +18,7 @@ - + runtime; build; native; contentfiles; analyzers diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index 5204baca..e54be5ab 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -14,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers diff --git a/src/Orc.Extensibility/Orc.Extensibility.csproj b/src/Orc.Extensibility/Orc.Extensibility.csproj index 9a1ec448..c0066e46 100644 --- a/src/Orc.Extensibility/Orc.Extensibility.csproj +++ b/src/Orc.Extensibility/Orc.Extensibility.csproj @@ -18,7 +18,7 @@ - + runtime; build; native; contentfiles; analyzers @@ -28,7 +28,7 @@ - + From 9123e56752f118a969e19728344c6d80e29d3586 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:13:13 +0000 Subject: [PATCH 20/22] Bump Verify.NUnit from 26.4.5 to 26.5.0 in /src Bumps [Verify.NUnit](https://github.com/VerifyTests/Verify) from 26.4.5 to 26.5.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/compare/26.4.5...26.5.0) --- updated-dependencies: - dependency-name: Verify.NUnit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj index e54be5ab..e84cb086 100644 --- a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj +++ b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj @@ -24,7 +24,7 @@ - + From 61e7c5825bb4aba9f2e5f7fae85dc9435716478b Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Sat, 21 Sep 2024 00:27:38 +0200 Subject: [PATCH 21/22] Extra tests and logging --- .../FodyWeavers.xml | 11 +++++++ ...rc.Extensibility.Example.ExtensionA.csproj | 5 ++- .../Plugins/PluginA.cs | 20 ++++++++++++ ...rc.Extensibility.Example.ExtensionB.csproj | 2 +- ...ty_HasNoBreakingChanges_Async.verified.txt | 4 +-- .../RuntimeAssemblyResolverService.cs | 32 +++++++++---------- 6 files changed, 54 insertions(+), 20 deletions(-) diff --git a/src/Orc.Extensibility.Example.ExtensionA/FodyWeavers.xml b/src/Orc.Extensibility.Example.ExtensionA/FodyWeavers.xml index d1a3de21..0440bc08 100644 --- a/src/Orc.Extensibility.Example.ExtensionA/FodyWeavers.xml +++ b/src/Orc.Extensibility.Example.ExtensionA/FodyWeavers.xml @@ -4,12 +4,23 @@ + Azure.* + EntityFramework + EntityFramework.SqlServer + Microsoft.Identity.Client* + Microsoft.SqlServer.* Newtonsoft.Json Orc.Metadata Orc.Search Orc.Search.Xaml YamlDotNet + + Microsoft.Data.SqlClient + Microsoft.Data.SqlClient.SNI + System.Data.SqlClient + sni + diff --git a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj index f2f5c215..52b7c461 100644 --- a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj +++ b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj @@ -19,16 +19,19 @@ - + + runtime; build; native; contentfiles; analyzers + + diff --git a/src/Orc.Extensibility.Example.ExtensionA/Plugins/PluginA.cs b/src/Orc.Extensibility.Example.ExtensionA/Plugins/PluginA.cs index 0dabc28c..6974c3bf 100644 --- a/src/Orc.Extensibility.Example.ExtensionA/Plugins/PluginA.cs +++ b/src/Orc.Extensibility.Example.ExtensionA/Plugins/PluginA.cs @@ -25,6 +25,26 @@ public async Task InitializeAsync() var value = _languageService.GetRequiredString("TestResource"); Log.Info($"{typeof(YamlDotNet.Core.AnchorName).FullName}"); + Log.Info($"{typeof(System.Data.SqlClient.SqlClientFactory).FullName}"); + Log.Info($"{typeof(Microsoft.Data.SqlClient.SqlClientFactory).FullName}"); + Log.Info($"{typeof(Microsoft.Data.SqlClient.SqlConnection).FullName}"); + + try + { + var connectionString = ".\\SQLExpress"; + + System.Data.Entity.Database.Exists(connectionString); + + //using (var connection = new System.Data.SqlClient.SqlConnection(connectionString)) + //{ + // await connection.OpenAsync(); + //} + } + catch + { + // Ignore + Log.Error("Failed to open database connection"); + } await _messageService.ShowAsync($"Plugin A has been loaded, setting color to red. Resource value: '{value}'"); diff --git a/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj b/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj index 9251ee90..c443adba 100644 --- a/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj +++ b/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj @@ -19,7 +19,7 @@ - + runtime; build; native; contentfiles; analyzers diff --git a/src/Orc.Extensibility.Tests/PublicApiFacts.Orc_Extensibility_HasNoBreakingChanges_Async.verified.txt b/src/Orc.Extensibility.Tests/PublicApiFacts.Orc_Extensibility_HasNoBreakingChanges_Async.verified.txt index ceb582e3..9e648b78 100644 --- a/src/Orc.Extensibility.Tests/PublicApiFacts.Orc_Extensibility_HasNoBreakingChanges_Async.verified.txt +++ b/src/Orc.Extensibility.Tests/PublicApiFacts.Orc_Extensibility_HasNoBreakingChanges_Async.verified.txt @@ -307,10 +307,10 @@ namespace Orc.Extensibility public class RuntimeAssemblyResolverService : Orc.Extensibility.IRuntimeAssemblyResolverService { public RuntimeAssemblyResolverService(Orc.FileSystem.IFileService fileService, Orc.FileSystem.IDirectoryService directoryService, Orc.Extensibility.IAssemblyReflectionService assemblyReflectionService, Catel.Services.IAppDataService appDataService) { } - protected virtual System.Threading.Tasks.Task?> FindEmbeddedAssembliesViaMetadataAsync(System.Collections.Generic.IEnumerable resources) { } + protected virtual System.Threading.Tasks.Task?> FindEmbeddedAssembliesViaCosturaMetadataAsync(System.Collections.Generic.IEnumerable resources) { } protected System.Threading.Tasks.Task> FindEmbeddedResourcesAsync(System.Reflection.PortableExecutable.PEReader peReader, Orc.Extensibility.IRuntimeAssembly containerAssembly) { } public Orc.Extensibility.IPluginLoadContext[] GetPluginLoadContexts() { } - protected virtual System.Threading.Tasks.Task> IndexCosturaEmbeddedAssembliesAsync(Orc.Extensibility.IPluginLoadContext pluginLoadContext, Orc.Extensibility.IRuntimeAssembly? originatingAssembly, Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { } + protected virtual System.Threading.Tasks.Task> IndexCosturaClassicEmbeddedAssembliesAsync(Orc.Extensibility.IPluginLoadContext pluginLoadContext, Orc.Extensibility.IRuntimeAssembly? originatingAssembly, Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { } public System.Threading.Tasks.Task RegisterAssemblyAsync(Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { } protected System.Threading.Tasks.Task RegisterAssemblyAsync(Orc.Extensibility.IPluginLoadContext pluginLoadContext, Orc.Extensibility.IRuntimeAssembly? originatingAssembly, Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { } protected virtual bool ShouldIgnoreAssemblyForCosturaExtracting(Orc.Extensibility.IPluginLoadContext pluginLoadContext, Orc.Extensibility.IRuntimeAssembly? originatingAssembly, Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { } diff --git a/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs b/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs index fab2a877..7833c47c 100644 --- a/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs +++ b/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs @@ -2,22 +2,17 @@ using System; using System.Collections.Generic; -using System.IO.Compression; using System.IO; using System.Linq; using System.Reflection.PortableExecutable; -using System.Reflection; using Catel.Logging; using Orc.FileSystem; using Catel.Services; using System.Reflection.Metadata; using Catel; using MethodTimer; -using Catel.Reflection; -using System.Security.Cryptography; -using System.Text; -using System.Diagnostics; using System.Threading.Tasks; +using System.Runtime.InteropServices; public partial class RuntimeAssemblyResolverService : IRuntimeAssemblyResolverService { @@ -40,6 +35,9 @@ public RuntimeAssemblyResolverService(IFileService fileService, IDirectoryServic _directoryService = directoryService; _assemblyReflectionService = assemblyReflectionService; _appDataService = appDataService; + + Log.Debug($"Platform identifiers: {PlatformInformation.RuntimeIdentifiers}"); + Log.Debug($"Runtime identifier: {RuntimeInformation.RuntimeIdentifier}"); } public IPluginLoadContext[] GetPluginLoadContexts() @@ -86,12 +84,12 @@ public async Task UnregisterAssemblyAsync(IRuntimeAssembly runtimeAssembly) protected async Task RegisterAssemblyAsync(IPluginLoadContext pluginLoadContext, IRuntimeAssembly? originatingAssembly, IRuntimeAssembly runtimeAssembly) { - var assemblies = await IndexCosturaEmbeddedAssembliesAsync(pluginLoadContext, originatingAssembly, runtimeAssembly); + var assemblies = await IndexCosturaClassicEmbeddedAssembliesAsync(pluginLoadContext, originatingAssembly, runtimeAssembly); pluginLoadContext.RuntimeAssemblies.AddRange(assemblies); } [Time("{runtimeAssembly}")] - protected virtual async Task> IndexCosturaEmbeddedAssembliesAsync(IPluginLoadContext pluginLoadContext, IRuntimeAssembly? originatingAssembly, IRuntimeAssembly runtimeAssembly) + protected virtual async Task> IndexCosturaClassicEmbeddedAssembliesAsync(IPluginLoadContext pluginLoadContext, IRuntimeAssembly? originatingAssembly, IRuntimeAssembly runtimeAssembly) { // Ignore specific assemblies if (ShouldIgnoreAssemblyForCosturaExtracting(pluginLoadContext, originatingAssembly, runtimeAssembly)) @@ -119,7 +117,7 @@ protected virtual async Task> IndexCosturaEmbedded var embeddedResources = await FindEmbeddedResourcesAsync(peReader, runtimeAssembly); if (embeddedResources.Count > 0) { - var costuraEmbeddedAssembliesFromMetadata = await FindEmbeddedAssembliesViaMetadataAsync(embeddedResources); + var costuraEmbeddedAssembliesFromMetadata = await FindEmbeddedAssembliesViaCosturaMetadataAsync(embeddedResources); if (costuraEmbeddedAssembliesFromMetadata is null) { Log.Error($"Files are embedded with an older version of Costura (< 5.x). It's required to update so metadata is embedded by Costura"); @@ -132,6 +130,8 @@ protected virtual async Task> IndexCosturaEmbedded if (costuraEmbeddedAssembly.IsRuntime) { // Check if correct platform + //RuntimeInformation.RuntimeIdentifier + if (!PlatformInformation.RuntimeIdentifiers.Any(x => costuraEmbeddedAssembly.RelativeFileName.ContainsIgnoreCase($"/{x}/"))) { Log.Debug($"Ignoring '{costuraEmbeddedAssembly}' since it's not applicable to the current platform"); @@ -167,7 +167,7 @@ protected virtual async Task> IndexCosturaEmbedded indexedCosturaAssemblies.Add(costuraEmbeddedAssembly); // Recursive indexing - var recursiveRuntimeAssemblies = await IndexCosturaEmbeddedAssembliesAsync(pluginLoadContext, originatingAssembly, costuraEmbeddedAssembly); + var recursiveRuntimeAssemblies = await IndexCosturaClassicEmbeddedAssembliesAsync(pluginLoadContext, originatingAssembly, costuraEmbeddedAssembly); if (recursiveRuntimeAssemblies.Any()) { indexedCosturaAssemblies.AddRange(recursiveRuntimeAssemblies); @@ -288,11 +288,11 @@ protected async Task> FindEmbeddedResourcesAsync(PEReader return embeddedResources; } - protected virtual async Task?> FindEmbeddedAssembliesViaMetadataAsync(IEnumerable resources) + protected virtual async Task?> FindEmbeddedAssembliesViaCosturaMetadataAsync(IEnumerable resources) { var metadataResource = (from x in resources - where x.Name.EqualsIgnoreCase("costura.metadata") - select x).FirstOrDefault(); + where x.Name.EqualsIgnoreCase("costura.metadata") + select x).FirstOrDefault(); if (metadataResource is null) { // Not found, return null @@ -319,8 +319,8 @@ where x.Name.EqualsIgnoreCase("costura.metadata") var costuraEmbeddedResource = new CosturaRuntimeAssembly(line); var embeddedResource = (from x in resources - where x.Name == costuraEmbeddedResource.ResourceName - select x).FirstOrDefault(); + where x.Name == costuraEmbeddedResource.ResourceName + select x).FirstOrDefault(); if (embeddedResource is null) { Log.Error($"Expected to find Costura embedded resource '{costuraEmbeddedResource.ResourceName}', but could not find it"); @@ -337,4 +337,4 @@ where x.Name.EqualsIgnoreCase("costura.metadata") return embeddedResources; } -} \ No newline at end of file +} From c85168e526d32000fb3461afc8975c0b6d4fe845 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Sat, 21 Sep 2024 09:37:29 +0200 Subject: [PATCH 22/22] Use runtime identifier instead of OS architecture --- .../Internal/PlatformInformation.cs | 13 ++++++++++--- .../Services/RuntimeAssemblyResolverService.cs | 3 --- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Orc.Extensibility/DotNetCorePlugins/Internal/PlatformInformation.cs b/src/Orc.Extensibility/DotNetCorePlugins/Internal/PlatformInformation.cs index 8017335b..54186888 100644 --- a/src/Orc.Extensibility/DotNetCorePlugins/Internal/PlatformInformation.cs +++ b/src/Orc.Extensibility/DotNetCorePlugins/Internal/PlatformInformation.cs @@ -31,8 +31,15 @@ static PlatformInformation() NativeLibraryPrefixes = new[] { string.Empty }; NativeLibraryExtensions = new[] { ".dll" }; - // For now we only care about windows - runtimeIdentifiers.Add($"win-{RuntimeInformation.OSArchitecture.ToString().ToLower()}"); + var runtimeIdentifier = RuntimeInformation.RuntimeIdentifier; + var osArchitecture = RuntimeInformation.OSArchitecture.ToString(); + + Log.Debug($"OS Architecture: {osArchitecture}"); + Log.Debug($"Runtime identifier: {runtimeIdentifier}"); + + // Note that we need to respect the process, not the OS + runtimeIdentifiers.Add(runtimeIdentifier); + //runtimeIdentifiers.Add($"win-{osArchitecture.ToLower()}"); runtimeIdentifiers.Add("win"); } else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) @@ -55,4 +62,4 @@ static PlatformInformation() RuntimeIdentifiers = runtimeIdentifiers.ToArray(); } -} \ No newline at end of file +} diff --git a/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs b/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs index 7833c47c..e9e76dca 100644 --- a/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs +++ b/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs @@ -35,9 +35,6 @@ public RuntimeAssemblyResolverService(IFileService fileService, IDirectoryServic _directoryService = directoryService; _assemblyReflectionService = assemblyReflectionService; _appDataService = appDataService; - - Log.Debug($"Platform identifiers: {PlatformInformation.RuntimeIdentifiers}"); - Log.Debug($"Runtime identifier: {RuntimeInformation.RuntimeIdentifier}"); } public IPluginLoadContext[] GetPluginLoadContexts()