Skip to content

Commit

Permalink
Merge branch 'main' into feat/validation-rules-openapi
Browse files Browse the repository at this point in the history
  • Loading branch information
@samwelkanda
samwelkanda authored Nov 6, 2024
2 parents 703eb08 + 04815fe commit d1bb6b0
Show file tree
Hide file tree
Showing 10 changed files with 368 additions and 332 deletions.
14 changes: 7 additions & 7 deletions it/csharp/dotnet.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.1" />
<PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" 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" />

<Compile Remove="basic\**" />
</ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions it/python/requirements-dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ docutils==0.21.2 ; python_version >= '3.7'

exceptiongroup==1.1.1 ; python_version < '3.11'

flit==3.9.0
flit==3.10.1

flit-core==3.9.0 ; python_version >= '3.6'
flit-core==3.10.1 ; python_version >= '3.6'

idna==3.10

Expand Down Expand Up @@ -72,11 +72,11 @@ aiosignal==1.3.1 ; python_version >= '3.7'

anyio==4.6.2.post1 ; python_version >= '3.7'

async-timeout==4.0.3 ; python_version >= '3.6'
async-timeout==5.0.0 ; python_version >= '3.6'

attrs==24.2.0 ; python_version >= '3.7'

azure-core==1.31.0 ; python_version >= '3.7'
azure-core==1.32.0 ; python_version >= '3.7'

azure-identity==1.19.0

Expand Down Expand Up @@ -136,5 +136,5 @@ sniffio==1.3.1 ; python_version >= '3.7'

uritemplate==4.1.1 ; python_version >= '3.6'

yarl==1.17.0 ; python_version >= '3.7'
yarl==1.17.1 ; python_version >= '3.7'

295 changes: 154 additions & 141 deletions it/typescript/package-lock.json
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions it/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,26 @@
"prettier": "./.prettierrc.json",
"devDependencies": {
"@es-exec/esbuild-plugin-start": "^0.0.5",
"@stylistic/eslint-plugin-ts": "^2.9.0",
"@types/node": "^22.8.4",
"@typescript-eslint/eslint-plugin": "^8.12.2",
"@typescript-eslint/parser": "^8.12.2",
"@stylistic/eslint-plugin-ts": "^2.10.1",
"@types/node": "^22.9.0",
"@typescript-eslint/eslint-plugin": "^8.13.0",
"@typescript-eslint/parser": "^8.13.0",
"esbuild": "^0.24.0",
"eslint": "^9.13.0",
"eslint": "^9.14.0",
"eslint-config-prettier": "^9.1.0",
"minimist": "^1.2.8",
"prettier": "^3.3.3",
"typescript": "^4.9.5"
},
"dependencies": {
"@azure/identity": "^4.5.0",
"@microsoft/kiota-abstractions": "^1.0.0-preview.71",
"@microsoft/kiota-authentication-azure": "^1.0.0-preview.71",
"@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.71",
"@microsoft/kiota-serialization-form": "^1.0.0-preview.71",
"@microsoft/kiota-serialization-json": "^1.0.0-preview.71",
"@microsoft/kiota-serialization-multipart": "^1.0.0-preview.71",
"@microsoft/kiota-serialization-text": "^1.0.0-preview.71",
"@microsoft/kiota-abstractions": "^1.0.0-preview.73",
"@microsoft/kiota-authentication-azure": "^1.0.0-preview.73",
"@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.73",
"@microsoft/kiota-serialization-form": "^1.0.0-preview.73",
"@microsoft/kiota-serialization-json": "^1.0.0-preview.73",
"@microsoft/kiota-serialization-multipart": "^1.0.0-preview.73",
"@microsoft/kiota-serialization-text": "^1.0.0-preview.73",
"express": "^5.0.1",
"node-fetch": "^2.7.0"
}
Expand Down
14 changes: 7 additions & 7 deletions src/Kiota.Builder/Kiota.Builder.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
<PackageReference Include="AsyncKeyedLock" Version="7.0.2" />
<PackageReference Include="DotNet.Glob" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.1" />
<PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Abstractions" 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.Text" Version="1.13.2" />
<PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.13.2" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
<PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.5-preview" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.22" />
<PackageReference Include="Microsoft.Plugins.Manifest" Version="1.0.0-preview4" />
<PackageReference Include="Microsoft.Plugins.Manifest" Version="1.0.0-rc1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion src/Kiota.Builder/SearchProviders/OpenApiSpec/OpenApiSpecSeachProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public Task<IDictionary<string, SearchResult>> SearchAsync(string term, string?
if (term.Split(termSeparator, StringSplitOptions.RemoveEmptyEntries).Any(Keywords.Contains))
{
return Task.FromResult<IDictionary<string, SearchResult>>(new Dictionary<string, SearchResult> {
{ "petstore", new SearchResult(ApiTitle, ApiDescription, new Uri("https://petstore.swagger.io/v1"), new Uri("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/examples/v3.0/petstore.yaml"), new List<string> { "1.0.0" }) }
{ "petstore", new SearchResult(ApiTitle, ApiDescription, new Uri("https://petstore.swagger.io/v1"), new Uri("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/tests/v3.0/pass/petstore.yaml"), new List<string> { "1.0.0" }) }
});
}
return Task.FromResult<IDictionary<string, SearchResult>>(new Dictionary<string, SearchResult>());
Expand Down
Loading

0 comments on commit d1bb6b0

Please sign in to comment.