Merge pull request #1861 from microsoft/mk/sync-v2-with-vnext

Sync vnext changes with the v2 branch
microsoft · Oct 8, 2024 · 9c4fd10 · 9c4fd10
2 parents d302b5d + d2dc8ec
commit 9c4fd10
Show file tree

Hide file tree

Showing 200 changed files with 3,080 additions and 1,250 deletions.
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -57,10 +57,10 @@ extends:
             version: 8.x
 
         # Install the nuget tool.
-        - task: NuGetToolInstaller@0
-          displayName: 'Use NuGet >=5.2.0'
+        - task: NuGetToolInstaller@1
+          displayName: 'Use NuGet >=6.11.0'
           inputs:
-            versionSpec: '>=5.2.0'
+            versionSpec: '>=6.11.0'
             checkLatest: true
 
         # Build the Product project
@@ -78,16 +78,17 @@ extends:
             projects: '$(Build.SourcesDirectory)\Microsoft.OpenApi.sln'
             arguments: '--configuration $(BuildConfiguration) --no-build'
 
-        - task: EsrpCodeSigning@2
-          displayName: 'ESRP CodeSigning'
+        - task: EsrpCodeSigning@5
+          displayName: 'ESRP CodeSigning binaries'
           inputs:
-            ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet (AKV)'
-            FolderPath: src
-            signConfigType: inlineSignParams
-            UseMinimatch: true
-            Pattern: |
-              **\*.exe
-              **\*.dll
+            ConnectedServiceName: 'Federated DevX ESRP Managed Identity Connection'
+            AppRegistrationClientId: '65035b7f-7357-4f29-bf25-c5ee5c3949f8'
+            AppRegistrationTenantId: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
+            AuthAKVName: 'akv-prod-eastus'
+            AuthCertName: 'ReferenceLibraryPrivateCert'
+            AuthSignCertName: 'ReferencePackagePublisherCertificate'
+            FolderPath: '$(Build.SourcesDirectory)\src'
+            signConfigType: 'inlineSignParams'
             inlineOperation: |
               [
                   {
@@ -126,7 +127,10 @@ extends:
                       "toolVersion": "1.0"
                   }
               ]
-            SessionTimeout: 20
+            SessionTimeout: '20'
+            MaxConcurrency: '50'
+            MaxRetryAttempts: '5'
+            PendingAnalysisWaitTimeoutMinutes: '5'
 
         # Pack core lib
         - 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
@@ -140,32 +144,39 @@ extends:
         - 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
           displayName: 'pack Hidi'
 
-        - task: EsrpCodeSigning@2
+        - task: EsrpCodeSigning@5
           displayName: 'ESRP CodeSigning Nuget Packages'
           inputs:
-            ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet (AKV)'
+            ConnectedServiceName: 'Federated DevX ESRP Managed Identity Connection'
+            AppRegistrationClientId: '65035b7f-7357-4f29-bf25-c5ee5c3949f8'
+            AppRegistrationTenantId: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
+            AuthAKVName: 'akv-prod-eastus'
+            AuthCertName: 'ReferenceLibraryPrivateCert'
+            AuthSignCertName: 'ReferencePackagePublisherCertificate'
             FolderPath: '$(Build.ArtifactStagingDirectory)'
             Pattern: '*.nupkg'
-            signConfigType: inlineSignParams
-            UseMinimatch: true
+            signConfigType: 'inlineSignParams'
             inlineOperation: |
               [
-                  {
-                      "keyCode": "CP-401405",
-                      "operationSetCode": "NuGetSign",
-                      "parameters": [ ],
-                      "toolName": "sign",
-                      "toolVersion": "1.0"
-                  },
-                  {
-                      "keyCode": "CP-401405",
-                      "operationSetCode": "NuGetVerify",
-                      "parameters": [ ],
-                      "toolName": "sign",
-                      "toolVersion": "1.0"
-                  }
-              ]
-            SessionTimeout: 20
+                                  {
+                                      "keyCode": "CP-401405",
+                                      "operationSetCode": "NuGetSign",
+                                      "parameters": [ ],
+                                      "toolName": "sign",
+                                      "toolVersion": "1.0"
+                                  },
+                                  {
+                                      "keyCode": "CP-401405",
+                                      "operationSetCode": "NuGetVerify",
+                                      "parameters": [ ],
+                                      "toolName": "sign",
+                                      "toolVersion": "1.0"
+                                  }
+                              ]
+            SessionTimeout: '60'
+            MaxConcurrency: '50'
+            MaxRetryAttempts: '5'
+            PendingAnalysisWaitTimeoutMinutes: '5'
 
         - task: PowerShell@2
           displayName: "Get Hidi's version-number from .csproj"

diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.config/1espt/PipelineAutobaseliningConfig.yml
@@ -0,0 +1,15 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  107:
+    usedNonDefaultBranch: true
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-09-13
+        eslint:
+          lastModifiedDate: 2024-09-13
+        psscriptanalyzer:
+          lastModifiedDate: 2024-09-13
+        armory:
+          lastModifiedDate: 2024-09-13
diff --git a/.editorconfig b/.editorconfig
@@ -121,3 +121,14 @@ csharp_preserve_single_line_blocks = true
 [*.vb]
 # Modifier preferences
 visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
+
+
+# Verify settings
+[*.{received,verified}.{txt,xml,json}]
+charset = "utf-8-bom"
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,6 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# VerifyTests
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @irvinesunday @darrelmiller @zengin @coseguera @millicentachieng @MaggieKimani1 @andrueastman
+* @irvinesunday @darrelmiller @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v4
       - name: Login to GitHub package feed
-        uses: docker/login-action@v3.2.0 
+        uses: docker/login-action@v3.3.0 
         with:
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
@@ -30,13 +30,13 @@ jobs:
         id: getversion
       - name: Push to GitHub Packages - Nightly
         if: ${{ github.ref == 'refs/heads/vnext' }}
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.7.0
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
       - name: Push to GitHub Packages - Release
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.7.0
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}
diff --git a/Microsoft.OpenApi.sln b/Microsoft.OpenApi.sln
@@ -24,12 +24,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E546B92F-20A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6357D7FD-2DE4-4900-ADB9-ABC37052040A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.SmokeTests", "test\Microsoft.OpenApi.SmokeTests\Microsoft.OpenApi.SmokeTests.csproj", "{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Hidi", "src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj", "{254841B5-7DAC-4D1D-A9C5-44FE5CE467BE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Hidi.Tests", "test\Microsoft.OpenApi.Hidi.Tests\Microsoft.OpenApi.Hidi.Tests.csproj", "{D8F799DD-04AC-4A13-B344-45A5B944450A}"
 EndProject
+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}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -56,10 +56,6 @@ Global
 		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{254841B5-7DAC-4D1D-A9C5-44FE5CE467BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{254841B5-7DAC-4D1D-A9C5-44FE5CE467BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{254841B5-7DAC-4D1D-A9C5-44FE5CE467BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -68,6 +64,10 @@ Global
 		{D8F799DD-04AC-4A13-B344-45A5B944450A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D8F799DD-04AC-4A13-B344-45A5B944450A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8F799DD-04AC-4A13-B344-45A5B944450A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D2E0C6E-B103-4CB6-912E-D56FA1501296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D2E0C6E-B103-4CB6-912E-D56FA1501296}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D2E0C6E-B103-4CB6-912E-D56FA1501296}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D2E0C6E-B103-4CB6-912E-D56FA1501296}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -78,9 +78,9 @@ Global
 		{79933258-0126-4382-8755-D50820ECC483} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1}
 		{AD83F991-DBF3-4251-8613-9CC54C826964} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
 		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
 		{254841B5-7DAC-4D1D-A9C5-44FE5CE467BE} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1}
 		{D8F799DD-04AC-4A13-B344-45A5B944450A} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
+		{1D2E0C6E-B103-4CB6-912E-D56FA1501296} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9F171EFC-0DB5-4B10-ABFA-AF48D52CC565}

diff --git a/README.md b/README.md
@@ -113,12 +113,6 @@ In order to test the validity of an OpenApi document, we avail the following too
 
     5. Copy and paste your OpenAPI descriptions in the **Input Content** window or paste the path to the descriptions file in the **Input File** textbox and click on `Convert` to render the results.
 
-# Build Status
-
-|**master**|
-|--|
-|[![Build status](https://ci.appveyor.com/api/projects/status/9l6hly3vjeu0tmtx/branch/master?svg=true)](https://ci.appveyor.com/project/MicrosoftOpenAPINETAdmin/openapi-net-54e7i/branch/master)|
-
 # Contributing
 
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a

diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/AsyncCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/AsyncCommandHandler.cs
@@ -0,0 +1,14 @@
+using System;
+using System.CommandLine.Invocation;
+using System.Threading.Tasks;
+
+namespace Microsoft.OpenApi.Hidi.Handlers;
+
+internal abstract class AsyncCommandHandler : ICommandHandler
+{
+    public int Invoke(InvocationContext context)
+    {
+        throw new InvalidOperationException("This method should not be called");
+    }
+    public abstract Task<int> InvokeAsync(InvocationContext context);
+}
diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs
@@ -11,18 +11,14 @@
 
 namespace Microsoft.OpenApi.Hidi.Handlers
 {
-    internal class PluginCommandHandler : ICommandHandler
+    internal class PluginCommandHandler : AsyncCommandHandler
     {
         public CommandOptions CommandOptions { get; }
         public PluginCommandHandler(CommandOptions commandOptions)
         {
             CommandOptions = commandOptions;
         }
-        public int Invoke(InvocationContext context)
-        {
-            return InvokeAsync(context).GetAwaiter().GetResult();
-        }
-        public async Task<int> InvokeAsync(InvocationContext context)
+        public override async Task<int> InvokeAsync(InvocationContext context)
         {
             var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
             var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
@@ -31,7 +27,7 @@ public async Task<int> InvokeAsync(InvocationContext context)
             var logger = loggerFactory.CreateLogger<PluginCommandHandler>();
             try
             {
-                await OpenApiService.PluginManifest(hidiOptions, logger, cancellationToken).ConfigureAwait(false);
+                await OpenApiService.PluginManifestAsync(hidiOptions, logger, cancellationToken).ConfigureAwait(false);
 
                 return 0;
             }

diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs
@@ -11,18 +11,14 @@
 
 namespace Microsoft.OpenApi.Hidi.Handlers
 {
-    internal class ShowCommandHandler : ICommandHandler
+    internal class ShowCommandHandler : AsyncCommandHandler
     {
         public CommandOptions CommandOptions { get; set; }
         public ShowCommandHandler(CommandOptions commandOptions)
         {
             CommandOptions = commandOptions;
         }
-        public int Invoke(InvocationContext context)
-        {
-            return InvokeAsync(context).GetAwaiter().GetResult();
-        }
-        public async Task<int> InvokeAsync(InvocationContext context)
+        public override async Task<int> InvokeAsync(InvocationContext context)
         {
             var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
             var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
@@ -31,7 +27,7 @@ public async Task<int> InvokeAsync(InvocationContext context)
             var logger = loggerFactory.CreateLogger<ShowCommandHandler>();
             try
             {
-                await OpenApiService.ShowOpenApiDocument(hidiOptions, logger, cancellationToken).ConfigureAwait(false);
+                await OpenApiService.ShowOpenApiDocumentAsync(hidiOptions, logger, cancellationToken).ConfigureAwait(false);
 
                 return 0;
             }

diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs
@@ -11,18 +11,14 @@
 
 namespace Microsoft.OpenApi.Hidi.Handlers
 {
-    internal class TransformCommandHandler : ICommandHandler
+    internal class TransformCommandHandler : AsyncCommandHandler
     {
         public CommandOptions CommandOptions { get; }
         public TransformCommandHandler(CommandOptions commandOptions)
         {
             CommandOptions = commandOptions;
         }
-        public int Invoke(InvocationContext context)
-        {
-            return InvokeAsync(context).GetAwaiter().GetResult();
-        }
-        public async Task<int> InvokeAsync(InvocationContext context)
+        public override async Task<int> InvokeAsync(InvocationContext context)
         {
             var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
             var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
@@ -31,7 +27,7 @@ public async Task<int> InvokeAsync(InvocationContext context)
             var logger = loggerFactory.CreateLogger<TransformCommandHandler>();
             try
             {
-                await OpenApiService.TransformOpenApiDocument(hidiOptions, logger, cancellationToken).ConfigureAwait(false);
+                await OpenApiService.TransformOpenApiDocumentAsync(hidiOptions, logger, cancellationToken).ConfigureAwait(false);
 
                 return 0;
             }

diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs
@@ -11,20 +11,15 @@
 
 namespace Microsoft.OpenApi.Hidi.Handlers
 {
-    internal class ValidateCommandHandler : ICommandHandler
+    internal class ValidateCommandHandler : AsyncCommandHandler
     {
         public CommandOptions CommandOptions { get; }
 
         public ValidateCommandHandler(CommandOptions commandOptions)
         {
             CommandOptions = commandOptions;
         }
-
-        public int Invoke(InvocationContext context)
-        {
-            return InvokeAsync(context).GetAwaiter().GetResult();
-        }
-        public async Task<int> InvokeAsync(InvocationContext context)
+        public override async Task<int> InvokeAsync(InvocationContext context)
         {
             var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
             var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
@@ -33,7 +28,7 @@ public async Task<int> InvokeAsync(InvocationContext context)
             try
             {
                 if (hidiOptions.OpenApi is null) throw new InvalidOperationException("OpenApi file is required");
-                var isValid = await OpenApiService.ValidateOpenApiDocument(hidiOptions.OpenApi, logger, cancellationToken).ConfigureAwait(false);
+                var isValid = await OpenApiService.ValidateOpenApiDocumentAsync(hidiOptions.OpenApi, logger, cancellationToken).ConfigureAwait(false);
                 return isValid is not false ? 0 : -1;
             }
 #if RELEASE
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @irvinesunday @darrelmiller @zengin @coseguera @millicentachieng @MaggieKimani1 @andrueastman
		* @irvinesunday @darrelmiller @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman