From 80c1c371ea0b0c644297d7bb832b2711cd2ab09d Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Sun, 17 Nov 2024 17:13:46 +0000 Subject: [PATCH 1/7] fix visual studio build error --- Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index d1c371142..a8307ca2c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,6 +14,8 @@ true $(MSBuildThisFileDirectory)\nunit.runsettings linux-x64;win-x64;osx-arm64 + + win-x64 none true net8.0 From 0396435ccd9a9d288f17190ceb84079bcc7ebde6 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Sun, 17 Nov 2024 17:15:06 +0000 Subject: [PATCH 2/7] add news file --- news/1997-meta.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/1997-meta.md diff --git a/news/1997-meta.md b/news/1997-meta.md new file mode 100644 index 000000000..ec99800cf --- /dev/null +++ b/news/1997-meta.md @@ -0,0 +1 @@ +Specify RuntimeIdentifier in Directory.Build.props so VS knows which one to pick. Required since SelfContained was set From 0c5afc663208627bbb01eacf2bbce5faeb920589 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 03:02:09 +0000 Subject: [PATCH 3/7] Bump codecov/codecov-action from 4.6.0 to 5.0.2 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.6.0 to 5.0.2. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v4.6.0...v5.0.2) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3463785a0..8640b7790 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -101,7 +101,7 @@ jobs: "$cov" - name: upload coverage to codecov if: ${{ matrix.os == 'linux' }} - uses: codecov/codecov-action@v4.6.0 + uses: codecov/codecov-action@v5.0.2 with: token: ${{ secrets.CODECOV_TOKEN }} directory: coverage/ From f5e5fdff545c30400b906577dddff475bb85b01f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 04:00:17 +0000 Subject: [PATCH 4/7] Bump NUnit.Analyzers from 4.3.0 to 4.4.0 Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/nunit/nunit.analyzers/releases) - [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.md) - [Commits](https://github.com/nunit/nunit.analyzers/compare/4.3.0...4.4.0) --- updated-dependencies: - dependency-name: NUnit.Analyzers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- tests/SmiServices.IntegrationTests/packages.lock.json | 6 +++--- tests/SmiServices.UnitTests/packages.lock.json | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 25c1612d4..99c697781 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -35,7 +35,7 @@ - + diff --git a/tests/SmiServices.IntegrationTests/packages.lock.json b/tests/SmiServices.IntegrationTests/packages.lock.json index 5341d8000..14c307181 100644 --- a/tests/SmiServices.IntegrationTests/packages.lock.json +++ b/tests/SmiServices.IntegrationTests/packages.lock.json @@ -65,9 +65,9 @@ }, "NUnit.Analyzers": { "type": "Direct", - "requested": "[4.3.0, )", - "resolved": "4.3.0", - "contentHash": "Ki4p1XrmnYil64HE9VkJSuo6KBr8vg7Mut43atYvItDp3HwIcRY5hi+n5o8GaX1IBCwYLaJgW5ZfZuBVPYXEkg==" + "requested": "[4.4.0, )", + "resolved": "4.4.0", + "contentHash": "VVl1CuQttXRZh52HRw5SIOut3qXw4pmuiTYk02jTELVWZ9uYRY8IVl2qF9Zs7W0ElPiLDUrAglFBzNLBCPzEcw==" }, "NUnit3TestAdapter": { "type": "Direct", diff --git a/tests/SmiServices.UnitTests/packages.lock.json b/tests/SmiServices.UnitTests/packages.lock.json index 50b999fae..0ffc51d44 100644 --- a/tests/SmiServices.UnitTests/packages.lock.json +++ b/tests/SmiServices.UnitTests/packages.lock.json @@ -65,9 +65,9 @@ }, "NUnit.Analyzers": { "type": "Direct", - "requested": "[4.3.0, )", - "resolved": "4.3.0", - "contentHash": "Ki4p1XrmnYil64HE9VkJSuo6KBr8vg7Mut43atYvItDp3HwIcRY5hi+n5o8GaX1IBCwYLaJgW5ZfZuBVPYXEkg==" + "requested": "[4.4.0, )", + "resolved": "4.4.0", + "contentHash": "VVl1CuQttXRZh52HRw5SIOut3qXw4pmuiTYk02jTELVWZ9uYRY8IVl2qF9Zs7W0ElPiLDUrAglFBzNLBCPzEcw==" }, "NUnit3TestAdapter": { "type": "Direct", From fc370d7f9f967c4ac8286f6d3222224d9005eca9 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Mon, 18 Nov 2024 12:08:49 +0000 Subject: [PATCH 5/7] fix UpdateValues/Updater for postgres Postgres does not allow fully-qualified column names as part of the `SET` clause in `UPDATE` statements. Other databases work with either, so this fix allows support for all. --- src/SmiServices/Microservices/UpdateValues/Updater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SmiServices/Microservices/UpdateValues/Updater.cs b/src/SmiServices/Microservices/UpdateValues/Updater.cs index dd89dd67e..2ff0c5a38 100644 --- a/src/SmiServices/Microservices/UpdateValues/Updater.cs +++ b/src/SmiServices/Microservices/UpdateValues/Updater.cs @@ -129,7 +129,7 @@ protected static string GetFieldEqualsValueExpression(DiscoveredColumn col, stri { StringBuilder builder = new(); - builder.Append(col.GetFullyQualifiedName()); + builder.Append(col.GetWrappedName()); builder.Append(' '); builder.Append(op ?? "="); builder.Append(' '); From 0de1d6118d41e43c34529b98bff33a55c2bc08e1 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Mon, 18 Nov 2024 12:10:36 +0000 Subject: [PATCH 6/7] add news file --- news/2003-bugfix.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/2003-bugfix.md diff --git a/news/2003-bugfix.md b/news/2003-bugfix.md new file mode 100644 index 000000000..21cc23ee3 --- /dev/null +++ b/news/2003-bugfix.md @@ -0,0 +1 @@ +Fix UpdateValues/Updater to work with postgres From cadb8c7d3376c9ef00239c143620a32c0a345339 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Mon, 18 Nov 2024 12:38:30 +0000 Subject: [PATCH 7/7] v5.10.3 --- CHANGELOG.md | 13 ++++++++++++- SharedAssemblyInfo.cs | 6 +++--- news/1997-meta.md | 1 - news/2003-bugfix.md | 1 - 4 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 news/1997-meta.md delete mode 100644 news/2003-bugfix.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f8756944..9463a7250 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,16 @@ A raw git diff can be seen [here][unreleased]. +## [5.10.3] 2024-11-18 + +### Bugfix + +- [#2003](https://github.com/SMI/SmiServices/pull/2003) by rkm. Fix UpdateValues/Updater to work with postgres + +### Meta + +- [#1997](https://github.com/SMI/SmiServices/pull/1997) by rkm. Specify RuntimeIdentifier in Directory.Build.props so VS knows which one to pick. Required since SelfContained was set + ## [5.10.2] 2024-11-17 ### Bugfix @@ -1459,6 +1469,7 @@ First stable release after importing the repository from the private [5.10.0]: https://github.com/SMI/SmiServices/compare/v5.9.0...v5.10.0 [5.10.1]: https://github.com/SMI/SmiServices/compare/v5.10.0...v5.10.1 [5.10.2]: https://github.com/SMI/SmiServices/compare/v5.10.1...v5.10.2 +[5.10.3]: https://github.com/SMI/SmiServices/compare/v5.10.2...v5.10.3 [5.2.0]: https://github.com/SMI/SmiServices/compare/v5.1.3...v5.2.0 [5.3.0]: https://github.com/SMI/SmiServices/compare/v5.2.0...v5.3.0 [5.4.0]: https://github.com/SMI/SmiServices/compare/v5.3.0...v5.4.0 @@ -1470,4 +1481,4 @@ First stable release after importing the repository from the private [5.7.2]: https://github.com/SMI/SmiServices/compare/v5.7.1...v5.7.2 [5.8.0]: https://github.com/SMI/SmiServices/compare/v5.7.2...v5.8.0 [5.9.0]: https://github.com/SMI/SmiServices/compare/v5.8.0...v5.9.0 -[unreleased]: https://github.com/SMI/SmiServices/compare/v5.10.2...main +[unreleased]: https://github.com/SMI/SmiServices/compare/v5.10.3...main diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index dd64faf00..4180b5dd4 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -7,6 +7,6 @@ [assembly: AssemblyCulture("")] // These should be overwritten by release builds -[assembly: AssemblyVersion("5.10.2")] -[assembly: AssemblyFileVersion("5.10.2")] -[assembly: AssemblyInformationalVersion("5.10.2")] // This one can have the extra build info after it +[assembly: AssemblyVersion("5.10.3")] +[assembly: AssemblyFileVersion("5.10.3")] +[assembly: AssemblyInformationalVersion("5.10.3")] // This one can have the extra build info after it diff --git a/news/1997-meta.md b/news/1997-meta.md deleted file mode 100644 index ec99800cf..000000000 --- a/news/1997-meta.md +++ /dev/null @@ -1 +0,0 @@ -Specify RuntimeIdentifier in Directory.Build.props so VS knows which one to pick. Required since SelfContained was set diff --git a/news/2003-bugfix.md b/news/2003-bugfix.md deleted file mode 100644 index 21cc23ee3..000000000 --- a/news/2003-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Fix UpdateValues/Updater to work with postgres