Merge remote-tracking branch 'origin/main' into andrueastman/pythonFix

microsoft · Nov 7, 2024 · 5ec36bd · 5ec36bd
2 parents de94d6c + 8159c6d
commit 5ec36bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
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.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.14.0" />
+    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.14.0" />
 
     <Compile Remove="basic\**" />
   </ItemGroup>

diff --git a/it/python/requirements-dev.txt b/it/python/requirements-dev.txt
@@ -72,7 +72,7 @@ aiosignal==1.3.1 ; python_version >= '3.7'
 
 anyio==4.6.2.post1 ; python_version >= '3.7'
 
-async-timeout==5.0.0 ; python_version >= '3.6'
+async-timeout==5.0.1 ; python_version >= '3.6'
 
 attrs==24.2.0 ; python_version >= '3.7'
 

diff --git a/src/Kiota.Builder/Refiners/TypeScriptRefiner.cs b/src/Kiota.Builder/Refiners/TypeScriptRefiner.cs
@@ -692,7 +692,6 @@ currentInterface.StartBlock is InterfaceDeclaration interfaceDeclaration &&
         }
         CrawlTree(currentElement, AliasUsingsWithSameSymbol);
     }
-    private const string GuidPackageName = "guid-typescript";
     private const string AbstractionsPackageName = "@microsoft/kiota-abstractions";
     // A helper method to check if a parameter is a multipart body
     private static bool IsMultipartBody(CodeParameter p) =>
@@ -840,7 +839,7 @@ private static void CorrectMethodType(CodeMethod currentMethod)
     {"Guid", (string.Empty, new CodeUsing {
                             Name = "Guid",
                             Declaration = new CodeType {
-                                Name = GuidPackageName,
+                                Name = AbstractionsPackageName,
                                 IsExternal = true,
                             },
                             IsErasable = true, // the import is used only for the type, not for the value