From 956dd5642a4b323c12c7686ac8b7d9f936627e82 Mon Sep 17 00:00:00 2001 From: HavenDV Date: Mon, 9 Sep 2024 13:19:42 +0400 Subject: [PATCH] ci: Fixed auto merge. --- .github/workflows/auto-merge.yml | 2 +- OpenApiGenerator.sln | 12 +++++++++--- src/libs/OpenApiGenerator.Core/Models/TypeData.cs | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index cf5141cedf..d951fc59a0 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -12,7 +12,7 @@ permissions: jobs: auto-merge: runs-on: ubuntu-latest - if: ${{ (github.actor == 'dependabot[bot]' || github.actor == 'HavenDV') && github.repository_owner == 'HavenDV' }} + if: ${{ (github.actor == 'dependabot[bot]' || github.actor == 'HavenDV') && github.repository_owner == 'tryAGI' }} steps: - name: Dependabot metadata if: ${{ github.actor == 'dependabot[bot]' }} diff --git a/OpenApiGenerator.sln b/OpenApiGenerator.sln index e565bea138..c3dec6b3f9 100644 --- a/OpenApiGenerator.sln +++ b/OpenApiGenerator.sln @@ -14,11 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .gitignore = .gitignore src\Directory.Build.props = src\Directory.Build.props README.md = README.md - .github\workflows\pull-request.yml = .github\workflows\pull-request.yml LICENSE.md = LICENSE.md - .github\workflows\main.yml = .github\workflows\main.yml .github\dependabot.yml = .github\dependabot.yml - .github\workflows\mkdocs.yml = .github\workflows\mkdocs.yml EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApiGenerator", "src\libs\OpenApiGenerator\OpenApiGenerator.csproj", "{A16594C6-F868-4564-AB59-F53DB2F57EAA}" @@ -60,6 +57,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{D89B EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateDocs", "src\helpers\GenerateDocs\GenerateDocs.csproj", "{7EBF81E0-41AC-4AA3-AA31-087CEFB8DA18}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9460B888-5D2E-4FB4-B22D-BCDC6889F484}" + ProjectSection(SolutionItems) = preProject + .github\workflows\main.yml = .github\workflows\main.yml + .github\workflows\mkdocs.yml = .github\workflows\mkdocs.yml + .github\workflows\pull-request.yml = .github\workflows\pull-request.yml + .github\workflows\auto-merge.yml = .github\workflows\auto-merge.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -112,6 +117,7 @@ Global {7E829AE4-1ACD-43C0-87ED-9902566DF437} = {94FE90BF-FA05-46C6-A207-6E454A236659} {41F1B4D8-5F6F-40FB-A1C2-A5E6A4B62AA7} = {9CAA231D-7BE1-46C9-ACD6-EB2E569CEBEA} {7EBF81E0-41AC-4AA3-AA31-087CEFB8DA18} = {D89B8087-C384-4519-B2BB-4417698B5801} + {9460B888-5D2E-4FB4-B22D-BCDC6889F484} = {94FE90BF-FA05-46C6-A207-6E454A236659} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1493AEE4-9211-46E9-BFE6-8F629EAC5693} diff --git a/src/libs/OpenApiGenerator.Core/Models/TypeData.cs b/src/libs/OpenApiGenerator.Core/Models/TypeData.cs index 962cc96b55..e7ef8d0a1a 100644 --- a/src/libs/OpenApiGenerator.Core/Models/TypeData.cs +++ b/src/libs/OpenApiGenerator.Core/Models/TypeData.cs @@ -240,6 +240,7 @@ public static string GetCSharpType(SchemaContext context, SchemaContext? additio // ("string", "period") => ("global::System.TimeSpan", false), // ("string", "duration") => ("global::System.TimeSpan", false), // ("string", "uri") => ("global::System.Uri", true), + // ("string", "uuid") => ("global::System.Guid", false), (null, "url") => ("string", true),