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

microsoft · Aug 19, 2024 · 4705d68 · 4705d68
2 parents 80c9fde + 3195be4
commit 4705d68
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 131 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.2" />
-    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.11.2" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.11.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.11.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.11.2" />
-    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.11.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.11.2" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.11.3" />
+    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.11.3" />
 
     <Compile Remove="basic\**" />
   </ItemGroup>

diff --git a/it/python/requirements-dev.txt b/it/python/requirements-dev.txt
@@ -66,7 +66,7 @@ yapf==0.40.2
 
 zipp==3.20.0 ; python_version >= '3.7'
 
-aiohttp==3.10.3 ; python_version >= '3.6'
+aiohttp==3.10.4 ; python_version >= '3.6'
 
 aiosignal==1.3.1 ; python_version >= '3.7'
 

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
@@ -20,10 +20,10 @@
   "devDependencies": {
     "@es-exec/esbuild-plugin-start": "^0.0.5",
     "@stylistic/eslint-plugin-ts": "^2.6.4",
-    "@types/node": "^22.3.0",
+    "@types/node": "^22.4.1",
     "@typescript-eslint/eslint-plugin": "^8.1.0",
     "@typescript-eslint/parser": "^8.1.0",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.23.1",
     "eslint": "^9.9.0",
     "eslint-config-prettier": "^9.1.0",
     "minimist": "^1.2.8",

diff --git a/src/Kiota.Builder/Kiota.Builder.csproj b/src/Kiota.Builder/Kiota.Builder.csproj
@@ -39,12 +39,12 @@
     <PackageReference Include="AsyncKeyedLock" Version="7.0.0" />
     <PackageReference Include="DotNet.Glob" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.11.2" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.11.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.11.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.11.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.11.2" />
-    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.11.2" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.11.3" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.11.3" />
+    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.11.3" />
     <PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.5-preview" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.17" />

diff --git a/src/kiota/kiota.csproj b/src/kiota/kiota.csproj
@@ -47,6 +47,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.5-preview" />
+    <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.17" />
     <PackageReference Include="StreamJsonRpc" Version="2.19.27" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />

diff --git a/tests/Kiota.Builder.IntegrationTests/Kiota.Builder.IntegrationTests.csproj b/tests/Kiota.Builder.IntegrationTests/Kiota.Builder.IntegrationTests.csproj
@@ -14,6 +14,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.SDK" Version="17.10.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="xunit" Version="2.9.0" />

diff --git a/vscode/microsoft-kiota/package-lock.json b/vscode/microsoft-kiota/package-lock.json