From 5ceea83f72817daa6684dfdcb198b3b469cb4e14 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Mon, 18 Nov 2024 17:51:41 +0100 Subject: [PATCH 1/8] chore: nuget update --- Directory.Build.props | 2 +- .../Atc.CodeGeneration.CSharp.csproj | 6 +++--- .../Atc.Rest.ApiGenerator.CLI.csproj | 6 +++--- .../Atc.Rest.ApiGenerator.Client.CSharp.csproj | 4 ++-- .../Atc.Rest.ApiGenerator.CodingRules.csproj | 4 ++-- .../Atc.Rest.ApiGenerator.Contracts.csproj | 4 ++-- ....Rest.ApiGenerator.Framework.Minimal.csproj | 2 +- .../Atc.Rest.ApiGenerator.Framework.Mvc.csproj | 4 ++-- .../Atc.Rest.ApiGenerator.Framework.csproj | 8 ++++---- .../Atc.Rest.ApiGenerator.Nuget.csproj | 4 ++-- .../Atc.Rest.ApiGenerator.OpenApi.csproj | 10 +++++----- .../Atc.Rest.ApiGenerator.csproj | 16 ++++++++-------- src/Directory.Build.props | 2 +- .../Atc.CodeGeneration.CSharp.Tests.csproj | 8 ++------ .../Atc.Rest.ApiGenerator.CLI.Tests.csproj | 18 +++++++----------- ...tc.Rest.ApiGenerator.Contracts.Tests.csproj | 8 ++------ ...est.ApiGenerator.Framework.Mvc.Tests.csproj | 8 ++------ ...tc.Rest.ApiGenerator.Framework.Tests.csproj | 8 ++------ .../Atc.Rest.ApiGenerator.Nuget.Tests.csproj | 10 +++------- .../Atc.Rest.ApiGenerator.OpenApi.Tests.csproj | 8 ++------ test/Directory.Build.props | 2 +- 21 files changed, 57 insertions(+), 85 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 69ce70ffb..c483a1a4c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -43,7 +43,7 @@ - + diff --git a/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj b/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj index 6d6e5502d..7a5a2cda6 100644 --- a/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj +++ b/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj @@ -6,9 +6,9 @@ - - - + + + \ No newline at end of file diff --git a/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj b/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj index 25b8e051d..052874b12 100644 --- a/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj +++ b/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj b/src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj index ca49b24c8..5f57560b3 100644 --- a/src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj +++ b/src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj b/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj index 5c3b13ee1..89537e251 100644 --- a/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj +++ b/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj b/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj index 5c9ab278f..92a0a1a34 100644 --- a/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj +++ b/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj index 02a09f919..0c72b448d 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj +++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj b/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj index 0b0244615..350284fc4 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj +++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj b/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj index f4cf9e9d7..41a3cb326 100644 --- a/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj +++ b/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj b/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj index 5c3b13ee1..89537e251 100644 --- a/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj +++ b/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj b/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj index 4d7957bdf..bf2f7e865 100644 --- a/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj +++ b/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + diff --git a/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj b/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj index 3ab91a449..87c2f45e5 100644 --- a/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj +++ b/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj @@ -8,15 +8,15 @@ - - - - - + + + + + - - - + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 96a2d6a7e..19967457b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -54,7 +54,7 @@ - + \ No newline at end of file diff --git a/test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj b/test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj index b6edc78e8..1a746cfca 100644 --- a/test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj +++ b/test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj @@ -6,8 +6,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -23,8 +23,4 @@ - - - - diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj b/test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj index 54bb5e620..379240bb3 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj @@ -57,15 +57,15 @@ - - - - - - + + + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -80,8 +80,4 @@ - - - - diff --git a/test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj b/test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj index 8eac385a5..f95fd3dc1 100644 --- a/test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj +++ b/test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj @@ -6,8 +6,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -22,8 +22,4 @@ - - - - diff --git a/test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj b/test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj index 99425f73e..ae98b1681 100644 --- a/test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj +++ b/test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj @@ -7,8 +7,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -19,8 +19,4 @@ - - - - diff --git a/test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj b/test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj index 9086dbb85..c25a64a96 100644 --- a/test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj +++ b/test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj @@ -6,8 +6,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -18,8 +18,4 @@ - - - - diff --git a/test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj b/test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj index 1ee96885b..50c1928a2 100644 --- a/test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj +++ b/test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -23,8 +23,4 @@ - - - - diff --git a/test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj b/test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj index 9a6b42367..9c420da6a 100644 --- a/test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj +++ b/test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj @@ -6,8 +6,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -22,8 +22,4 @@ - - - - diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 020fd5c26..31909604c 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -11,7 +11,7 @@ - + From b79f2d7cd07b02e177ceba39b364c9b4b2e480a9 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Mon, 18 Nov 2024 17:52:06 +0100 Subject: [PATCH 2/8] chore: suppres some IDE rules --- .editorconfig | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index dedb789f9..f4587b1eb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -464,11 +464,13 @@ dotnet_diagnostic.MA0048.severity = error # https://github.com/atc-net dotnet_diagnostic.CA1014.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA1014.md dotnet_diagnostic.CA1068.severity = error # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA1068.md dotnet_diagnostic.CA1305.severity = error +dotnet_diagnostic.CA1308.severity = suggestion # Normalize strings to uppercase dotnet_diagnostic.CA1510.severity = suggestion # Use ArgumentNullException throw helper dotnet_diagnostic.CA1511.severity = suggestion # Use ArgumentException throw helper dotnet_diagnostic.CA1512.severity = suggestion # Use ArgumentOutOfRangeException throw helper dotnet_diagnostic.CA1513.severity = suggestion # Use ObjectDisposedException throw helper dotnet_diagnostic.CA1514.severity = error # Avoid redundant length argument +dotnet_diagnostic.CA1515.severity = suggestion # Because an application's API isn't typically referenced from outside the assembly, types can be made internal (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1515) dotnet_diagnostic.CA1707.severity = error # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA1707.md dotnet_diagnostic.CA1812.severity = none dotnet_diagnostic.CA1822.severity = suggestion @@ -504,7 +506,16 @@ dotnet_diagnostic.CA2259.severity = error # Ensure ThreadStatic is onl dotnet_diagnostic.CA2260.severity = error # Implement generic math interfaces correctly dotnet_diagnostic.CA2261.severity = error # Do not use ConfigureAwaitOptions.SuppressThrowing with Task dotnet_diagnostic.IDE0005.severity = warning # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/IDE0005.md +dotnet_diagnostic.IDE0010.severity = suggestion # Populate switch +dotnet_diagnostic.IDE0028.severity = suggestion # Collection initialization can be simplified +dotnet_diagnostic.IDE0021.severity = suggestion # Use expression body for constructor +dotnet_diagnostic.IDE0055.severity = none # Fix formatting dotnet_diagnostic.IDE0058.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/IDE0058.md +dotnet_diagnostic.IDE0061.severity = suggestion # Use expression body for local function +dotnet_diagnostic.IDE0130.severity = suggestion # Namespace does not match folder structure +dotnet_diagnostic.IDE0290.severity = none # Use primary constructor +dotnet_diagnostic.IDE0301.severity = suggestion # Use collection expression for empty +dotnet_diagnostic.IDE0305.severity = suggestion # Collection initialization can be simplified # Microsoft - Compiler Errors @@ -541,6 +552,7 @@ dotnet_diagnostic.SA1649.severity = error # https://github.com/atc-net # https://rules.sonarsource.com/csharp dotnet_diagnostic.S1135.severity = suggestion # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/SonarAnalyzerCSharp/S1135.md dotnet_diagnostic.S2629.severity = none # Don't use string interpolation in logging message templates. +dotnet_diagnostic.S3358.severity = none # Extract this nested ternary operation into an independent statement. dotnet_diagnostic.S6602.severity = none # "Find" method should be used instead of the "FirstOrDefault" dotnet_diagnostic.S6603.severity = none # The collection-specific "TrueForAll" method should be used instead of the "All" dotnet_diagnostic.S6605.severity = none # Collection-specific "Exists" method should be used instead of the "Any" @@ -584,9 +596,19 @@ dotnet_diagnostic.CA1822.Severity = none dotnet_diagnostic.CA1859.Severity = none dotnet_diagnostic.CA1860.Severity = none dotnet_diagnostic.CA1861.Severity = none + dotnet_diagnostic.S125.Severity = none dotnet_diagnostic.S1481.Severity = none dotnet_diagnostic.SA1512.Severity = none dotnet_diagnostic.SA1513.Severity = none -dotnet_diagnostic.AsyncFixer02.Severity = none # ToListAsync should be used instead of xxx \ No newline at end of file +dotnet_diagnostic.AsyncFixer02.Severity = none # ToListAsync should be used instead of xxx + +dotnet_diagnostic.IDE0022.Severity = none # Use expression body for method +dotnet_diagnostic.IDE0045.Severity = none # 'if' statement can be simplified +dotnet_diagnostic.IDE0046.Severity = none # 'if' statement can be simplified +dotnet_diagnostic.IDE0052.Severity = none # Private member +dotnet_diagnostic.IDE0059.Severity = none # Unnecessary assignment of a value +dotnet_diagnostic.IDE0060.Severity = none # Remove unused parameter +dotnet_diagnostic.IDE0270.Severity = none # Null check can be simplified +dotnet_diagnostic.IDE0300.Severity = none # Collection initialization can be simplified \ No newline at end of file From 375ffd3dc7ba664b5f96cc7bf006217dc743c652 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Mon, 18 Nov 2024 17:52:47 +0100 Subject: [PATCH 3/8] refact: use Enum.GetNames insteadof Enum.GetNames(typeof) --- .../Commands/Attributes/AspNetOutputTypeAttribute.cs | 2 +- .../Commands/Attributes/SwaggerThemeModeAttribute.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/AspNetOutputTypeAttribute.cs b/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/AspNetOutputTypeAttribute.cs index 75424b1dd..0ea5469b6 100644 --- a/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/AspNetOutputTypeAttribute.cs +++ b/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/AspNetOutputTypeAttribute.cs @@ -22,7 +22,7 @@ public override string Description { get { - var values = Enum.GetNames(typeof(AspNetOutputType)) + var values = Enum.GetNames() .Select(enumValue => enumValue.Equals(Default.ToString(), StringComparison.Ordinal) ? $"{enumValue} (default)" : enumValue) diff --git a/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/SwaggerThemeModeAttribute.cs b/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/SwaggerThemeModeAttribute.cs index 79820c947..e74bcf273 100644 --- a/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/SwaggerThemeModeAttribute.cs +++ b/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/SwaggerThemeModeAttribute.cs @@ -22,7 +22,7 @@ public override string Description { get { - var values = Enum.GetNames(typeof(SwaggerThemeMode)) + var values = Enum.GetNames() .Select(enumValue => enumValue.Equals(Default.ToString(), StringComparison.Ordinal) ? $"{enumValue} (default)" : enumValue) From 142bb57ff5b93b4d4bdaa6bb2d4af823de5aedf0 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Mon, 18 Nov 2024 23:23:54 +0100 Subject: [PATCH 4/8] feat: add inherit NoWarn for project files --- .../ProjectGenerator/ClientCSharpApiGenerator.cs | 2 +- .../ProjectGenerator/ServerApiGenerator.cs | 2 +- .../ProjectGenerator/ServerDomainGenerator.cs | 2 +- .../ProjectGenerator/ServerHostGenerator.cs | 2 +- .../ProjectGenerator/ServerHostTestGenerator.cs | 2 +- .../ProjectGenerator/ServerApiGenerator.cs | 2 +- .../ProjectGenerator/ServerDomainGenerator.cs | 2 +- .../ProjectGenerator/ServerHostGenerator.cs | 2 +- .../ProjectGenerator/ServerHostTestGenerator.cs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Atc.Rest.ApiGenerator.Client.CSharp/ProjectGenerator/ClientCSharpApiGenerator.cs b/src/Atc.Rest.ApiGenerator.Client.CSharp/ProjectGenerator/ClientCSharpApiGenerator.cs index 0e3a7c2b8..3b7a3ac26 100644 --- a/src/Atc.Rest.ApiGenerator.Client.CSharp/ProjectGenerator/ClientCSharpApiGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Client.CSharp/ProjectGenerator/ClientCSharpApiGenerator.cs @@ -87,7 +87,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerApiGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerApiGenerator.cs index 3b8529f79..67533c4d3 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerApiGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerApiGenerator.cs @@ -81,7 +81,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerDomainGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerDomainGenerator.cs index cf081dfff..9b80ba590 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerDomainGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerDomainGenerator.cs @@ -70,7 +70,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostGenerator.cs index eebca68b6..40881b7e9 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostGenerator.cs @@ -72,7 +72,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostTestGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostTestGenerator.cs index e671832c1..c0b8c662e 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostTestGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostTestGenerator.cs @@ -76,7 +76,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerApiGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerApiGenerator.cs index 668733adc..121cd8f65 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerApiGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerApiGenerator.cs @@ -81,7 +81,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerDomainGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerDomainGenerator.cs index 9c90ffc5b..af8bc15c9 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerDomainGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerDomainGenerator.cs @@ -55,7 +55,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostGenerator.cs index db5895de4..85c0b6fc4 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostGenerator.cs @@ -69,7 +69,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostTestGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostTestGenerator.cs index 42277e719..0afe11257 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostTestGenerator.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostTestGenerator.cs @@ -83,7 +83,7 @@ public async Task ScaffoldProjectFile() ], [ new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"), - new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"), + new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"), ], ], [ From 7b6ba19d1882bdc558675fa08cde9d9cf35468c3 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Mon, 18 Nov 2024 23:24:31 +0100 Subject: [PATCH 5/8] feat: update some nuget package versions in NugetPackageReferenceProvider --- .../Providers/NugetPackageReferenceProvider.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Atc.Rest.ApiGenerator.Framework/Providers/NugetPackageReferenceProvider.cs b/src/Atc.Rest.ApiGenerator.Framework/Providers/NugetPackageReferenceProvider.cs index f6714ef84..64e0837ee 100644 --- a/src/Atc.Rest.ApiGenerator.Framework/Providers/NugetPackageReferenceProvider.cs +++ b/src/Atc.Rest.ApiGenerator.Framework/Providers/NugetPackageReferenceProvider.cs @@ -8,14 +8,14 @@ public class NugetPackageReferenceProvider( private Dictionary PackageDefaultVersions { get; } = new(StringComparer.Ordinal) { { "Asp.Versioning.Http", "8.1.0" }, - { "Atc", "2.0.472" }, + { "Atc", "2.0.525" }, { "Atc.Azure.Options", "3.0.31" }, - { "Atc.Rest", "2.0.472" }, + { "Atc.Rest", "2.0.525" }, { "Atc.Rest.Client", "1.0.36" }, - { "Atc.Rest.Extended", "2.0.472" }, - { "Atc.Rest.FluentAssertions", "2.0.472" }, - { "Atc.Rest.MinimalApi", "1.0.81" }, - { "Atc.XUnit", "2.0.472" }, + { "Atc.Rest.Extended", "2.0.525" }, + { "Atc.Rest.FluentAssertions", "2.0.525" }, + { "Atc.Rest.MinimalApi", "1.0.87" }, + { "Atc.XUnit", "2.0.525" }, { "AutoFixture", "4.18.1" }, { "AutoFixture.AutoNSubstitute", "4.18.1" }, { "AutoFixture.Xunit2", "4.18.1" }, @@ -28,7 +28,7 @@ public class NugetPackageReferenceProvider( { "Microsoft.NETCore.Platforms", "7.0.4" }, { "Microsoft.NET.Test.Sdk", "17.10.0" }, { "NSubstitute", "5.1.0" }, - { "Swashbuckle.AspNetCore", "6.7.0" }, + { "Swashbuckle.AspNetCore", "7.0.0" }, { "xunit", "2.8.1" }, { "xunit.runner.visualstudio", "2.8.1" }, }; @@ -84,6 +84,7 @@ public async Task GetAtcApiGeneratorVersion() { new("Asp.Versioning.Http", PackageDefaultVersions["Asp.Versioning.Http"]), new("Atc", atcVersion), + new("Atc.Rest.Extended", atcVersion), new("Atc.Rest.MinimalApi", PackageDefaultVersions["Atc.Rest.MinimalApi"]), new("Microsoft.NETCore.Platforms", PackageDefaultVersions["Microsoft.NETCore.Platforms"]), new("Swashbuckle.AspNetCore", PackageDefaultVersions["Swashbuckle.AspNetCore"]), From 08f50dc68f3081799125cb20cf80ba1922ba2df1 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Mon, 18 Nov 2024 23:25:00 +0100 Subject: [PATCH 6/8] chore: break down parameters --- .../ContentGeneratorServerResultParametersFactory.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Factories/ContentGeneratorServerResultParametersFactory.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Factories/ContentGeneratorServerResultParametersFactory.cs index f9afad917..1c079f52c 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Factories/ContentGeneratorServerResultParametersFactory.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Factories/ContentGeneratorServerResultParametersFactory.cs @@ -35,7 +35,10 @@ public static ContentGeneratorServerResultParameters Create( var okResponseModel = responseModels.Find(x => x.StatusCode == HttpStatusCode.OK) ?? responseModels.Find(x => x.StatusCode == HttpStatusCode.Created); - if (ShouldAppendImplicitOperatorContent(httpStatusCodes, okResponseModel?.DataType, openApiOperation.Responses.IsSchemaUsingBinaryFormatForOkResponse())) + if (ShouldAppendImplicitOperatorContent( + httpStatusCodes, + okResponseModel?.DataType, + openApiOperation.Responses.IsSchemaUsingBinaryFormatForOkResponse())) { var collectionDataType = okResponseModel?.CollectionDataType; var dataType = okResponseModel?.DataType; @@ -76,8 +79,8 @@ private static bool ShouldAppendImplicitOperatorContent( httpStatusCode = HttpStatusCode.Created; } - if (string.IsNullOrEmpty(modelName) && - httpStatusCode == HttpStatusCode.Created) + if (httpStatusCode == HttpStatusCode.Created && + string.IsNullOrEmpty(modelName)) { return false; } From 144eb7b00933620340096eff82317e30f6ab04f9 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Mon, 18 Nov 2024 23:25:58 +0100 Subject: [PATCH 7/8] feat: bring back FromRoute named parameter names for Mvc --- .../ContentGeneratorServerParameter.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ContentGenerators/ContentGeneratorServerParameter.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ContentGenerators/ContentGeneratorServerParameter.cs index 33887d46e..0a46387b2 100644 --- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ContentGenerators/ContentGeneratorServerParameter.cs +++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ContentGenerators/ContentGeneratorServerParameter.cs @@ -65,10 +65,21 @@ private static void AppendPropertyAttributes( { switch (item.ParameterLocationType) { - case ParameterLocationType.Query: - case ParameterLocationType.Header: case ParameterLocationType.Route: + case ParameterLocationType.Header: case ParameterLocationType.Cookie: + if (string.IsNullOrEmpty(item.Name)) + { + sb.AppendLine(4, $"[From{item.ParameterLocationType}]"); + } + else + { + sb.AppendLine(4, $"[From{item.ParameterLocationType}(Name = \"{item.Name}\")]"); + } + + break; + + case ParameterLocationType.Query: if (string.IsNullOrEmpty(item.Name) || item.Name.Equals(item.ParameterName, StringComparison.OrdinalIgnoreCase)) { From 778d1fa8f79db103f1518ca491ed5ccf7dc49c21 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Mon, 18 Nov 2024 23:26:59 +0100 Subject: [PATCH 8/8] test: update test with named parameters in FromRoute for Mvc --- .../Parameters/SetAccountNameParameters.verified.cs | 2 +- .../Parameters/UpdateAccountNameParameters.verified.cs | 4 ++-- .../GetAddressesByPostalCodesParameters.verified.cs | 2 +- .../Parameters/GetEventArgByIdParameters.verified.cs | 2 +- .../Files/Parameters/GetFileByIdParameters.verified.cs | 2 +- .../Items/Parameters/UpdateItemParameters.verified.cs | 2 +- .../Orders/Parameters/GetOrderByIdParameters.verified.cs | 2 +- .../Orders/Parameters/PatchOrdersIdParameters.verified.cs | 8 ++++---- .../Users/Parameters/DeleteUserByIdParameters.verified.cs | 2 +- .../Users/Parameters/GetUserByIdParameters.verified.cs | 2 +- .../Parameters/UpdateMyTestGenderParameters.verified.cs | 2 +- .../Users/Parameters/UpdateUserByIdParameters.verified.cs | 2 +- .../Parameters/SetAccountNameParameters.verified.cs | 2 +- .../Parameters/UpdateAccountNameParameters.verified.cs | 4 ++-- .../GetAddressesByPostalCodesParameters.verified.cs | 2 +- .../Parameters/GetEventArgByIdParameters.verified.cs | 2 +- .../Files/Parameters/GetFileByIdParameters.verified.cs | 2 +- .../Items/Parameters/UpdateItemParameters.verified.cs | 2 +- .../Orders/Parameters/GetOrderByIdParameters.verified.cs | 2 +- .../Orders/Parameters/PatchOrdersIdParameters.verified.cs | 8 ++++---- .../Users/Parameters/DeleteUserByIdParameters.verified.cs | 2 +- .../Users/Parameters/GetUserByIdParameters.verified.cs | 2 +- .../Parameters/UpdateMyTestGenderParameters.verified.cs | 2 +- .../Users/Parameters/UpdateUserByIdParameters.verified.cs | 2 +- .../Parameters/GetEventArgByIdParameters.verified.cs | 2 +- .../Orders/Parameters/GetOrderByIdParameters.verified.cs | 2 +- .../Parameters/GetEventArgByIdParameters.verified.cs | 2 +- .../Orders/Parameters/GetOrderByIdParameters.verified.cs | 2 +- .../Users/Parameters/DeleteUserByIdParameters.verified.cs | 2 +- .../Users/Parameters/GetUserByIdParameters.verified.cs | 2 +- .../Users/Parameters/UpdateUserByIdParameters.verified.cs | 2 +- .../Users/Parameters/DeleteUserByIdParameters.verified.cs | 2 +- .../Users/Parameters/GetUserByIdParameters.verified.cs | 2 +- .../Users/Parameters/UpdateUserByIdParameters.verified.cs | 2 +- .../Pets/Parameters/ShowPetByIdParameters.verified.cs | 2 +- .../Pets/Parameters/ShowPetByIdParameters.verified.cs | 2 +- 36 files changed, 44 insertions(+), 44 deletions(-) diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs index eb389f6c2..8080c7e7d 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs @@ -17,7 +17,7 @@ public class SetAccountNameParameters /// /// The accountId. /// - [FromRoute] + [FromRoute(Name = "accountId")] [Required] public Guid AccountId { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs index 4bd8c666f..c09141f2a 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs @@ -17,14 +17,14 @@ public class UpdateAccountNameParameters /// /// The accountId. /// - [FromRoute] + [FromRoute(Name = "accountId")] [Required] public Guid AccountId { get; set; } /// /// The account name. /// - [FromHeader] + [FromHeader(Name = "name")] public string? Name { get; set; } /// diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs index c9050589e..1b80fb8a5 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs @@ -17,7 +17,7 @@ public class GetAddressesByPostalCodesParameters /// /// The postalCode to limit addresses on. /// - [FromRoute] + [FromRoute(Name = "postalCode")] [Required] public string PostalCode { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs index 288fd0812..1557d3207 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetEventArgByIdParameters /// /// The id of the eventArgs. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public string Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs index 06da7568c..6251d8465 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetFileByIdParameters /// /// The file id. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public string Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs index f94f8402f..395fb35ad 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs @@ -17,7 +17,7 @@ public class UpdateItemParameters /// /// The id of the order. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs index 30f290a5d..f51b67a65 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetOrderByIdParameters /// /// The id of the order. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs index 45ae4034d..e77514d13 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs @@ -17,28 +17,28 @@ public class PatchOrdersIdParameters /// /// The id of the order. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } /// /// The myTestHeader special key. /// - [FromHeader] + [FromHeader(Name = "myTestHeader")] [Required] public string MyTestHeader { get; set; } /// /// The myTestHeaderBool special key. /// - [FromHeader] + [FromHeader(Name = "myTestHeaderBool")] [Required] public bool MyTestHeaderBool { get; set; } /// /// The myTestHeaderInt special key. /// - [FromHeader] + [FromHeader(Name = "myTestHeaderInt")] [Required] public int MyTestHeaderInt { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs index 4f35a0278..2a7f312c7 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class DeleteUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs index 59864df2f..faebab53d 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs index 94dbddc81..4ef21d6b2 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs @@ -17,7 +17,7 @@ public class UpdateMyTestGenderParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs index 5645b4686..eaac1c240 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class UpdateUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs index eb389f6c2..8080c7e7d 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs @@ -17,7 +17,7 @@ public class SetAccountNameParameters /// /// The accountId. /// - [FromRoute] + [FromRoute(Name = "accountId")] [Required] public Guid AccountId { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs index 4bd8c666f..c09141f2a 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs @@ -17,14 +17,14 @@ public class UpdateAccountNameParameters /// /// The accountId. /// - [FromRoute] + [FromRoute(Name = "accountId")] [Required] public Guid AccountId { get; set; } /// /// The account name. /// - [FromHeader] + [FromHeader(Name = "name")] public string? Name { get; set; } /// diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs index c9050589e..1b80fb8a5 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs @@ -17,7 +17,7 @@ public class GetAddressesByPostalCodesParameters /// /// The postalCode to limit addresses on. /// - [FromRoute] + [FromRoute(Name = "postalCode")] [Required] public string PostalCode { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs index 288fd0812..1557d3207 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetEventArgByIdParameters /// /// The id of the eventArgs. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public string Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs index 06da7568c..6251d8465 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetFileByIdParameters /// /// The file id. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public string Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs index f94f8402f..395fb35ad 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs @@ -17,7 +17,7 @@ public class UpdateItemParameters /// /// The id of the order. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs index 30f290a5d..f51b67a65 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetOrderByIdParameters /// /// The id of the order. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs index 45ae4034d..e77514d13 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs @@ -17,28 +17,28 @@ public class PatchOrdersIdParameters /// /// The id of the order. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } /// /// The myTestHeader special key. /// - [FromHeader] + [FromHeader(Name = "myTestHeader")] [Required] public string MyTestHeader { get; set; } /// /// The myTestHeaderBool special key. /// - [FromHeader] + [FromHeader(Name = "myTestHeaderBool")] [Required] public bool MyTestHeaderBool { get; set; } /// /// The myTestHeaderInt special key. /// - [FromHeader] + [FromHeader(Name = "myTestHeaderInt")] [Required] public int MyTestHeaderInt { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs index 4f35a0278..2a7f312c7 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class DeleteUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs index 59864df2f..faebab53d 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs index 94dbddc81..4ef21d6b2 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs @@ -17,7 +17,7 @@ public class UpdateMyTestGenderParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs index 5645b4686..eaac1c240 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class UpdateUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs index b57486c32..807e8870c 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetEventArgByIdParameters /// /// The id of the eventArgs. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public string Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs index 92ef0d429..1cf768d4f 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetOrderByIdParameters /// /// The id of the order. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs index b57486c32..807e8870c 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetEventArgByIdParameters /// /// The id of the eventArgs. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public string Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs index 92ef0d429..1cf768d4f 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetOrderByIdParameters /// /// The id of the order. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs index e0c314d94..ebe1989b3 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class DeleteUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs index 3babec081..8303d6567 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs index 38574a80e..a1f17dcea 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class UpdateUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs index e0c314d94..ebe1989b3 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class DeleteUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs index 3babec081..8303d6567 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class GetUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs index 38574a80e..a1f17dcea 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class UpdateUserByIdParameters /// /// Id of the user. /// - [FromRoute] + [FromRoute(Name = "id")] [Required] public Guid Id { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WOPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WOPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs index 31b620e9e..9cc0e46ca 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WOPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WOPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class ShowPetByIdParameters /// /// The id of the pet to retrieve. /// - [FromRoute] + [FromRoute(Name = "petId")] [Required] public string PetId { get; set; } diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs index 31b620e9e..9cc0e46ca 100644 --- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs +++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs @@ -17,7 +17,7 @@ public class ShowPetByIdParameters /// /// The id of the pet to retrieve. /// - [FromRoute] + [FromRoute(Name = "petId")] [Required] public string PetId { get; set; }