Master refresh - release hidi

.github/workflows/ci-cd.yml

@@ -59,85 +59,10 @@ jobs:
         id: build_projects
         shell: pwsh
         run: |
-          $projectsArray = @(
-            '.\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj',
-            '.\src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj',
-            '.\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj'
-          )
-          $gitNewVersion = if ("${{ steps.tag_generator.outputs.new_version }}") {"${{ steps.tag_generator.outputs.new_version }}"} else {$null}
-          $projectCurrentVersion = ([xml](Get-Content .\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj)).Project.PropertyGroup.Version
-          $projectNewVersion = $gitNewVersion ?? $projectCurrentVersion
-
-          $projectsArray | ForEach-Object {
-            dotnet build $PSItem `
-            -c Release # `
-            # -o $env:ARTIFACTS_FOLDER `
-            # /p:Version=$projectNewVersion 
-          }
-
-          # Move NuGet packages to separate folder for pipeline convenience
-          # New-Item Artifacts/NuGet -ItemType Directory
-          # Get-ChildItem Artifacts/*.nupkg | Move-Item -Destination "Artifacts/NuGet"
+          dotnet build Microsoft.OpenApi.sln -c Release
 
       - name: Run unit tests
         id: run_unit_tests
         shell: pwsh
         run: |
-          $testProjectsArray = @(
-            '.\test\Microsoft.OpenApi.Tests\Microsoft.OpenApi.Tests.csproj',
-            '.\test\Microsoft.OpenApi.Readers.Tests\Microsoft.OpenApi.Readers.Tests.csproj',
-            '.\test\Microsoft.OpenApi.SmokeTests\Microsoft.OpenApi.SmokeTests.csproj'
-          )
-
-          $testProjectsArray | ForEach-Object {
-            dotnet test $PSItem `
-            -c Release
-          }
-
-      # - if: steps.tag_generator.outputs.new_version != ''
-      #   name: Upload NuGet packages as artifacts
-      #   id: ul_packages_artifact
-      #   uses: actions/upload-artifact@v1
-      #   with:
-      #     name: NuGet packages
-      #     path: Artifacts/NuGet/
-
-  cd:
-    if: needs.ci.outputs.is_default_branch == 'true' && needs.ci.outputs.latest_version != ''
-    name: Continuous Deployment
-    needs: ci
-    runs-on: ubuntu-latest
-    steps:
-      # - name: Download and extract NuGet packages
-      #   id: dl_packages_artifact
-      #   uses: actions/download-artifact@v2
-      #   with:
-      #     name: NuGet packages
-      #     path: NuGet/
-
-      # - name: Push NuGet packages to NuGet.org
-      #   id: push_nuget_packages
-      #   continue-on-error: true
-      #   shell: pwsh
-      #   run: |
-      #     Get-ChildItem NuGet/*.nupkg | ForEach-Object {
-      #       nuget push $PSItem `
-      #       -ApiKey $env:NUGET_API_KEY `
-      #       -Source https://api.nuget.org/v3/index.json
-      #     }
-      #   env:
-      #     NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
-
-      - name: Create and publish release
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        with:
-          name: OpenApi v${{ needs.ci.outputs.latest_version }}
-          tag_name: v${{ needs.ci.outputs.latest_version }}
-          # files: |
-          #   NuGet/Microsoft.OpenApi.${{ needs.ci.outputs.latest_version }}.nupkg
-          #   NuGet/Microsoft.OpenApi.Readers.${{ needs.ci.outputs.latest_version }}.nupkg
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-# Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)
+          dotnet test Microsoft.OpenApi.sln -c Release -v n

Directory.Build.props

@@ -0,0 +1,25 @@
+<Project>
+  <PropertyGroup>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <Authors>Microsoft</Authors>
+    <Company>Microsoft</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET</RepositoryUrl>
+    <PackageReleaseNotes>https://github.com/microsoft/OpenAPI.NET/releases</PackageReleaseNotes>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <PackageTags>OpenAPI .NET</PackageTags>
+  </PropertyGroup>
+  <!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+      <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference
+     Condition="!$(MSBuildProjectName.EndsWith('Tests'))"
+     Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+  </ItemGroup>
+</Project>

Dockerfile

@@ -2,10 +2,12 @@ FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
 WORKDIR /app
 
 COPY ./src ./hidi/src
+COPY ./Directory.Build.props ./hidi/Directory.Build.props
+COPY ./README.md ./hidi/README.md
 WORKDIR /app/hidi
 RUN dotnet publish ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -c Release
 
-FROM mcr.microsoft.com/dotnet/runtime:7.0 as runtime
+FROM mcr.microsoft.com/dotnet/runtime:7.0 AS runtime
 WORKDIR /app
 
 COPY --from=build-env /app/hidi/src/Microsoft.OpenApi.Hidi/bin/Release/net7.0 ./

src/Microsoft.OpenApi.Hidi/Extensions/CommandExtensions.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
 using System.CommandLine;

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs

@@ -24,7 +24,7 @@ static PowerShellFormatter()
         {
             // Add singularization exclusions.
             // Enhancement: Read exclusions from a user provided file.
-            Vocabularies.Default.AddSingular("(drive)s$", "$1"); // drives does not properly singularize to drive.               
+            Vocabularies.Default.AddSingular("(drive)s$", "$1"); // drives does not properly singularize to drive.
             Vocabularies.Default.AddSingular("(data)$", "$1"); // exclude the following from singularization.
             Vocabularies.Default.AddSingular("(delta)$", "$1");
             Vocabularies.Default.AddSingular("(quota)$", "$1");
@@ -133,7 +133,7 @@ private static string SingularizeAndDeduplicateOperationId(IList<string> operati
 
                 singularizedSegments.Add(segment);
             }
-            return string.Join(".", singularizedSegments);
+            return string.Join('.', singularizedSegments);
         }
 
         private static string RemoveHashSuffix(string operationId)
@@ -153,7 +153,7 @@ private static string RemoveKeyTypeSegment(string operationId, IList<OpenApiPara
                     segments.Remove(keyTypeExtension);
                 }
             }
-            return string.Join(".", segments);
+            return string.Join('.', segments);
         }
 
         private static IList<OpenApiParameter> ResolveFunctionParameters(IList<OpenApiParameter> parameters)
@@ -179,7 +179,7 @@ private void AddAdditionalPropertiesToSchema(OpenApiSchema schema)
         {
             if (schema != null && !_schemaLoop.Contains(schema) && "object".Equals(schema.Type, StringComparison.OrdinalIgnoreCase))
             {
-                schema.AdditionalProperties = new OpenApiSchema() { Type = "object" };
+                schema.AdditionalProperties = new OpenApiSchema { Type = "object" };
 
                 /* Because 'additionalProperties' are now being walked,
                  * we need a way to keep track of visited schemas to avoid

src/Microsoft.OpenApi.Hidi/Logger.cs

@@ -21,7 +21,7 @@ public static ILoggerFactory ConfigureLogger(LogLevel logLevel)
                     {
                         c.IncludeScopes = true;
                     })
-#if DEBUG   
+#if DEBUG
                     .AddDebug()
 #endif
                     .SetMinimumLevel(logLevel);

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

@@ -7,29 +7,14 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackAsTool>true</PackAsTool>
     <Nullable>enable</Nullable>
-    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Authors>Microsoft</Authors>
-    <Company>Microsoft</Company>
-    <Title>Microsoft.OpenApi.Hidi</Title>
-    <PackageId>Microsoft.OpenApi.Hidi</PackageId>
     <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>1.3.0</Version>
+    <Version>1.3.1</Version>
     <Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
-    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <PackageTags>OpenAPI .NET</PackageTags>
-    <RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET</RepositoryUrl>
-    <PackageReleaseNotes>https://github.com/microsoft/OpenAPI.NET/releases</PackageReleaseNotes>
-    <AssemblyName>Microsoft.OpenApi.Hidi</AssemblyName>
-    <RootNamespace>Microsoft.OpenApi.Hidi</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <NoWarn>$(NoWarn);NU5048;NU5104;CA1848;</NoWarn>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
     <AnalysisMode>All</AnalysisMode>
   </PropertyGroup>
@@ -50,7 +35,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="7.18.0" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.5.0-preview4" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.5.0-preview5" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.0-preview" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
   </ItemGroup>