Merge remote-tracking branch 'upstream/vnext' into inline-some-out-variables

Author: SimonCropp

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/Directory.Build.props

@@ -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/Extensions/CommandExtensions.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)

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.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/Logger.cs

@@ -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>
     <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>

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

@@ -154,7 +154,7 @@ private static OpenApiDocument ApplyFilters(HidiOptions options, ILogger logger,
                 requestUrls = EnumerateJsonDocument(postmanCollection.RootElement, new());
                 logger.LogTrace("Finished fetching the list of paths and Http methods defined in the Postman collection.");
             }
-            else 
+            else
             {
                 requestUrls = new();
                 logger.LogTrace("No filter options provided.");
@@ -211,10 +211,9 @@ private static void WriteOpenApi(HidiOptions options, OpenApiFormat openApiForma
             }
         }
 
-        // Get OpenAPI document either from OpenAPI or CSDL 
+        // Get OpenAPI document either from OpenAPI or CSDL
         private static async Task<OpenApiDocument> GetOpenApi(HidiOptions options, ILogger logger, string? metadataVersion = null, CancellationToken cancellationToken = default)
         {
-
             OpenApiDocument document;
             Stream stream;
 
@@ -285,7 +284,7 @@ private static async Task<OpenApiDocument> GetOpenApi(HidiOptions options, ILogg
 
         private static Dictionary<string, List<string>> GetRequestUrlsFromManifest(ApiDependency apiDependency)
         {
-            // Get the request URLs from the API Dependencies in the API manifest 
+            // Get the request URLs from the API Dependencies in the API manifest
             var requests = apiDependency
                     .Requests.Where(static r => !r.Exclude && !string.IsNullOrEmpty(r.UriTemplate) && !string.IsNullOrEmpty(r.Method))
                                 .Select(static r => new { UriTemplate = r.UriTemplate!, Method = r.Method! })

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -18,7 +18,6 @@ public static OpenApiSpecVersion TryParseOpenApiSpecVersion(string value)
 
             if (int.TryParse(res, out int result))
             {
-
                 if (result >= 2 && result < 3)
                 {
                     return OpenApiSpecVersion.OpenApi2_0;

src/Microsoft.OpenApi.Hidi/OpenApiSpecVersionHelper.cs

@@ -104,6 +104,6 @@ public IReadOnlyList<Option> GetPluginCommandOptions()
                 LogLevelOption
             };
         }
-
     }
+
 }