diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8b7538f..f516c9d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,35 +1,71 @@ trigger: - - master - - develop - - release/* + branches: + include: + - master + - develop + - refs/tags/v* + - release/* + - feature/* + - hotfix/* pool: vmImage: 'windows-latest' variables: - solution: 'OpenMatch.csharp.sln' - buildConfiguration: 'Release' + Solution: 'OpenMatch.csharp.sln' + BuildConfiguration: 'Release' steps: + - task: UseDotNet@2 + inputs: + version: '3.1.x' + packageType: runtime + - task: DotNetCoreCLI@2 name: Restore inputs: command: 'restore' projects: | - $(solution) + $(Solution) - task: DotNetCoreCLI@2 name: Build inputs: command: 'build' projects: | - $(solution) - arguments: -c $(buildConfiguration) + $(Solution) + arguments: -c $(BuildConfiguration) - task: DotNetCoreCLI@2 name: Test inputs: command: 'test' projects: | - $(solution) - arguments: -c $(buildConfiguration) + $(Solution) + arguments: -c $(BuildConfiguration) --collect "Code coverage" + + - task: DotNetCoreCLI@2 + inputs: + command: publish + projects: src/OpenMatch/OpenMatch.csproj + arguments: --configuration $(BuildConfiguration) --output $(Build.ArtifactStagingDirectory)/OpenMatch.Api + publishWebProjects: false + zipAfterPublish: false + + - task: PublishBuildArtifacts@1 + inputs: + pathToPublish: $(Build.ArtifactStagingDirectory)/OpenMatch.Api + artifactName: Build Output + + - task: DotNetCoreCLI@2 + name: Pack + inputs: + command: pack + packagesToPack: src/OpenMatch/OpenMatch.csproj + arguments: -c $(BuildConfiguration) + packDirectory: $(Build.ArtifactStagingDirectory)/nuget + + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: $(Build.ArtifactStagingDirectory)/nuget + artifactName: Nuget package diff --git a/src/OpenMatch/OpenMatch.csproj b/src/OpenMatch/OpenMatch.csproj index c7cf630..7319947 100644 --- a/src/OpenMatch/OpenMatch.csproj +++ b/src/OpenMatch/OpenMatch.csproj @@ -4,7 +4,7 @@ netstandard2.1 OpenMatch.Api OpenMatch Api - 1.0.0 + 1.1.0 C# API for OpenMatch Yoann Potinet FrozenStorm Interactive diff --git a/src/OpenMatch/proto/api/matchfunction.proto b/src/OpenMatch/proto/api/matchfunction.proto index 30d690d..9e1b16c 100644 --- a/src/OpenMatch/proto/api/matchfunction.proto +++ b/src/OpenMatch/proto/api/matchfunction.proto @@ -69,7 +69,7 @@ message RunResponse { // The MatchFunction service implements APIs to run user-defined matchmaking logics. service MatchFunction { // DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD. - // Run pulls Tickets that satisify Profile constraints from QueryService, runs matchmaking logics against them, then + // Run pulls Tickets that satisfy Profile constraints from QueryService, runs matchmaking logics against them, then // constructs and streams back match candidates to the Backend service. rpc Run(RunRequest) returns (stream RunResponse) { option (google.api.http) = { diff --git a/src/OpenMatch/proto/api/query.proto b/src/OpenMatch/proto/api/query.proto index dbb3c39..6fb4a48 100644 --- a/src/OpenMatch/proto/api/query.proto +++ b/src/OpenMatch/proto/api/query.proto @@ -80,7 +80,7 @@ service QueryService { // QueryTickets gets a list of Tickets that match all Filters of the input Pool. // - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage. // QueryTickets pages the Tickets by `queryPageSize` and stream back responses. - // - queryPageSize is default to 1000 if not set, and has a mininum of 10 and maximum of 10000. + // - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000. rpc QueryTickets(QueryTicketsRequest) returns (stream QueryTicketsResponse) { option (google.api.http) = { post: "/v1/queryservice/tickets:query" @@ -91,7 +91,7 @@ service QueryService { // QueryTicketIds gets the list of TicketIDs that meet all the filtering criteria requested by the pool. // - If the Pool contains no Filters, QueryTicketIds will return all TicketIDs in the state storage. // QueryTicketIds pages the TicketIDs by `queryPageSize` and stream back responses. - // - queryPageSize is default to 1000 if not set, and has a mininum of 10 and maximum of 10000. + // - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000. rpc QueryTicketIds(QueryTicketIdsRequest) returns (stream QueryTicketIdsResponse) { option (google.api.http) = { post: "/v1/queryservice/ticketids:query"