Skip to content

Commit 180526b

Browse files
committed
Merge branch 'release/1.1.0'
2 parents f5a0fd5 + 9dac9eb commit 180526b

File tree

4 files changed

+50
-14
lines changed

4 files changed

+50
-14
lines changed

azure-pipelines.yml

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,71 @@
11
trigger:
2-
- master
3-
- develop
4-
- release/*
2+
branches:
3+
include:
4+
- master
5+
- develop
6+
- refs/tags/v*
7+
- release/*
8+
- feature/*
9+
- hotfix/*
510

611
pool:
712
vmImage: 'windows-latest'
813

914
variables:
10-
solution: 'OpenMatch.csharp.sln'
11-
buildConfiguration: 'Release'
15+
Solution: 'OpenMatch.csharp.sln'
16+
BuildConfiguration: 'Release'
1217

1318
steps:
19+
- task: UseDotNet@2
20+
inputs:
21+
version: '3.1.x'
22+
packageType: runtime
23+
1424
- task: DotNetCoreCLI@2
1525
name: Restore
1626
inputs:
1727
command: 'restore'
1828
projects: |
19-
$(solution)
29+
$(Solution)
2030
2131
- task: DotNetCoreCLI@2
2232
name: Build
2333
inputs:
2434
command: 'build'
2535
projects: |
26-
$(solution)
27-
arguments: -c $(buildConfiguration)
36+
$(Solution)
37+
arguments: -c $(BuildConfiguration)
2838

2939
- task: DotNetCoreCLI@2
3040
name: Test
3141
inputs:
3242
command: 'test'
3343
projects: |
34-
$(solution)
35-
arguments: -c $(buildConfiguration)
44+
$(Solution)
45+
arguments: -c $(BuildConfiguration) --collect "Code coverage"
46+
47+
- task: DotNetCoreCLI@2
48+
inputs:
49+
command: publish
50+
projects: src/OpenMatch/OpenMatch.csproj
51+
arguments: --configuration $(BuildConfiguration) --output $(Build.ArtifactStagingDirectory)/OpenMatch.Api
52+
publishWebProjects: false
53+
zipAfterPublish: false
54+
55+
- task: PublishBuildArtifacts@1
56+
inputs:
57+
pathToPublish: $(Build.ArtifactStagingDirectory)/OpenMatch.Api
58+
artifactName: Build Output
59+
60+
- task: DotNetCoreCLI@2
61+
name: Pack
62+
inputs:
63+
command: pack
64+
packagesToPack: src/OpenMatch/OpenMatch.csproj
65+
arguments: -c $(BuildConfiguration)
66+
packDirectory: $(Build.ArtifactStagingDirectory)/nuget
67+
68+
- task: PublishBuildArtifacts@1
69+
inputs:
70+
pathtoPublish: $(Build.ArtifactStagingDirectory)/nuget
71+
artifactName: Nuget package

src/OpenMatch/OpenMatch.csproj

Lines changed: 1 addition & 1 deletion
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.0.0</Version>
7+
<Version>1.1.0</Version>
88
<PackageDescription>C# API for OpenMatch</PackageDescription>
99
<Authors>Yoann Potinet</Authors>
1010
<Company>FrozenStorm Interactive</Company>

src/OpenMatch/proto/api/matchfunction.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ message RunResponse {
6969
// The MatchFunction service implements APIs to run user-defined matchmaking logics.
7070
service MatchFunction {
7171
// DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.
72-
// Run pulls Tickets that satisify Profile constraints from QueryService, runs matchmaking logics against them, then
72+
// Run pulls Tickets that satisfy Profile constraints from QueryService, runs matchmaking logics against them, then
7373
// constructs and streams back match candidates to the Backend service.
7474
rpc Run(RunRequest) returns (stream RunResponse) {
7575
option (google.api.http) = {

src/OpenMatch/proto/api/query.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ service QueryService {
8080
// QueryTickets gets a list of Tickets that match all Filters of the input Pool.
8181
// - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.
8282
// QueryTickets pages the Tickets by `queryPageSize` and stream back responses.
83-
// - queryPageSize is default to 1000 if not set, and has a mininum of 10 and maximum of 10000.
83+
// - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.
8484
rpc QueryTickets(QueryTicketsRequest) returns (stream QueryTicketsResponse) {
8585
option (google.api.http) = {
8686
post: "/v1/queryservice/tickets:query"
@@ -91,7 +91,7 @@ service QueryService {
9191
// QueryTicketIds gets the list of TicketIDs that meet all the filtering criteria requested by the pool.
9292
// - If the Pool contains no Filters, QueryTicketIds will return all TicketIDs in the state storage.
9393
// QueryTicketIds pages the TicketIDs by `queryPageSize` and stream back responses.
94-
// - queryPageSize is default to 1000 if not set, and has a mininum of 10 and maximum of 10000.
94+
// - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.
9595
rpc QueryTicketIds(QueryTicketIdsRequest) returns (stream QueryTicketIdsResponse) {
9696
option (google.api.http) = {
9797
post: "/v1/queryservice/ticketids:query"

0 commit comments

Comments
 (0)