Skip to content

Commit

Permalink
Merge pull request #3877 from microsoft/bugfix/paste-api-manifest
Browse files Browse the repository at this point in the history
bugfix/paste api manifest
  • Loading branch information
baywet authored Dec 8, 2023
2 parents 07f1232 + 401e53b commit efe1f4b
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 83 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Fixed a bug in the vscode extension where the "Paste API Manifest" button would not be able to parse the manifest.

## [1.9.0] - 2023-12-07

### Added
Expand Down
6 changes: 3 additions & 3 deletions src/Kiota.Builder/Kiota.Builder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
<ItemGroup>
<PackageReference Include="DotNet.Glob" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.7.2" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.3.2" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.7.3" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.3.3" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.1.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.1.2" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.1.1" />
<PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.1.1" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.11" />
<PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.3-preview" />
<PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.4-preview" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.11" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="NeoSmart.AsyncLock" Version="3.2.1" />
Expand Down
88 changes: 44 additions & 44 deletions src/kiota/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,31 @@
"Dependencies": [
{
"Name": "Microsoft.Kiota.Abstractions",
"Version": "1.3.0"
"Version": "1.7.3"
},
{
"Name": "Microsoft.Kiota.Http.HttpClientLibrary",
"Version": "1.0.6"
"Version": "1.3.3"
},
{
"Name": "Microsoft.Kiota.Serialization.Form",
"Version": "1.0.1"
"Version": "1.1.1"
},
{
"Name": "Microsoft.Kiota.Serialization.Json",
"Version": "1.0.8"
"Version": "1.1.2"
},
{
"Name": "Microsoft.Kiota.Authentication.Azure",
"Version": "1.0.3"
"Version": "1.1.2"
},
{
"Name": "Microsoft.Kiota.Serialization.Text",
"Version": "1.0.3"
"Version": "1.1.1"
},
{
"Name": "Microsoft.Kiota.Serialization.Multipart",
"Version": "1.0.0"
"Version": "1.1.1"
}
],
"DependencyInstallCommand": "dotnet add package {0} --version {1}"
Expand All @@ -61,35 +61,35 @@
"Dependencies": [
{
"Name": "com.microsoft.kiota:microsoft-kiota-abstractions",
"Version": "0.5.0"
"Version": "0.11.0"
},
{
"Name": "com.microsoft.kiota:microsoft-kiota-http-okHttp",
"Version": "0.5.0"
"Version": "0.11.0"
},
{
"Name": "com.microsoft.kiota:microsoft-kiota-serialization-form",
"Version": "0.5.0"
"Version": "0.11.0"
},
{
"Name": "com.microsoft.kiota:microsoft-kiota-serialization-json",
"Version": "0.5.0"
"Version": "0.11.0"
},
{
"Name": "com.microsoft.kiota:microsoft-kiota-authentication-azure",
"Version": "0.5.0"
"Version": "0.11.0"
},
{
"Name": "com.microsoft.kiota:microsoft-kiota-serialization-text",
"Version": "0.5.0"
"Version": "0.11.0"
},
{
"Name": "com.microsoft.kiota:microsoft-kiota-serialization-multipart",
"Version": "0.5.0"
"Version": "0.11.0"
},
{
"Name": "jakarta.annotation:jakarta.annotation-api",
"Version": "2.1.1"
"Version": "3.0.0-M1"
}
],
"DependencyInstallCommand": "{0}:{1}"
Expand All @@ -99,11 +99,11 @@
"Dependencies": [
{
"Name": "github.com/microsoft/kiota-abstractions-go",
"Version": "v1.2.0"
"Version": "v1.5.3"
},
{
"Name": "github.com/microsoft/kiota-http-go",
"Version": "v1.0.1"
"Version": "v1.1.1"
},
{
"Name": "github.com/microsoft/kiota-serialization-form-go",
Expand All @@ -115,7 +115,7 @@
},
{
"Name": "github.com/microsoft/kiota-authentication-azure-go",
"Version": "v1.0.0"
"Version": "v1.0.1"
},
{
"Name": "github.com/microsoft/kiota-serialization-text-go",
Expand All @@ -133,31 +133,31 @@
"Dependencies": [
{
"Name": "@microsoft/kiota-abstractions",
"Version": "1.0.0-preview.26"
"Version": "1.0.0-preview.35"
},
{
"Name": "@microsoft/kiota-http-fetchlibrary",
"Version": "1.0.0-preview.25"
"Version": "1.0.0-preview.34"
},
{
"Name": "@microsoft/kiota-serialization-form",
"Version": "1.0.0-preview.15"
"Version": "1.0.0-preview.24"
},
{
"Name": "@microsoft/kiota-serialization-json",
"Version": "1.0.0-preview.24"
"Version": "1.0.0-preview.35"
},
{
"Name": "@microsoft/kiota-authentication-azure",
"Version": "1.0.0-preview.21"
"Version": "1.0.0-preview.30"
},
{
"Name": "@microsoft/kiota-serialization-text",
"Version": "1.0.0-preview.23"
"Version": "1.0.0-preview.32"
},
{
"Name": "@microsoft/kiota-serialization-multipart",
"Version": "1.0.0-preview.3"
"Version": "1.0.0-preview.14"
}
],
"DependencyInstallCommand": "npm install {0}@{1} -S"
Expand All @@ -167,23 +167,23 @@
"Dependencies": [
{
"Name": "microsoft/kiota-abstractions",
"Version": "0.8.1"
"Version": "1.0.2"
},
{
"Name": "microsoft/kiota-http-guzzle",
"Version": "0.8.2"
"Version": "1.1.0"
},
{
"Name": "microsoft/kiota-serialization-json",
"Version": "0.6.0"
"Version": "1.0.1"
},
{
"Name": "microsoft/kiota-authentication-phpleague",
"Version": "0.8.2"
"Version": "1.0.1"
},
{
"Name": "microsoft/kiota-serialization-text",
"Version": "0.7.0"
"Version": "1.0.1"
}
],
"DependencyInstallCommand": "composer require {0}:{1}"
Expand All @@ -193,23 +193,23 @@
"Dependencies": [
{
"Name": "microsoft-kiota-abstractions",
"Version": "0.7.0"
"Version": "1.0.0"
},
{
"Name": "microsoft-kiota-http",
"Version": "0.4.4"
"Version": "1.2.0"
},
{
"Name": "microsoft-kiota-serialization-json",
"Version": "0.3.7"
"Version": "1.0.0"
},
{
"Name": "microsoft-kiota-authentication-azure",
"Version": "0.2.0"
"Version": "1.0.0"
},
{
"Name": "microsoft-kiota-serialization-text",
"Version": "0.2.1"
"Version": "1.0.0"
}
],
"DependencyInstallCommand": "pip install {0}=={1}"
Expand All @@ -219,15 +219,15 @@
"Dependencies": [
{
"Name": "microsoft_kiota_abstractions",
"Version": "0.14.0"
"Version": "0.14.3"
},
{
"Name": "microsoft_kiota_faraday",
"Version": "0.12.0"
},
{
"Name": "microsoft_kiota_serialization_json",
"Version": "0.9.0"
"Version": "0.9.1"
},
{
"Name": "microsoft_kiota_authentication_oauth",
Expand All @@ -246,31 +246,31 @@
"Dependencies": [
{
"Name": "Microsoft.Kiota.Abstractions",
"Version": "1.3.0"
"Version": "1.7.3"
},
{
"Name": "Microsoft.Kiota.Http.HttpClientLibrary",
"Version": "1.0.6"
"Version": "1.3.3"
},
{
"Name": "Microsoft.Kiota.Serialization.Form",
"Version": "1.0.1"
"Version": "1.1.1"
},
{
"Name": "Microsoft.Kiota.Serialization.Json",
"Version": "1.0.8"
"Version": "1.1.2"
},
{
"Name": "Microsoft.Kiota.Authentication.Azure",
"Version": "1.0.3"
"Version": "1.1.2"
},
{
"Name": "Microsoft.Kiota.Serialization.Text",
"Version": "1.0.3"
"Version": "1.1.1"
},
{
"Name": "Microsoft.Kiota.Cli.Commons",
"Version": "0.3.1-preview.1"
"Version": "1.0.0"
}
],
"DependencyInstallCommand": "dotnet add package {0} --version {1}"
Expand Down
2 changes: 1 addition & 1 deletion src/kiota/kiota.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<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.3-preview" />
<PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.4-preview" />
<PackageReference Include="StreamJsonRpc" Version="2.17.8" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
Expand Down
2 changes: 1 addition & 1 deletion tests/Kiota.Builder.Tests/Kiota.Builder.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PackageReference>
<PackageReference Include="DotNet.Glob" Version="3.1.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="moq" Version="4.20.69" />
<PackageReference Include="moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Loading

0 comments on commit efe1f4b

Please sign in to comment.