Merge branch 'main' into task/extension/check-translations

microsoft · Nov 21, 2024 · e145372 · e145372
2 parents feef5af + 8e4b644
commit e145372
Show file tree

Hide file tree

Showing 75 changed files with 3,103 additions and 1,380 deletions.
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -163,6 +163,9 @@ extends:
               - pwsh: $(Build.SourcesDirectory)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} -excludeHeadingDash
                 displayName: "Set version suffix"
 
+              - pwsh: $(Build.SourcesDirectory)/scripts/enable-shims-for-packaging.ps1
+                displayName: "Add PackAsToolShimRuntimeIdentifiers attributes for tool packaging"
+
               - pwsh: $(Build.SourcesDirectory)/scripts/update-version-suffix-for-source-generator.ps1 -versionSuffix "$(versionSuffix)"
                 displayName: "Set version suffix in csproj for generators"
 

diff --git a/.github/ISSUE_TEMPLATE/01-kiota-bug.yml b/.github/ISSUE_TEMPLATE/01-kiota-bug.yml
@@ -127,7 +127,7 @@ body:
     id: logs
     attributes:
       label: Debug output
-      description: Please copy and paste the output when using the `--debug`` flag. This will be automatically formatted into code, so no need for backticks.
+      description: Please copy and paste the output when using the `--ll debug`` flag. This will be automatically formatted into code, so no need for backticks.
       value: |
         <details><summary>Click to expand log</summary>
         ```

diff --git a/.github/workflows/build-vscode-extension.yml b/.github/workflows/build-vscode-extension.yml
@@ -10,7 +10,18 @@ permissions:
   contents: read
 
 jobs:
+  checksecret:
+    name: check if SONAR_TOKEN is set in github secrets
+    runs-on: ubuntu-latest
+    outputs:
+      is_SONAR_TOKEN_set: ${{ steps.checksecret_job.outputs.is_SONAR_TOKEN_set }}
+    steps:
+      - name: Check whether unity activation requests should be done
+        id: checksecret_job
+        run: |
+          echo "is_SONAR_TOKEN_set=${{ env.SONAR_TOKEN != '' }}" >> $GITHUB_OUTPUT
   build_extension:
+    needs: [checksecret]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -31,6 +42,22 @@ jobs:
         working-directory: vscode/microsoft-kiota
       - run: npm run lint
         working-directory: vscode/microsoft-kiota
+      - name: run tests(linux)
+        if: runner.os == 'Linux'
+        run: xvfb-run -a npm run test-with-coverage
+        working-directory: vscode/microsoft-kiota
+      - name: run tests
+        if: runner.os != 'Linux'
+        run: npm run test-with-coverage
+        working-directory: vscode/microsoft-kiota
+      - name: Run sonar cloud analysis
+        if: needs.checksecret.outputs.is_SONAR_TOKEN_set == 'true'
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          projectBaseDir: vscode/microsoft-kiota
       - run: npm run package
         working-directory: vscode/microsoft-kiota
       - run: npm i -g @vscode/vsce

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -49,6 +49,7 @@ jobs:
           - "./tests/Kiota.Builder.IntegrationTests/NoUnderscoresInModel.yaml"
           - "./tests/Kiota.Builder.IntegrationTests/ToDoApi.yaml"
           - "./tests/Kiota.Builder.IntegrationTests/GeneratesUritemplateHints.yaml"
+          - "./tests/Kiota.Builder.IntegrationTests/DiscriminatorSample.yaml"
           - "oas::petstore"
           - "apisguru::twitter.com:current"
           - "apisguru::notion.com"

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -13,18 +13,20 @@ on:
         "**.md",
         ".vscode/**",
         "**.svg",
+        "vscode/**",
       ]
   pull_request:
     types: [opened, synchronize, reopened]
-    paths-ignore:
+    paths:
       [
-        "abstractions/**",
-        "authentication/**",
-        "serialization/**",
-        "http/**",
-        "**.md",
-        ".vscode/**",
-        "**.svg",
+        "!abstractions/**",
+        "!authentication/**",
+        "!serialization/**",
+        "!http/**",
+        "!**.md",
+        "!.vscode/**",
+        "!**.svg",
+        "!vscode/**",
       ]
 
 permissions:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,9 +12,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Changed
+
+- Fixed python generation in scenarios with opening/closing tags for code comments. [#5636](https://github.com/microsoft/kiota/issues/5636)
+- Fixed Python error when a class inherits from a base class and implements an interface. [5637](https://github.com/microsoft/kiota/issues/5637)
+- Fix anyOf/oneOf generation in TypeScript. [5353](https://github.com/microsoft/kiota/issues/5353)
+- Fixed invalid code in Php caused by "*/*/" in property description. [5635](https://github.com/microsoft/kiota/issues/5635)
+
+## [1.20.0] - 2024-11-07
+
+### Added
+
+### Changed
+
 - Fixed python generation client serailization failure str being quoted as "str"
 - Fixed Issue with primitive values being stringified in python python. [#5417](https://github.com/microsoft/kiota/issues/5417)
-
 - Fixed an issue where multipart request content would be ignored if other unstructured content was present in the description. [#5638](https://github.com/microsoft/kiota/issues/5638)
 - Fixed an issue where when generating Go code the deserializer for unions was using `CodeClass` as a filter and not `CodeInterface`. [#4844](https://github.com/microsoft/kiota/issues/4844)
 - Fixes mapping of `int16` format to the `integer` type rather than `double` when the type is `integer` or `number` [#5611](https://github.com/microsoft/kiota/issues/5611)
@@ -23,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed a bug where the type name for inherited inline models would be incorrect. [#5610](https://github.com/microsoft/kiota/issues/5610)
 - Fixes typing inconsistencies in generated code and libraries in Python [kiota-python#333](https://github.com/microsoft/kiota-python/issues/333)
 - Fixes generation of superfluous fields for Models with discriminator due to refiners adding the same properties to the same model [#4178](https://github.com/microsoft/kiota/issues/4178).
+- Fixes unsigned shim binary when installed as dotnet tool [#5650](https://github.com/microsoft/kiota/issues/5650).
 
 ## [1.19.1] - 2024-10-11
 
@@ -1493,3 +1505,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Initial GitHub release
+
diff --git a/README.md b/README.md
@@ -21,13 +21,14 @@ The following table provides an overview of the languages supported by Kiota and
 
 | Language | Generation | Abstractions                   | Serialization                                                                                                                                                                                                                                                                                                                                                                                | Authentication | HTTP | Required tools & dependencies |
 | -------- | ---------- |--------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -------------- | ---- | -------------- |
+| CLI | 🛠️ | (see CSharp) + [🛠️](https://github.com/microsoft/kiota-cli-commons) | (see CSharp)                                                                                                                                                                                                                                                                                                                                                                                 | (see CSharp) | (see CSharp) | [link](https://learn.microsoft.com/openapi/kiota/quickstarts/cli) |
 | CSharp | ✔ | [✔](https://github.com/microsoft/kiota-dotnet/tree/main/src/abstractions)     | [FORM](https://github.com/microsoft/kiota-dotnet/tree/main/src/serialization/form), [JSON](https://github.com/microsoft/kiota-dotnet/tree/main/src/serialization/json), [MULTIPART](https://github.com/microsoft/kiota-dotnet/tree/main/src/serialization/multipart), [TEXT](https://github.com/microsoft/kiota-dotnet/tree/main/src/serialization/text)                                     | [Anonymous](https://github.com/microsoft/kiota-dotnet/blob/main/src/abstractions/authentication/AnonymousAuthenticationProvider.cs), [API Key](https://github.com/microsoft/kiota-dotnet/blob/main/src/abstractions/authentication/ApiKeyAuthenticationProvider.cs), [Azure](https://github.com/microsoft/kiota-dotnet/tree/main/src/authentication/azure) | [✔](https://github.com/microsoft/kiota-dotnet/tree/main/src/http/httpClient) | [link](https://learn.microsoft.com/openapi/kiota/quickstarts/dotnet) |
+| Dart | [▶](https://github.com/kiota-community/kiota-dart/tree/features/dart) | [🛠️](https://github.com/kiota-community/dart_kiota/tree/main/packages/kiota_abstractions) | [🛠️ FORM](https://github.com/kiota-community/dart_kiota/tree/main/packages/kiota_serialization_form), [▶ JSON](https://github.com/kiota-community/dart_kiota/pull/35), [▶ MULTIPART](https://github.com/kiota-community/dart_kiota/pull/35), [🛠️ TEXT](https://github.com/kiota-community/dart_kiota/tree/main/packages/kiota_serialization_text) | [🛠️ Anonymous](https://github.com/kiota-community/dart_kiota/blob/main/packages/kiota_abstractions/lib/src/authentication/anonymous_authentication_provider.dart), [🛠️ API Key](https://github.com/kiota-community/dart_kiota/blob/main/packages/kiota_abstractions/lib/src/authentication/api_key_authentication_provider.dart) | [🛠️](https://github.com/kiota-community/dart_kiota/tree/main/packages/kiota_http) | |
 | Go | ✔ | [✔](https://github.com/microsoft/kiota-abstractions-go)         | [FORM](https://github.com/microsoft/kiota-serialization-form-go), [JSON](https://github.com/microsoft/kiota-serialization-json-go), [MULTIPART](https://github.com/microsoft/kiota-serialization-multipart-go), [TEXT](https://github.com/microsoft/kiota-serialization-text-go)                                                                                                             | [Anonymous](https://github.com/microsoft/kiota-abstractions-go/blob/main/authentication/anonymous_authentication_provider.go), [API Key](https://github.com/microsoft/kiota-abstractions-go/blob/main/authentication/api_key_authentication_provider.go), [Azure](https://github.com/microsoft/kiota-authentication-azure-go/) | [✔](https://github.com/microsoft/kiota-http-go/) | [link](https://learn.microsoft.com/openapi/kiota/quickstarts/go) |
 | Java | ✔ | [✔](https://github.com/microsoft/kiota-java/tree/main/components/abstractions)       | [FORM](https://github.com/microsoft/kiota-java/tree/main/components/serialization/form), [JSON](https://github.com/microsoft/kiota-java/tree/main/components/serialization/json), [MULTIPART](https://github.com/microsoft/kiota-java/tree/main/components/serialization/multipart), [TEXT](https://github.com/microsoft/kiota-java/tree/main/components/serialization/text)                 | [Anonymous](https://github.com/microsoft/kiota-java/blob/main/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AnonymousAuthenticationProvider.java), [API Key](https://github.com/microsoft/kiota-java/blob/main/components/abstractions/src/main/java/com/microsoft/kiota/authentication/ApiKeyAuthenticationProvider.java), [Azure](https://github.com/microsoft/kiota-java/tree/main/components/authentication/azure) | [✔](https://github.com/microsoft/kiota-java/tree/main/components/http/okHttp) | [link](https://learn.microsoft.com/openapi/kiota/quickstarts/java) |
 | PHP | ✔ | [✔](https://github.com/microsoft/kiota-abstractions-php)          | [JSON](https://github.com/microsoft/kiota-serialization-json-php), [FORM](https://github.com/microsoft/kiota-serialization-form-php), [MULTIPART](https://github.com/microsoft/kiota-serialization-multipart-php), [TEXT](https://github.com/microsoft/kiota-serialization-text-php)                                                                                                         | [Anonymous](https://github.com/microsoft/kiota-abstractions-php/blob/main/src/Authentication/AnonymousAuthenticationProvider.php), [✔️ PHP League](https://github.com/microsoft/kiota-authentication-phpleague-php) | [✔](https://github.com/microsoft/kiota-http-guzzle-php) | [link](https://learn.microsoft.com/openapi/kiota/quickstarts/php) |
 | Python | ✔ | [✔](https://github.com/microsoft/kiota-abstractions-python)  | [FORM](https://github.com/microsoft/kiota-serialization-form-python), [JSON](https://github.com/microsoft/kiota-serialization-json-python), [MULTIPART](https://github.com/microsoft/kiota-serialization-multipart-python), [TEXT](https://github.com/microsoft/kiota-serialization-text-python)                                                                                             | [Anonymous](https://github.com/microsoft/kiota-abstractions-python/blob/main/kiota_abstractions/authentication/anonymous_authentication_provider.py), [Azure](https://github.com/microsoft/kiota-authentication-azure-python) | [✔](https://github.com/microsoft/kiota-http-python) | [link](https://learn.microsoft.com/openapi/kiota/quickstarts/python) |
 | Ruby | 🛠️ | [🛠️](https://github.com/microsoft/kiota-abstractions-ruby)       | [❌ FORM](https://github.com/microsoft/kiota/issues/2077), [JSON](https://github.com/microsoft/kiota-serialization-json-ruby), [❌ MULTIPART](https://github.com/microsoft/kiota/issues/3032), [❌ TEXT](https://github.com/microsoft/kiota/issues/1049)                                                                                                                                        | [Anonymous](https://github.com/microsoft/kiota-abstractions-ruby/blob/main/lib/microsoft_kiota_abstractions/authentication/anonymous_authentication_provider.rb), [OAuth2](https://github.com/microsoft/kiota-authentication-oauth-ruby) | [🛠️](https://github.com/microsoft/kiota-http-ruby)|  |
-| CLI | 🛠️ | (see CSharp) + [🛠️](https://github.com/microsoft/kiota-cli-commons) | (see CSharp)                                                                                                                                                                                                                                                                                                                                                                                 | (see CSharp) | (see CSharp) | [link](https://learn.microsoft.com/openapi/kiota/quickstarts/cli) |
 | Swift | [❌](https://github.com/microsoft/kiota/issues/1449) | [🛠️](./abstractions/swift)       | [❌ FORM](https://github.com/microsoft/kiota/issues/2076), [❌ JSON](https://github.com/microsoft/kiota/issues/1451), [❌ FORM](https://github.com/microsoft/kiota/issues/3033), [❌ TEXT](https://github.com/microsoft/kiota/issues/1452)                                                                                                                                                       | [Anonymous](./abstractions/swift/Source/MicrosoftKiotaAbstractions/Authentication/AnonymousAuthenticationProvider.swift), [❌ Azure](https://github.com/microsoft/kiota/issues/1453) | [❌](https://github.com/microsoft/kiota/issues/1454)|  |
 | TypeScript/JavaScript | 🛠️ | [🛠️](https://github.com/microsoft/kiota-typescript/tree/main/packages/abstractions) | [FORM](https://github.com/microsoft/kiota-typescript/tree/main/packages/serialization/form), [JSON](https://github.com/microsoft/kiota-typescript/tree/main/packages/serialization/json), [MULTIPART](https://github.com/microsoft/kiota-typescript/tree/main/packages/serialization/multipart), [TEXT](https://github.com/microsoft/kiota-typescript/tree/main/packages/serialization/text) | [Anonymous](https://github.com/microsoft/kiota-typescript/blob/main/packages/abstractions/src/authentication/anonymousAuthenticationProvider.ts), [API Key](https://github.com/microsoft/kiota-typescript/blob/main/packages/abstractions/src/authentication/apiKeyAuthenticationProvider.ts), [Azure](https://github.com/microsoft/kiota-typescript/tree/main/packages/authentication/azure), [SPFx](https://github.com/microsoft/kiota-typescript/tree/main/packages/authentication/spfx) | [🛠️](https://github.com/microsoft/kiota-typescript/tree/main/packages/http/fetch) | [link](https://learn.microsoft.com/openapi/kiota/quickstarts/typescript) |
 

diff --git a/it/config.json b/it/config.json
@@ -17,24 +17,29 @@
       }
     ]
   },
+  "./tests/Kiota.Builder.IntegrationTests/DiscriminatorSample.yaml": {
+    "MockServerITFolder": "discriminator",
+    "Suppressions": [
+      {
+        "Language": "ruby",
+        "Rationale": "https://github.com/microsoft/kiota/issues/2484"
+      }
+    ]
+  },
   "apisguru::github.com:api.github.com": {
     "MockServerITFolder": "gh",
     "Suppressions": [
       {
         "Language": "typescript",
         "Rationale": "https://github.com/microsoft/kiota/issues/5634"
       },
-      {
-        "Language": "php",
-        "Rationale": "https://github.com/microsoft/kiota/issues/5635"
-      },
       {
         "Language": "ruby",
         "Rationale": "https://github.com/microsoft/kiota/issues/1816"
       },
       {
-        "Language": "python",
-        "Rationale": "https://github.com/microsoft/kiota/issues/5636"
+        "Language": "php",
+        "Rationale": "https://github.com/microsoft/kiota/issues/5779"
       }
     ],
     "ExcludePatterns": [
@@ -208,10 +213,6 @@
       {
         "Language": "php",
         "Rationale": "https://github.com/microsoft/kiota/issues/5354"
-      },
-      {
-        "Language": "typescript",
-        "Rationale": "https://github.com/microsoft/kiota/issues/5353"
       }
     ],
     "IdempotencySuppressions": [
@@ -242,10 +243,6 @@
       {
         "Language": "ruby",
         "Rationale": "https://github.com/microsoft/kiota/issues/2484"
-      },
-      {
-        "Language": "python",
-        "Rationale": "https://github.com/microsoft/kiota/issues/5637"
       }
     ]
   },

diff --git a/it/csharp/dotnet.csproj b/it/csharp/dotnet.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.13.1" />
-    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.2" />
-    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.2" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.15.2" />
+    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.15.2" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.15.2" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.15.2" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.15.2" />
+    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.15.2" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.15.2" />
 
     <Compile Remove="basic\**" />
   </ItemGroup>

diff --git a/it/java/pom.xml b/it/java/pom.xml
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <kiota-java.version>1.7.0</kiota-java.version>
+        <kiota-java.version>1.8.0</kiota-java.version>
     </properties>
 
     <dependencies>

diff --git a/it/php/composer.json b/it/php/composer.json
@@ -11,7 +11,7 @@
     "microsoft/kiota-authentication-phpleague": "*"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.2.0"
+    "phpstan/phpstan": "^1.2.0 || ^2.0.0"
   },
   "minimum-stability": "stable",
   "license": "MIT",