From a36489e8d3b17d0bb44403a5e55234362b19860a Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 24 Jun 2021 13:37:57 +0200 Subject: [PATCH] Clean up + async fix --- src/JsonSchema/Program.cs | 2 +- src/JsonSchema/UmbracoJsonSchemaGenerator.cs | 4 ++-- .../umbraco/config/appsettings-schema.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/JsonSchema/Program.cs b/src/JsonSchema/Program.cs index 3ee1136313..71b725d699 100644 --- a/src/JsonSchema/Program.cs +++ b/src/JsonSchema/Program.cs @@ -24,7 +24,7 @@ namespace JsonSchema { try { - Parser.Default.ParseArguments(args) + await Parser.Default.ParseArguments(args) .WithParsedAsync(Execute); } catch (Exception e) diff --git a/src/JsonSchema/UmbracoJsonSchemaGenerator.cs b/src/JsonSchema/UmbracoJsonSchemaGenerator.cs index 2f477b6a4f..91b1503ce0 100644 --- a/src/JsonSchema/UmbracoJsonSchemaGenerator.cs +++ b/src/JsonSchema/UmbracoJsonSchemaGenerator.cs @@ -20,7 +20,7 @@ namespace JsonSchema public async Task Generate() { var umbracoSchema = GenerateUmbracoSchema(); - var officialSchema = await GetOfficialAppSettingsSchema().ConfigureAwait(false);; + var officialSchema = await GetOfficialAppSettingsSchema(); officialSchema.Merge(umbracoSchema); @@ -30,7 +30,7 @@ namespace JsonSchema private async Task GetOfficialAppSettingsSchema() { - var response = s_client.GetAsync(new Uri("https://json.schemastore.org/appsettings.json")).GetAwaiter().GetResult(); + var response = await s_client.GetAsync("https://json.schemastore.org/appsettings.json"); var result = await response.Content.ReadAsStringAsync(); diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json b/src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json index adcdc9751d..a0236a17fb 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json +++ b/src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json @@ -2967,4 +2967,4 @@ "$ref": "#/definitions/umbraco" } } -} +} \ No newline at end of file