Skip to content

Commit c9e1b37

Browse files
committed
Merge branch 'release/1.3.0'
2 parents b8d2057 + 1e22026 commit c9e1b37

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variables:
1818
steps:
1919
- task: UseDotNet@2
2020
inputs:
21-
version: '3.1.x'
21+
version: '6.0.x'
2222
packageType: runtime
2323

2424
- task: DotNetCoreCLI@2

src/OpenMatch.Tests/OpenMatch.Tests.csproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
4+
<TargetFramework>net6.0</TargetFramework>
65
<IsPackable>false</IsPackable>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
11-
<PackageReference Include="xunit" Version="2.4.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
13-
<PackageReference Include="coverlet.collector" Version="1.2.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
10+
<PackageReference Include="xunit" Version="2.4.1" />
11+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
12+
<PackageReference Include="coverlet.collector" Version="3.1.2">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
15+
</PackageReference>
1416
</ItemGroup>
1517

1618
<ItemGroup>

src/OpenMatch/OpenMatch.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netstandard2.1</TargetFramework>
55
<PackageId>OpenMatch.Api</PackageId>
66
<Title>OpenMatch Api</Title>
7-
<Version>1.2.0</Version>
7+
<Version>1.3.0</Version>
88
<PackageDescription>C# API for OpenMatch</PackageDescription>
99
<Authors>Yoann Potinet</Authors>
1010
<Company>FrozenStorm Interactive</Company>
@@ -29,9 +29,9 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Grpc.Net.Client" Version="2.38.0" />
33-
<PackageReference Include="Google.Protobuf" Version="3.17.0" />
34-
<PackageReference Include="Grpc.Tools" Version="2.38.0">
32+
<PackageReference Include="Grpc.Net.Client" Version="2.46.0" />
33+
<PackageReference Include="Google.Protobuf" Version="3.21.1" />
34+
<PackageReference Include="Grpc.Tools" Version="2.46.3">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3737
</PackageReference>

src/OpenMatch/proto/api/frontend.proto

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,16 @@ message AcknowledgeBackfillRequest {
9191
Assignment assignment = 2;
9292
}
9393

94+
// BETA FEATURE WARNING: This Request message is not finalized and still subject
95+
// to possible change or removal.
96+
message AcknowledgeBackfillResponse {
97+
// The Backfill that was acknowledged.
98+
Backfill backfill = 1;
99+
100+
// All of the Tickets that were successfully assigned
101+
repeated Ticket tickets = 2;
102+
}
103+
94104
// BETA FEATURE WARNING: This Request message is not finalized and still subject
95105
// to possible change or removal.
96106
message CreateBackfillRequest {
@@ -163,7 +173,7 @@ service FrontendService {
163173
// This triggers an assignment process.
164174
// BETA FEATURE WARNING: This call and the associated Request and Response
165175
// messages are not finalized and still subject to possible change or removal.
166-
rpc AcknowledgeBackfill(AcknowledgeBackfillRequest) returns (Backfill) {
176+
rpc AcknowledgeBackfill(AcknowledgeBackfillRequest) returns (AcknowledgeBackfillResponse) {
167177
option (google.api.http) = {
168178
post: "/v1/frontendservice/backfills/{backfill_id}/acknowledge"
169179
body: "*"

0 commit comments

Comments
 (0)