Skip to content

Commit 9e51365

Browse files
MaggieKimani1MaggieKimani1
authored
Merge branch 'vnext' into mk/upgrade-system-commandline
2 parents 8a91397 + 2d8212e commit 9e51365

File tree

65 files changed

+916
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+916
-91
lines changed

‎.azure-pipelines/ci-build.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,30 +157,18 @@ stages:
157157
}
158158
]
159159
SessionTimeout: 20
160-
160+
161161
# Pack
162-
- task: DotNetCoreCLI@2
162+
- pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
163163
displayName: 'pack OpenAPI'
164-
inputs:
165-
command: pack
166-
projects: src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
167-
arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
168164

169165
# Pack
170-
- task: DotNetCoreCLI@2
166+
- pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
171167
displayName: 'pack Readers'
172-
inputs:
173-
command: pack
174-
projects: src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
175-
arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
176-
168+
177169
# Pack
178-
- task: DotNetCoreCLI@2
179-
displayName: 'pack Hidi'
180-
inputs:
181-
command: pack
182-
projects: src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
183-
arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
170+
- pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
171+
displayName: 'pack Hidi'
184172

185173
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
186174
displayName: 'ESRP CodeSigning Nuget Packages'
@@ -290,6 +278,7 @@ stages:
290278
displayName: 'GitHub release (edit)'
291279
inputs:
292280
gitHubConnection: 'Github-MaggieKimani1'
281+
action: edit
293282
tagSource: userSpecifiedTag
294283
tag: '$(artifactVersion)'
295284
title: '$(artifactVersion)'

‎.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ jobs:
3030
id: getversion
3131
- name: Push to GitHub Packages - Nightly
3232
if: ${{ github.ref == 'refs/heads/vnext' }}
33-
uses: docker/build-push-action@v3.0.0
33+
uses: docker/build-push-action@v3.1.0
3434
with:
3535
push: true
3636
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
3737
- name: Push to GitHub Packages - Release
3838
if: ${{ github.ref == 'refs/heads/master' }}
39-
uses: docker/build-push-action@v3.0.0
39+
uses: docker/build-push-action@v3.1.0
4040
with:
4141
push: true
4242
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}

‎Microsoft.OpenApi.Hidi.Tests/Microsoft.OpenApi.Hidi.Tests.csproj

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
8+
<IsPackable>false</IsPackable>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0-preview-20220612-01" />
13+
<PackageReference Include="Moq" Version="4.18.1" />
14+
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
<PrivateAssets>all</PrivateAssets>
18+
</PackageReference>
19+
<PackageReference Include="coverlet.collector" Version="3.1.2">
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
<PrivateAssets>all</PrivateAssets>
22+
</PackageReference>
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<ProjectReference Include="..\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj" />
27+
<ProjectReference Include="..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
28+
</ItemGroup>
29+
30+
<ItemGroup>
31+
<Compile Update="UtilityFiles\OpenApiDocumentMock.cs">
32+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
33+
</Compile>
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<None Update="UtilityFiles\postmanCollection_ver1.json">
38+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
39+
</None>
40+
<None Update="UtilityFiles\postmanCollection_ver2.json">
41+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
42+
</None>
43+
<None Update="UtilityFiles\postmanCollection_ver3.json">
44+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
45+
</None>
46+
<None Update="UtilityFiles\postmanCollection_ver4.json">
47+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
48+
</None>
49+
<None Update="UtilityFiles\Todo.xml">
50+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
51+
</None>
52+
</ItemGroup>
53+
54+
</Project>

‎test/Microsoft.OpenApi.Tests/Services/OpenApiFilterServiceTests.cs renamed to ‎Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

44
using System;
@@ -135,5 +135,22 @@ public void ThrowsInvalidOperationExceptionInCreatePredicateWhenInvalidArguments
135135
var message2 = Assert.Throws<InvalidOperationException>(() => OpenApiFilterService.CreatePredicate("users.user.ListUser", "users.user")).Message;
136136
Assert.Equal("Cannot specify both operationIds and tags at the same time.", message2);
137137
}
138+
139+
[Theory]
140+
[InlineData("reports.getTeamsUserActivityUserDetail-a3f1", null)]
141+
[InlineData(null, "reports.Functions")]
142+
public void ReturnsPathParametersOnSlicingBasedOnOperationIdsOrTags(string operationIds, string tags)
143+
{
144+
// Act
145+
var predicate = OpenApiFilterService.CreatePredicate(operationIds, tags);
146+
var subsetOpenApiDocument = OpenApiFilterService.CreateFilteredDocument(_openApiDocumentMock, predicate);
147+
148+
// Assert
149+
foreach (var pathItem in subsetOpenApiDocument.Paths)
150+
{
151+
Assert.True(pathItem.Value.Parameters.Any());
152+
Assert.Equal(1, pathItem.Value.Parameters.Count);
153+
}
154+
}
138155
}
139156
}

‎test/Microsoft.OpenApi.Tests/Services/OpenApiServiceTests.cs renamed to ‎Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs

File renamed without changes.

‎test/Microsoft.OpenApi.Tests/UtilityFiles/OpenApiDocumentMock.cs renamed to ‎Microsoft.OpenApi.Hidi.Tests/UtilityFiles/OpenApiDocumentMock.cs

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,21 @@ public static OpenApiDocument CreateOpenApiDocument()
116116
}
117117
}
118118
}
119+
},
120+
Parameters = new List<OpenApiParameter>
121+
{
122+
{
123+
new OpenApiParameter()
124+
{
125+
Name = "period",
126+
In = ParameterLocation.Path,
127+
Required = true,
128+
Schema = new OpenApiSchema()
129+
{
130+
Type = "string"
131+
}
132+
}
133+
}
119134
}
120135
},
121136
["/reports/microsoft.graph.getTeamsUserActivityUserDetail(date={date})"] = new OpenApiPathItem()
@@ -175,7 +190,20 @@ public static OpenApiDocument CreateOpenApiDocument()
175190
}
176191
}
177192
}
178-
}
193+
},
194+
Parameters = new List<OpenApiParameter>
195+
{
196+
new OpenApiParameter
197+
{
198+
Name = "period",
199+
In = ParameterLocation.Path,
200+
Required = true,
201+
Schema = new OpenApiSchema()
202+
{
203+
Type = "string"
204+
}
205+
}
206+
}
179207
},
180208
["/users"] = new OpenApiPathItem()
181209
{

‎test/Microsoft.OpenApi.Tests/UtilityFiles/Todo.xml renamed to ‎Microsoft.OpenApi.Hidi.Tests/UtilityFiles/Todo.xml

File renamed without changes.

‎test/Microsoft.OpenApi.Tests/UtilityFiles/postmanCollection_ver1.json renamed to ‎Microsoft.OpenApi.Hidi.Tests/UtilityFiles/postmanCollection_ver1.json

File renamed without changes.

‎test/Microsoft.OpenApi.Tests/UtilityFiles/postmanCollection_ver2.json renamed to ‎Microsoft.OpenApi.Hidi.Tests/UtilityFiles/postmanCollection_ver2.json

File renamed without changes.

‎test/Microsoft.OpenApi.Tests/UtilityFiles/postmanCollection_ver3.json renamed to ‎Microsoft.OpenApi.Hidi.Tests/UtilityFiles/postmanCollection_ver3.json

File renamed without changes.

0 commit comments

Comments
 (0)