[PR #1231] [MERGED] Fix google protobuf WellKnownTypes: Empty, Duration and Timestamp #1291

New Issue

Closed

opened 2025-12-29 09:19:11 +01:00 by adam · 0 comments

adam commented 2025-12-29 09:19:11 +01:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/wiremock/WireMock.Net/pull/1231
Author: @StefH
Created: 1/2/2025
Status: ✅ Merged
Merged: 1/9/2025
Merged by: @StefH

Base: master ← Head: stef-1228-grpc-timestamp_duration

---

📝 Commits (10+)

• f244694 Fix google protobuf WellKnownTypes: Timestamp and Duration
• c4f6ffa Merge branch 'master' into stef-1228-grpc-timestamp_duration
• 38d78fc Fix protobuf Empty
• a2aff80 .
• 16d0fde small refactor
• 11aea23 006
• cc827ea fix
• 822206c policy
• 17df996 ---
• a8b9e45

📊 Changes

15 files changed (+413 additions, -79 deletions)

View changed files

📝 src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs (+16 -17)
📝 src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.AtUrl.cs (+1 -1)
📝 src/WireMock.Net/Json/JObjectExtensions.cs (+4 -6)
📝 src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs (+1 -1)
📝 src/WireMock.Net/RequestBuilders/Request.WithBodyAsProtoBuf.cs (+0 -1)
📝 src/WireMock.Net/ResponseBuilders/Response.WithBody.cs (+6 -4)
📝 src/WireMock.Net/Util/ProtoBufUtils.cs (+1 -1)
📝 src/WireMock.Net/WireMock.Net.csproj (+2 -1)
📝 test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs (+2 -0)
📝 test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs (+2 -0)
📝 test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs (+299 -24)
📝 test/WireMock.Net.Tests/Grpc/greet.proto (+26 -18)
➕ test/WireMock.Net.Tests/Grpc/policy.proto (+40 -0)
📝 test/WireMock.Net.Tests/WireMock.Net.Tests.csproj (+7 -1)
📝 test/WireMock.Net.Tests/WireMockServerTests.cs (+6 -4)

📄 Description

No description provided

---

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/wiremock/WireMock.Net/pull/1231 **Author:** [@StefH](https://github.com/StefH) **Created:** 1/2/2025 **Status:** ✅ Merged **Merged:** 1/9/2025 **Merged by:** [@StefH](https://github.com/StefH) **Base:** `master` ← **Head:** `stef-1228-grpc-timestamp_duration` --- ### 📝 Commits (10+) - [`f244694`](https://github.com/wiremock/WireMock.Net/commit/f2446946c1d1bca4ae77b42bd776b907b43a643a) Fix google protobuf WellKnownTypes: Timestamp and Duration - [`c4f6ffa`](https://github.com/wiremock/WireMock.Net/commit/c4f6ffa66fdc8a272b4f6c8888f99591ce6d0741) Merge branch 'master' into stef-1228-grpc-timestamp_duration - [`38d78fc`](https://github.com/wiremock/WireMock.Net/commit/38d78fc9b66dbb404607d216e1a33581f671ab7e) Fix protobuf Empty - [`a2aff80`](https://github.com/wiremock/WireMock.Net/commit/a2aff80d28e4a81be6d033a1f7279588d1352475) . - [`16d0fde`](https://github.com/wiremock/WireMock.Net/commit/16d0fdef8659caeea3ab36bb49ac4896861389cd) small refactor - [`11aea23`](https://github.com/wiremock/WireMock.Net/commit/11aea23aa5266603cdbf4cf7f9d0be76bbd6d54c) 006 - [`cc827ea`](https://github.com/wiremock/WireMock.Net/commit/cc827ea3ec43ec6a0c9af55f25520353f3d99fdf) fix - [`822206c`](https://github.com/wiremock/WireMock.Net/commit/822206cd60b1ffa7de72f23d2ed3b41ccb903c0f) policy - [`17df996`](https://github.com/wiremock/WireMock.Net/commit/17df99603c454eac38bbda7aa9cc394cb97cdc29) --- - [`a8b9e45`](https://github.com/wiremock/WireMock.Net/commit/a8b9e45cc98839bb099eaf29c77f7251cbb62c79) <PackageReference Include="ProtoBufJsonConverter" Version="0.7.0" /> ### 📊 Changes **15 files changed** (+413 additions, -79 deletions) <details> <summary>View changed files</summary> 📝 `src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs` (+16 -17) 📝 `src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.AtUrl.cs` (+1 -1) 📝 `src/WireMock.Net/Json/JObjectExtensions.cs` (+4 -6) 📝 `src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs` (+1 -1) 📝 `src/WireMock.Net/RequestBuilders/Request.WithBodyAsProtoBuf.cs` (+0 -1) 📝 `src/WireMock.Net/ResponseBuilders/Response.WithBody.cs` (+6 -4) 📝 `src/WireMock.Net/Util/ProtoBufUtils.cs` (+1 -1) 📝 `src/WireMock.Net/WireMock.Net.csproj` (+2 -1) 📝 `test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs` (+2 -0) 📝 `test/WireMock.Net.Tests/Facts/RunOnDockerPlatformFact.cs` (+2 -0) 📝 `test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs` (+299 -24) 📝 `test/WireMock.Net.Tests/Grpc/greet.proto` (+26 -18) ➕ `test/WireMock.Net.Tests/Grpc/policy.proto` (+40 -0) 📝 `test/WireMock.Net.Tests/WireMock.Net.Tests.csproj` (+7 -1) 📝 `test/WireMock.Net.Tests/WireMockServerTests.cs` (+6 -4) </details> ### 📄 Description _No description provided_ --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

adam added the pull-request label 2025-12-29 09:19:11 +01:00

adam closed this issue 2025-12-29 09:19:11 +01:00

adam referenced this issue 2025-12-29 09:19:18 +01:00

[PR #1291] [MERGED] Update ProtoBufJsonConverter to fix conflict for 'MessageOptions' #1319

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

master

mime-part-matcher

version-2.x

MappingSerializer

1341-mapping-json

stef-aspire-tests-updates

bug/973-TinyMapper

bug/1149-AppendGuidToSavedMappingFile

feature/1150-DockerImageVersion

61

stef-1108

stef-1097

stef-1083-MessageOptions_Type_Conflict

stef-1062-logger

stef-IgnoreOpenApiErrors

stef-928-TypeLoadException-FluentAssertions-net472

nunit

stef-849

stef-847-regex-questionmark

http_verb

WireMockServerContext

webapp

ai

CommandLineArgumentsParser

1.23.0

1.22.0

1.21.0

1.20.0

1.19.0

1.18.0

1.17.0

1.16.0

1.15.0

1.14.0

1.13.0

1.12.0

1.11.2

1.11.0

1.10.1

1.10.0

1.9.1

1.9.0

1.8.18

1.8.17

1.8.16

1.8.15

1.8.14

1.8.13

1.8.12

1.8.11

1.8.10

1.8.9

1.8.8

1.8.7

1.8.6

1.8.5

1.8.3

1.8.2

1.8.1

1.8.0

1.7.4

1.7.3

1.7.2

1.7.1

1.7.0

1.6.12

1.6.11

1.6.10

1.6.9

1.6.8

1.6.7

1.6.6

1.6.5

1.6.4

1.6.3

1.6.2

1.6.1

1.6.0

1.5.62

1.5.61

1.5.60

1.5.59

1.5.58

1.5.57

1.5.56

1.5.55

1.5.54

1.5.53

1.5.52

1.5.51

1.5.50

1.5.49

1.5.48

1.5.47

1.5.46

1.5.45

1.5.44

1.5.43

1.5.42

1.5.41

1.5.40

1.5.39

1.5.38

1.5.37

1.5.36

1.5.35

1.5.34

1.5.33

1.5.32

1.5.31

1.5.30

1.5.29

1.5.28

1.5.27

1.5.26

1.5.25

1.5.24

1.5.23

1.5.22

1.5.21

1.5.20

1.5.19

1.5.18

1.5.17

1.5.16

1.5.15

1.5.14

1.5.13

1.5.12

1.5.11

1.5.10

1.5.9

1.5.8

1.5.7

1.5.6

1.5.5

1.5.4

1.5.3

1.5.2

1.5.1

1.5.0

1.4.43

1.4.42

1.4.41

1.4.40

1.4.39

1.4.38

1.4.37

1.4.36

1.4.35

1.4.34

1.4.33

1.4.32

1.4.31

1.4.30

1.4.29

1.4.28

1.4.27

1.4.26

1.4.25

1.4.24

1.4.23

1.4.22

1.4.21

1.4.20

1.4.19

1.4.18

1.4.17

1.4.16

1.4.15

1.4.14

1.4.13

1.4.12

1.4.11

1.4.10

1.4.9

1.4.8

1.4.7

1.4.6

1.4.5

1.4.4

1.4.3

1.4.2

1.4.1

1.4.0

1.3.10

1.3.9

1.3.8

1.3.6

1.3.5

1.3.4

1.3.3

1.3.2

1.3.1

1.3.0

1.2.18

1.2.17

1.2.16

1.2.15

1.2.14

1.2.13

1.2.12

1.2.11.0

1.2.10

1.2.9.0

1.2.8.0

1.2.7.0

1.2.6.0

1.2.5.0

1.2.4.0

1.2.3.0

1.2.2.0

1.2.1.0

1.2.0.0

1.1.10

1.1.9.0

1.1.8.0

1.1.7.0

1.1.6.0

1.1.5.0

1.1.3.0

1.1.2.0

1.1.1.0

1.1.0.0

1.0.43.0

1.0.42.0

1.0.41.0

1.0.40.0

1.0.39.0

1.0.38.0

1.0.37.0

1.0.36.0

1.0.35.0

1.0.34.0

1.0.33.0

1.0.32.0

1.0.31.0

1.0.29.0

1.0.28.0

1.0.25.0

1.0.24.0

1.0.23.0

1.0.22.0

1.0.21.0

1.0.20.0

1.0.19.0

1.0.18.0

1.0.17.0

1.0.16.0

1.0.15.0

1.0.14.0

1.0.13.0

1.0.12.0

1.0.11.0

1.0.10.0

1.0.9.0

1.0.8.0

1.0.7.0

1.0.6.1

1.0.6

1.0.5

1.0.4.21

1.0.4.20

1.0.4.19

1.0.4.18

1.0.4.17

1.0.4.16

1.0.4.15

1.0.4.14

1.0.4.13

1.0.4.12

1.0.4.11

1.0.4.10

1.0.4.9

1.0.4.8

1.0.4.7

1.0.4.6

1.0.4.5

1.0.4.4

1.0.4.3

1.0.4.2

1.0.4.1

1.0.4.0

1.0.3.20

1.0.3.19

1.0.3.18

1.0.3.17

1.0.3.16

1.0.3.15

1.0.3.14

1.0.3.13

1.0.3.12

1.0.3.11

1.0.3.10

1.0.3.9

1.0.3.8

1.0.3.7

1.0.3.6

1.0.3.5

1.0.3.4

1.0.3.3

1.0.3.2

1.0.3.1

1.0.3.0

1.0.2.13

1.0.2.12

1.0.2.11

1.0.2.10

1.0.2.9

1.0.2.8

1.0.2.7

1.0.2.6

1.0.2.5

1.0.2.4

1.0.2.1

1.0.2.0

1.0.1.5

1.0.1.3

1.0.1.2

1.0.1.1

1.0.0.0

Labels

Clear labels

bug

bug

doc

doc

duplicate

feature

feature

invalid

pull-request

Mirrored from GitHub Pull Request

question

wontfix

No Label pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

adam

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/WireMock.Net#1291