Merge branch 'main' into feature/dom-export-flat

microsoft · Aug 23, 2024 · 05543a4 · 05543a4
2 parents a778e9f + 857987e
commit 05543a4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 34 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.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.12.0" />
-    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.12.0" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.12.1" />
+    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.12.1" />
 
     <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.2.0</kiota-java.version>
+        <kiota-java.version>1.3.0</kiota-java.version>
     </properties>
 
     <dependencies>

diff --git a/src/Kiota.Builder/Kiota.Builder.csproj b/src/Kiota.Builder/Kiota.Builder.csproj
@@ -38,12 +38,12 @@
     <PackageReference Include="AsyncKeyedLock" Version="7.0.1" />
     <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.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.12.0" />
-    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.12.0" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.12.1" />
+    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.12.1" />
     <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/vscode/microsoft-kiota/package-lock.json b/vscode/microsoft-kiota/package-lock.json
diff --git a/vscode/microsoft-kiota/package.json b/vscode/microsoft-kiota/package.json
@@ -472,7 +472,7 @@
     "mocha": "^10.7.3",
     "ts-loader": "^9.5.1",
     "typescript": "^5.5.4",
-    "webpack": "^5.93.0",
+    "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {