Skip to content

Commit 63439f8

Browse files
bkoelmanbkoelman
committed
Remove workaround for kiota bug
1 parent fcca17d commit 63439f8

File tree

10 files changed

+297
-3
lines changed

10 files changed

+297
-3
lines changed

Diff for: ‎.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,3 @@ FodyWeavers.xsd
423423
**/.idea/**/httpRequests/
424424
**/.idea/**/dataSources/
425425
!**/.idea/**/codeStyles/*
426-
427-
# Workaround for https://github.com/microsoft/kiota/issues/4228
428-
kiota-lock.json

Diff for: ‎JsonApiDotNetCore.sln.DotSettings

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=swagger_002Ejson/@EntryIndexedValue">True</s:Boolean>
77
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=71287D6F_002D6C3B_002D44B4_002D9FCA_002DE78FE3F02289_002Ff_003ASchemaGenerator_002Ecs/@EntryIndexedValue">71287D6F-6C3B-44B4-9FCA-E78FE3F02289/f:SchemaGenerator.cs</s:String>
88
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=83FF097C_002DC8C6_002D477B_002D9FAB_002DDF99B84978B5_002Ff_003AReadOnlySet_002Ecs/@EntryIndexedValue">83FF097C-C8C6-477B-9FAB-DF99B84978B5/f:ReadOnlySet.cs</s:String>
9+
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=kiota_002Dlock_002Ejson/@EntryIndexedValue">kiota-lock.json</s:String>
910
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=swagger_002Eg_002Ejson/@EntryIndexedValue">swagger.g.json</s:String>
1011
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=swagger_002Ejson/@EntryIndexedValue">swagger.json</s:String>
1112
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/kiota-lock.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"descriptionHash": "FF92B668728B3329C184D28DB2ACE0FC77CE0B49A523B41CF515B5EDB724B64AE2DFDC36CCEE985A1390C2D391C9C5A07F285FC44CA9C2754DC2574B07820EBC",
3+
"descriptionLocation": "../../JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json",
4+
"lockFileVersion": "1.0.0",
5+
"kiotaVersion": "1.24.1",
6+
"clientClassName": "ExampleApiClient",
7+
"typeAccessModifier": "Public",
8+
"clientNamespaceName": "OpenApiKiotaClientExample.GeneratedCode",
9+
"language": "CSharp",
10+
"usesBackingStore": true,
11+
"excludeBackwardCompatible": true,
12+
"includeAdditionalData": true,
13+
"disableSSLValidation": false,
14+
"serializers": [
15+
"Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
16+
"Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
17+
"Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
18+
"Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
19+
],
20+
"deserializers": [
21+
"Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
22+
"Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
23+
"Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
24+
],
25+
"structuredMimeTypes": [
26+
"application/json",
27+
"text/plain;q=0.9",
28+
"application/x-www-form-urlencoded;q=0.2",
29+
"multipart/form-data;q=0.1"
30+
],
31+
"includePatterns": [],
32+
"excludePatterns": [],
33+
"disabledValidationRules": [
34+
"KnownAndNotSupportedFormats",
35+
"InconsistentTypeFormatPair"
36+
]
37+
}

Diff for: ‎test/OpenApiKiotaEndToEndTests/AtomicOperations/GeneratedCode/kiota-lock.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"descriptionHash": "0FA4C6F14F49E8BEF234F16EA0564DE41378229D8F08E306965FA69DFB489811DEE5823A251690D0CAC5346F6879008F2A00E8CAEFC894F705ECB0D5CFD9EB12",
3+
"descriptionLocation": "../../../OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json",
4+
"lockFileVersion": "1.0.0",
5+
"kiotaVersion": "1.24.1",
6+
"clientClassName": "AtomicOperationsClient",
7+
"typeAccessModifier": "Public",
8+
"clientNamespaceName": "OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode",
9+
"language": "CSharp",
10+
"usesBackingStore": true,
11+
"excludeBackwardCompatible": true,
12+
"includeAdditionalData": true,
13+
"disableSSLValidation": false,
14+
"serializers": [
15+
"Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
16+
"Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
17+
"Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
18+
"Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
19+
],
20+
"deserializers": [
21+
"Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
22+
"Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
23+
"Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
24+
],
25+
"structuredMimeTypes": [
26+
"application/json",
27+
"text/plain;q=0.9",
28+
"application/x-www-form-urlencoded;q=0.2",
29+
"multipart/form-data;q=0.1"
30+
],
31+
"includePatterns": [],
32+
"excludePatterns": [],
33+
"disabledValidationRules": [
34+
"KnownAndNotSupportedFormats",
35+
"InconsistentTypeFormatPair"
36+
]
37+
}

Diff for: ‎test/OpenApiKiotaEndToEndTests/ClientIdGenerationModes/GeneratedCode/kiota-lock.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"descriptionHash": "F5B96359ED1889AA581B29688E5D091B20DE900ED46DB6115F29F1A614C43F08AE973C203786BBFB0C989054B8962A6532701FEA2B6815ED9F047AB1A66CFBD8",
3+
"descriptionLocation": "../../../OpenApiTests/ClientIdGenerationModes/GeneratedSwagger/swagger.g.json",
4+
"lockFileVersion": "1.0.0",
5+
"kiotaVersion": "1.24.1",
6+
"clientClassName": "ClientIdGenerationModesClient",
7+
"typeAccessModifier": "Public",
8+
"clientNamespaceName": "OpenApiKiotaEndToEndTests.ClientIdGenerationModes.GeneratedCode",
9+
"language": "CSharp",
10+
"usesBackingStore": true,
11+
"excludeBackwardCompatible": true,
12+
"includeAdditionalData": true,
13+
"disableSSLValidation": false,
14+
"serializers": [
15+
"Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
16+
"Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
17+
"Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
18+
"Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
19+
],
20+
"deserializers": [
21+
"Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
22+
"Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
23+
"Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
24+
],
25+
"structuredMimeTypes": [
26+
"application/json",
27+
"text/plain;q=0.9",
28+
"application/x-www-form-urlencoded;q=0.2",
29+
"multipart/form-data;q=0.1"
30+
],
31+
"includePatterns": [],
32+
"excludePatterns": [],
33+
"disabledValidationRules": [
34+
"KnownAndNotSupportedFormats",
35+
"InconsistentTypeFormatPair"
36+
]
37+
}

Diff for: ‎test/OpenApiKiotaEndToEndTests/Headers/GeneratedCode/kiota-lock.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"descriptionHash": "D7A01B5E17A3CAEED3BCAB2B44BA37AC5B89F59B7CCE0A410DF24E142B9D73FFED84441E3C94EF628E346C8DFB2B6A08BA253384132AE8E4C246579CCEF39DE3",
3+
"descriptionLocation": "../../../OpenApiTests/Headers/GeneratedSwagger/swagger.g.json",
4+
"lockFileVersion": "1.0.0",
5+
"kiotaVersion": "1.24.1",
6+
"clientClassName": "HeadersClient",
7+
"typeAccessModifier": "Public",
8+
"clientNamespaceName": "OpenApiKiotaEndToEndTests.Headers.GeneratedCode",
9+
"language": "CSharp",
10+
"usesBackingStore": true,
11+
"excludeBackwardCompatible": true,
12+
"includeAdditionalData": true,
13+
"disableSSLValidation": false,
14+
"serializers": [
15+
"Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
16+
"Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
17+
"Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
18+
"Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
19+
],
20+
"deserializers": [
21+
"Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
22+
"Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
23+
"Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
24+
],
25+
"structuredMimeTypes": [
26+
"application/json",
27+
"text/plain;q=0.9",
28+
"application/x-www-form-urlencoded;q=0.2",
29+
"multipart/form-data;q=0.1"
30+
],
31+
"includePatterns": [],
32+
"excludePatterns": [],
33+
"disabledValidationRules": [
34+
"KnownAndNotSupportedFormats",
35+
"InconsistentTypeFormatPair"
36+
]
37+
}

Diff for: ‎test/OpenApiKiotaEndToEndTests/Links/GeneratedCode/kiota-lock.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"descriptionHash": "883CA2E4CAA6871A31807542112BC2EBF154717C0A52764867EA9E025FB99E0BD78D938F69266AF56A488630855A70CFB4A37BB6602CA8B7A7383DC21CE3229E",
3+
"descriptionLocation": "../../../OpenApiTests/Links/Enabled/GeneratedSwagger/swagger.g.json",
4+
"lockFileVersion": "1.0.0",
5+
"kiotaVersion": "1.24.1",
6+
"clientClassName": "LinksClient",
7+
"typeAccessModifier": "Public",
8+
"clientNamespaceName": "OpenApiKiotaEndToEndTests.Links.GeneratedCode",
9+
"language": "CSharp",
10+
"usesBackingStore": true,
11+
"excludeBackwardCompatible": true,
12+
"includeAdditionalData": true,
13+
"disableSSLValidation": false,
14+
"serializers": [
15+
"Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
16+
"Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
17+
"Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
18+
"Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
19+
],
20+
"deserializers": [
21+
"Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
22+
"Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
23+
"Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
24+
],
25+
"structuredMimeTypes": [
26+
"application/json",
27+
"text/plain;q=0.9",
28+
"application/x-www-form-urlencoded;q=0.2",
29+
"multipart/form-data;q=0.1"
30+
],
31+
"includePatterns": [],
32+
"excludePatterns": [],
33+
"disabledValidationRules": [
34+
"KnownAndNotSupportedFormats",
35+
"InconsistentTypeFormatPair"
36+
]
37+
}

Diff for: ‎test/OpenApiKiotaEndToEndTests/ModelStateValidation/GeneratedCode/kiota-lock.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"descriptionHash": "8B885D48B661E47CBB125A626316B4897155677AFC90A8EB6E17A9DFB723CB2BC426B019A5F8343CA58BA7798754AEC5624B2599690EE03156E77AB5439E70DA",
3+
"descriptionLocation": "../../../OpenApiTests/ModelStateValidation/GeneratedSwagger/swagger.g.json",
4+
"lockFileVersion": "1.0.0",
5+
"kiotaVersion": "1.24.1",
6+
"clientClassName": "ModelStateValidationClient",
7+
"typeAccessModifier": "Public",
8+
"clientNamespaceName": "OpenApiKiotaEndToEndTests.ModelStateValidation.GeneratedCode",
9+
"language": "CSharp",
10+
"usesBackingStore": true,
11+
"excludeBackwardCompatible": true,
12+
"includeAdditionalData": true,
13+
"disableSSLValidation": false,
14+
"serializers": [
15+
"Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
16+
"Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
17+
"Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
18+
"Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
19+
],
20+
"deserializers": [
21+
"Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
22+
"Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
23+
"Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
24+
],
25+
"structuredMimeTypes": [
26+
"application/json",
27+
"text/plain;q=0.9",
28+
"application/x-www-form-urlencoded;q=0.2",
29+
"multipart/form-data;q=0.1"
30+
],
31+
"includePatterns": [],
32+
"excludePatterns": [],
33+
"disabledValidationRules": [
34+
"KnownAndNotSupportedFormats",
35+
"InconsistentTypeFormatPair"
36+
]
37+
}

Diff for: ‎test/OpenApiKiotaEndToEndTests/QueryStrings/GeneratedCode/kiota-lock.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"descriptionHash": "A97763502718F5062870C53EBD7FF426E267E9D68820C8268297AB50A34C42F34033703FCB6C8EE4DE0967055086726285A30115FC9EAFE45830AFB0ECF5DFE6",
3+
"descriptionLocation": "../../../OpenApiTests/QueryStrings/GeneratedSwagger/swagger.g.json",
4+
"lockFileVersion": "1.0.0",
5+
"kiotaVersion": "1.24.1",
6+
"clientClassName": "QueryStringsClient",
7+
"typeAccessModifier": "Public",
8+
"clientNamespaceName": "OpenApiKiotaEndToEndTests.QueryStrings.GeneratedCode",
9+
"language": "CSharp",
10+
"usesBackingStore": true,
11+
"excludeBackwardCompatible": true,
12+
"includeAdditionalData": true,
13+
"disableSSLValidation": false,
14+
"serializers": [
15+
"Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
16+
"Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
17+
"Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
18+
"Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
19+
],
20+
"deserializers": [
21+
"Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
22+
"Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
23+
"Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
24+
],
25+
"structuredMimeTypes": [
26+
"application/json",
27+
"text/plain;q=0.9",
28+
"application/x-www-form-urlencoded;q=0.2",
29+
"multipart/form-data;q=0.1"
30+
],
31+
"includePatterns": [],
32+
"excludePatterns": [],
33+
"disabledValidationRules": [
34+
"KnownAndNotSupportedFormats",
35+
"InconsistentTypeFormatPair"
36+
]
37+
}

Diff for: ‎test/OpenApiKiotaEndToEndTests/RestrictedControllers/GeneratedCode/kiota-lock.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"descriptionHash": "49BCC98A33A4B1D9B4244F06331A0D1B6E275B7F88F388D925C3A2B649687E6366349C0952D0631F4E8E113160ACC5841405707869051A94484DD2A653E40B7F",
3+
"descriptionLocation": "../../../OpenApiTests/RestrictedControllers/GeneratedSwagger/swagger.g.json",
4+
"lockFileVersion": "1.0.0",
5+
"kiotaVersion": "1.24.1",
6+
"clientClassName": "RestrictedControllersClient",
7+
"typeAccessModifier": "Public",
8+
"clientNamespaceName": "OpenApiKiotaEndToEndTests.RestrictedControllers.GeneratedCode",
9+
"language": "CSharp",
10+
"usesBackingStore": true,
11+
"excludeBackwardCompatible": true,
12+
"includeAdditionalData": true,
13+
"disableSSLValidation": false,
14+
"serializers": [
15+
"Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
16+
"Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
17+
"Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
18+
"Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
19+
],
20+
"deserializers": [
21+
"Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
22+
"Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
23+
"Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
24+
],
25+
"structuredMimeTypes": [
26+
"application/json",
27+
"text/plain;q=0.9",
28+
"application/x-www-form-urlencoded;q=0.2",
29+
"multipart/form-data;q=0.1"
30+
],
31+
"includePatterns": [],
32+
"excludePatterns": [],
33+
"disabledValidationRules": [
34+
"KnownAndNotSupportedFormats",
35+
"InconsistentTypeFormatPair"
36+
]
37+
}

0 commit comments

Comments
 (0)