Fix cibuild

Author: bkoelman

JsonApiDotNetCore.sln.DotSettings

@@ -14,10 +14,16 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
 	<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002EThrowExpressionNullCheckPattern/@EntryIndexedValue">3000</s:Int64>
 	<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002ETraceAssertPattern/@EntryIndexedValue">50</s:Int64>
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/PropagateAnnotations/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=GeneratedCode_002F_002A_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=swagger_002Ejson/@EntryIndexedValue">True</s:Boolean>
+	
 	<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>
+	
+	
 	<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=swagger_002Eg_002Ejson/@EntryIndexedValue">swagger.g.json</s:String>
 	<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=swagger_002Ejson/@EntryIndexedValue">swagger.json</s:String>
+	<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=_002A_002A_002FGeneratedCode_002F_002A_002A/@EntryIndexedValue">**/GeneratedCode/**</s:String>
+	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IdentifierHighlightingEnabled/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IncludeWarningsInSwea/@EntryValue">True</s:Boolean>

src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj

@@ -29,7 +29,7 @@
       - https://gist.github.com/KirillOsenkov/f20cb84d37a89b01db63f8aafe03f19b
     -->
     <Exec
-      Command="dotnet kiota generate --language CSharp --class-name ExampleApiClient --namespace-name OpenApiKiotaClientExample.GeneratedCode --output ./GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --log-level Error --openapi ..\JsonApiDotNetCoreExample\GeneratedSwagger\JsonApiDotNetCoreExample.json" />
+      Command="dotnet kiota generate --language CSharp --class-name ExampleApiClient --namespace-name OpenApiKiotaClientExample.GeneratedCode --output ./GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --log-level Error --openapi ../JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json" />
 
     <ItemGroup>
       <!-- This isn't entirely reliable: may require a second build after the source swagger.json has changed, to get rid of compile errors. -->

src/Examples/OpenApiKiotaClientExample/PeopleMessageFormatter.cs

@@ -1,11 +1,13 @@
 using System.Text;
+using JetBrains.Annotations;
 using OpenApiKiotaClientExample.GeneratedCode.Models;
 
 namespace OpenApiKiotaClientExample;
 
 /// <summary>
 /// Prints the specified people, their assigned todo-items, and its tags.
 /// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 internal sealed class PeopleMessageFormatter
 {
     public static void PrintPeople(PersonCollectionResponseDocument? peopleResponse)

src/Examples/OpenApiNSwagClientExample/PeopleMessageFormatter.cs

@@ -1,12 +1,14 @@
 using System.Net;
 using System.Text;
+using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.Client.NSwag;
 
 namespace OpenApiNSwagClientExample;
 
 /// <summary>
 /// Prints the specified people, their assigned todo-items, and its tags.
 /// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 internal sealed class PeopleMessageFormatter
 {
     public static void PrintPeople(ApiResponse<PersonCollectionResponseDocument?> peopleResponse)

test/OpenApiKiotaEndToEndTests/AdditionalPropertiesTests.cs

@@ -6,6 +6,8 @@ namespace OpenApiKiotaEndToEndTests;
 
 public sealed class AdditionalPropertiesTests
 {
+    private static readonly string GeneratedCodeDirectory = $"{Path.PathSeparator}GeneratedCode{Path.PathSeparator}";
+
     [Fact]
     public async Task Additional_properties_are_only_allowed_in_meta()
     {
@@ -17,7 +19,7 @@ public async Task Additional_properties_are_only_allowed_in_meta()
             RecurseSubdirectories = true
         }))
         {
-            if (path.Contains(@"\GeneratedCode\", StringComparison.OrdinalIgnoreCase) && !path.EndsWith("_meta.cs", StringComparison.OrdinalIgnoreCase))
+            if (path.Contains(GeneratedCodeDirectory, StringComparison.OrdinalIgnoreCase) && !path.EndsWith("_meta.cs", StringComparison.OrdinalIgnoreCase))
             {
                 string content = await File.ReadAllTextAsync(path);
                 bool containsAdditionalData = content.Contains("public IDictionary<string, object> AdditionalData");

test/OpenApiKiotaEndToEndTests/Headers/ETagTests.cs

@@ -101,7 +101,7 @@ public async Task Returns_no_ETag_for_failed_GET_request()
         };
 
         // Act
-        Func<Task<CountryPrimaryResponseDocument?>> action = async () => await apiClient.Countries[Unknown.StringId.For<Country, Guid>()]
+        Func<Task<CountryPrimaryResponseDocument?>> action = () => apiClient.Countries[Unknown.StringId.For<Country, Guid>()]
             .GetAsync(configuration => configuration.Options.Add(headerInspector));
 
         // Assert
@@ -173,7 +173,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         headerInspector.ResponseHeaders.Clear();
 
         // Act
-        Func<Task<CountryCollectionResponseDocument?>> action = async () => await apiClient.Countries.GetAsync(configuration =>
+        Func<Task<CountryCollectionResponseDocument?>> action = () => apiClient.Countries.GetAsync(configuration =>
         {
             configuration.Headers.Add(HeaderNames.IfNoneMatch, responseETag);
             configuration.Options.Add(headerInspector);

test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj

@@ -27,9 +27,9 @@
 
   <Target Name="KiotaRunTool" BeforeTargets="BeforeCompile;CoreCompile" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
     <Exec
-      Command="dotnet kiota generate --language CSharp --class-name HeadersClient --namespace-name OpenApiNSwagEndToEndTests.Headers.GeneratedCode --output ./Headers/GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --log-level Error --openapi ..\OpenApiTests\Headers\GeneratedSwagger\swagger.g.json" />
+      Command="dotnet kiota generate --language CSharp --class-name HeadersClient --namespace-name OpenApiNSwagEndToEndTests.Headers.GeneratedCode --output ./Headers/GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --log-level Error --openapi ../OpenApiTests/Headers/GeneratedSwagger/swagger.g.json" />
     <Exec
-      Command="dotnet kiota generate --language CSharp --class-name QueryStringsClient --namespace-name OpenApiNSwagEndToEndTests.QueryStrings.GeneratedCode --output ./QueryStrings/GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --log-level Error --openapi ..\OpenApiTests\QueryStrings\GeneratedSwagger\swagger.g.json" />
+      Command="dotnet kiota generate --language CSharp --class-name QueryStringsClient --namespace-name OpenApiNSwagEndToEndTests.QueryStrings.GeneratedCode --output ./QueryStrings/GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --log-level Error --openapi ../OpenApiTests/QueryStrings/GeneratedSwagger/swagger.g.json" />
 
     <ItemGroup>
       <!-- This isn't entirely reliable: may require a second build after the source swagger.json has changed, to get rid of compile errors. -->