Skip to content

Commit 7f4bec8

Browse files
baywetbaywet
authored
Merge pull request #2275 from microsoft/fix/include-hidi-project-in-solution
fix: Include hidi in solution
2 parents f62e039 + 9074f40 commit 7f4bec8

File tree

5 files changed

+31
-17
lines changed

5 files changed

+31
-17
lines changed

‎.azure-pipelines/ci-build.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ extends:
140140
- 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
141141
displayName: 'pack OpenAPI'
142142

143-
# Pack readers
143+
# Pack YamlReader
144144
- pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
145-
displayName: 'pack Readers'
145+
displayName: 'pack YamlReader'
146146

147147
# Pack hidi
148-
# - 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
149-
# displayName: 'pack Hidi'
148+
- 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
149+
displayName: 'pack Hidi'
150150

151151
- task: EsrpCodeSigning@5
152152
displayName: 'ESRP CodeSigning Nuget Packages'
@@ -183,14 +183,14 @@ extends:
183183
PendingAnalysisWaitTimeoutMinutes: '5'
184184

185185
# publish hidi as an .exe
186-
# - task: DotNetCoreCLI@2
187-
# displayName: publish Hidi as executable
188-
# inputs:
189-
# command: 'publish'
190-
# arguments: -c Release --runtime win-x64 /p:PublishSingleFile=true /p:PackAsTool=false --self-contained --output $(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi
191-
# projects: 'src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj'
192-
# publishWebProjects: False
193-
# zipAfterPublish: false
186+
- task: DotNetCoreCLI@2
187+
displayName: publish Hidi as executable
188+
inputs:
189+
command: 'publish'
190+
arguments: -c Release --runtime win-x64 /p:PublishSingleFile=true /p:PackAsTool=false --self-contained --output $(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi
191+
projects: 'src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj'
192+
publishWebProjects: False
193+
zipAfterPublish: false
194194

195195
- task: CopyFiles@2
196196
displayName: Prepare staging folder for upload
@@ -259,7 +259,7 @@ extends:
259259
nuGetFeedType: external
260260
publishFeedCredentials: 'OpenAPI Nuget Connection'
261261

262-
- deployment: deploy_readers
262+
- deployment: deploy_yaml_reader
263263
templateContext:
264264
type: releaseJob
265265
isProduction: true

‎Microsoft.OpenApi.sln

+14
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6357D7FD-2
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Trimming.Tests", "test\Microsoft.OpenApi.Trimming.Tests\Microsoft.OpenApi.Trimming.Tests.csproj", "{1D2E0C6E-B103-4CB6-912E-D56FA1501296}"
2828
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Hidi", "src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj", "{538936B4-5E14-4EA3-9FD0-F43E2DD014FB}"
30+
EndProject
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Hidi.Tests", "test\Microsoft.OpenApi.Hidi.Tests\Microsoft.OpenApi.Hidi.Tests.csproj", "{6ADC5D41-EDD2-4206-B815-5DFF739C6832}"
32+
EndProject
2933
Global
3034
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3135
Debug|Any CPU = Debug|Any CPU
@@ -56,6 +60,14 @@ Global
5660
{1D2E0C6E-B103-4CB6-912E-D56FA1501296}.Debug|Any CPU.Build.0 = Debug|Any CPU
5761
{1D2E0C6E-B103-4CB6-912E-D56FA1501296}.Release|Any CPU.ActiveCfg = Release|Any CPU
5862
{1D2E0C6E-B103-4CB6-912E-D56FA1501296}.Release|Any CPU.Build.0 = Release|Any CPU
63+
{538936B4-5E14-4EA3-9FD0-F43E2DD014FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64+
{538936B4-5E14-4EA3-9FD0-F43E2DD014FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
65+
{538936B4-5E14-4EA3-9FD0-F43E2DD014FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
66+
{538936B4-5E14-4EA3-9FD0-F43E2DD014FB}.Release|Any CPU.Build.0 = Release|Any CPU
67+
{6ADC5D41-EDD2-4206-B815-5DFF739C6832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{6ADC5D41-EDD2-4206-B815-5DFF739C6832}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{6ADC5D41-EDD2-4206-B815-5DFF739C6832}.Release|Any CPU.ActiveCfg = Release|Any CPU
70+
{6ADC5D41-EDD2-4206-B815-5DFF739C6832}.Release|Any CPU.Build.0 = Release|Any CPU
5971
EndGlobalSection
6072
GlobalSection(SolutionProperties) = preSolution
6173
HideSolutionNode = FALSE
@@ -67,6 +79,8 @@ Global
6779
{AD83F991-DBF3-4251-8613-9CC54C826964} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
6880
{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
6981
{1D2E0C6E-B103-4CB6-912E-D56FA1501296} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
82+
{538936B4-5E14-4EA3-9FD0-F43E2DD014FB} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1}
83+
{6ADC5D41-EDD2-4206-B815-5DFF739C6832} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
7084
EndGlobalSection
7185
GlobalSection(ExtensibilityGlobals) = postSolution
7286
SolutionGuid = {9F171EFC-0DB5-4B10-ABFA-AF48D52CC565}

‎src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
</PackageReference>
3939
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
4040
<PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
41-
<PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview9" />
42-
<PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="2.0.0-preview2" />
41+
<PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.10" />
42+
<PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="2.0.0-preview3" />
4343
<PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
4444
</ItemGroup>
4545

‎src/Microsoft.OpenApi/Models/OpenApiSchema.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ private void SerializeAsV2(
724724
// readOnly
725725
// In V2 schema if a property is part of required properties of parent schema,
726726
// it cannot be marked as readonly.
727-
if (!string.IsNullOrEmpty(propertyName) && propertyName is not null && !parentRequiredProperties.Contains(propertyName))
727+
if (!parentRequiredProperties.Contains(propertyName ?? string.Empty))
728728
{
729729
writer.WriteProperty(name: OpenApiConstants.ReadOnly, value: ReadOnly, defaultValue: false);
730730
}

‎test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<!--<ProjectReference Include="..\..\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj" />-->
26+
<ProjectReference Include="..\..\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj" />
2727
<ProjectReference Include="..\..\src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj" />
2828
<ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
2929
</ItemGroup>

0 commit comments

Comments
 (0)