Merge branch 'main' into elinor/add-kiota-workspace

microsoft · Aug 13, 2024 · 67bbbb1 · 67bbbb1
2 parents 2178d47 + 7f0220f
commit 67bbbb1
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 103 deletions.
diff --git a/it/csharp/dotnet.csproj b/it/csharp/dotnet.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.11.0" />
-    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.11.0" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.11.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.11.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.11.0" />
-    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.11.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.11.0" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.11.1" />
+    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.11.1" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.11.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.11.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.11.1" />
+    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.11.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.11.1" />
 
     <Compile Remove="basic\**" />
   </ItemGroup>

diff --git a/it/python/requirements-dev.txt b/it/python/requirements-dev.txt
@@ -102,7 +102,7 @@ microsoft-kiota-abstractions==1.3.3
 
 microsoft-kiota-authentication-azure==1.0.0
 
-microsoft-kiota-http==1.3.2
+microsoft-kiota-http==1.3.3
 
 microsoft-kiota-serialization-json==1.3.0
 

diff --git a/it/typescript/package-lock.json b/it/typescript/package-lock.json
diff --git a/it/typescript/package.json b/it/typescript/package.json
@@ -21,8 +21,8 @@
     "@es-exec/esbuild-plugin-start": "^0.0.5",
     "@stylistic/eslint-plugin-ts": "^2.6.2",
     "@types/node": "^22.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.0.1",
-    "@typescript-eslint/parser": "^8.0.1",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
     "esbuild": "^0.23.0",
     "eslint": "^9.9.0",
     "eslint-config-prettier": "^9.1.0",

diff --git a/src/Kiota.Builder/Kiota.Builder.csproj b/src/Kiota.Builder/Kiota.Builder.csproj
@@ -15,7 +15,7 @@
     <Title>Microsoft.OpenApi.Kiota.Builder</Title>
     <PackageId>Microsoft.OpenApi.Kiota.Builder</PackageId>
     <PackageOutputPath>./nupkg</PackageOutputPath>
-    <VersionPrefix>1.17.0</VersionPrefix>
+    <VersionPrefix>1.18.0</VersionPrefix>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
     <PackageReleaseNotes>
       https://github.com/microsoft/kiota/releases

diff --git a/src/Kiota.Builder/KiotaBuilder.cs b/src/Kiota.Builder/KiotaBuilder.cs
@@ -1661,7 +1661,7 @@ private CodeClass CreateInheritedModelDeclaration(OpenApiUrlTreeNode currentNode
                 AddModelDeclarationIfDoesntExist(currentNode, operation, schema.MergeAllOfSchemaEntries()!, className, shortestNamespace),
             // meaningless scenario
             (false, { Length: 0 }, { Length: 0 }) =>
-                throw new InvalidOperationException("the type does not contain any information"),
+                throw new InvalidOperationException($"The type does not contain any information Path: {currentNode.Path}, Reference Id: {referenceId}"),
         };
         if (codeDeclaration is not CodeClass currentClass) throw new InvalidOperationException("Inheritance is only supported for classes");
         if (!currentClass.Documentation.DescriptionAvailable &&

diff --git a/src/kiota/kiota.csproj b/src/kiota/kiota.csproj
@@ -15,7 +15,7 @@
     <Title>Microsoft.OpenApi.Kiota</Title>
     <PackageId>Microsoft.OpenApi.Kiota</PackageId>
     <PackageOutputPath>./nupkg</PackageOutputPath>
-    <VersionPrefix>1.17.0</VersionPrefix>
+    <VersionPrefix>1.18.0</VersionPrefix>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
     <PackageReleaseNotes>
       https://github.com/microsoft/kiota/releases