From f1f8535c7982c210776fac9a88a8246c07c0ed22 Mon Sep 17 00:00:00 2001 From: Dave Dunkin Date: Mon, 16 Oct 2023 16:13:24 -0700 Subject: [PATCH] Use latest Facility packages. --- Directory.Build.props | 2 +- ReleaseNotes.md | 4 +++ dotnet-tools.json | 6 ++-- .../Facility.GeneratorApi.Services.csproj | 10 +++--- .../Facility.GeneratorApi.WebApi.csproj | 2 +- .../Facility.GeneratorApi.csproj | 2 +- src/Facility.GeneratorApi/FailureDto.g.cs | 4 +-- .../GenerateRequestDto.g.cs | 4 +-- .../GenerateResponseDto.g.cs | 4 +-- src/Facility.GeneratorApi/GeneratorDto.g.cs | 4 +-- .../GetApiInfoRequestDto.g.cs | 4 +-- .../GetApiInfoResponseDto.g.cs | 4 +-- src/Facility.GeneratorApi/NamedTextDto.g.cs | 4 +-- ts/package-lock.json | 35 +++++++++++++++++-- ts/package.json | 2 +- ts/src/facilityGeneratorApi.ts | 8 ++--- 16 files changed, 67 insertions(+), 32 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 9c5bd0f..1833d51 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 0.5.0 + 0.6.0 10.0 enable enable diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 23d9615..05232fc 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,9 @@ # Release Notes +## 0.6.0 + +* Use latest Facility. + ## 0.5.0 * Use latest Facility. diff --git a/dotnet-tools.json b/dotnet-tools.json index d7fabbf..afd3096 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,19 +3,19 @@ "isRoot": true, "tools": { "fsdgencsharp": { - "version": "2.14.5", + "version": "2.22.0", "commands": [ "fsdgencsharp" ] }, "fsdgenmd": { - "version": "2.4.2", + "version": "2.8.0", "commands": [ "fsdgenmd" ] }, "fsdgenjs": { - "version": "2.4.0", + "version": "2.9.0", "commands": [ "fsdgenjs" ] diff --git a/src/Facility.GeneratorApi.Services/Facility.GeneratorApi.Services.csproj b/src/Facility.GeneratorApi.Services/Facility.GeneratorApi.Services.csproj index ccbdffd..b5a7490 100644 --- a/src/Facility.GeneratorApi.Services/Facility.GeneratorApi.Services.csproj +++ b/src/Facility.GeneratorApi.Services/Facility.GeneratorApi.Services.csproj @@ -9,12 +9,12 @@ - - - - + + + + - + diff --git a/src/Facility.GeneratorApi.WebApi/Facility.GeneratorApi.WebApi.csproj b/src/Facility.GeneratorApi.WebApi/Facility.GeneratorApi.WebApi.csproj index 4b21dcf..f05deeb 100644 --- a/src/Facility.GeneratorApi.WebApi/Facility.GeneratorApi.WebApi.csproj +++ b/src/Facility.GeneratorApi.WebApi/Facility.GeneratorApi.WebApi.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Facility.GeneratorApi/Facility.GeneratorApi.csproj b/src/Facility.GeneratorApi/Facility.GeneratorApi.csproj index cb4cf22..19e1e7c 100644 --- a/src/Facility.GeneratorApi/Facility.GeneratorApi.csproj +++ b/src/Facility.GeneratorApi/Facility.GeneratorApi.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Facility.GeneratorApi/FailureDto.g.cs b/src/Facility.GeneratorApi/FailureDto.g.cs index 32bf117..5fe99c0 100644 --- a/src/Facility.GeneratorApi/FailureDto.g.cs +++ b/src/Facility.GeneratorApi/FailureDto.g.cs @@ -37,9 +37,9 @@ public FailureDto() public string? Message { get; set; } /// - /// Returns the DTO as JSON. + /// The JSON serializer. /// - public override string ToString() => SystemTextJsonServiceSerializer.Instance.ToJson(this); + protected override JsonServiceSerializer JsonSerializer => SystemTextJsonServiceSerializer.Instance; /// /// Determines if two DTOs are equivalent. diff --git a/src/Facility.GeneratorApi/GenerateRequestDto.g.cs b/src/Facility.GeneratorApi/GenerateRequestDto.g.cs index 9e668b3..b59691e 100644 --- a/src/Facility.GeneratorApi/GenerateRequestDto.g.cs +++ b/src/Facility.GeneratorApi/GenerateRequestDto.g.cs @@ -32,9 +32,9 @@ public GenerateRequestDto() public GeneratorDto? Generator { get; set; } /// - /// Returns the DTO as JSON. + /// The JSON serializer. /// - public override string ToString() => SystemTextJsonServiceSerializer.Instance.ToJson(this); + protected override JsonServiceSerializer JsonSerializer => SystemTextJsonServiceSerializer.Instance; /// /// Determines if two DTOs are equivalent. diff --git a/src/Facility.GeneratorApi/GenerateResponseDto.g.cs b/src/Facility.GeneratorApi/GenerateResponseDto.g.cs index 8f43a73..08b3ccf 100644 --- a/src/Facility.GeneratorApi/GenerateResponseDto.g.cs +++ b/src/Facility.GeneratorApi/GenerateResponseDto.g.cs @@ -32,9 +32,9 @@ public GenerateResponseDto() public FailureDto? Failure { get; set; } /// - /// Returns the DTO as JSON. + /// The JSON serializer. /// - public override string ToString() => SystemTextJsonServiceSerializer.Instance.ToJson(this); + protected override JsonServiceSerializer JsonSerializer => SystemTextJsonServiceSerializer.Instance; /// /// Determines if two DTOs are equivalent. diff --git a/src/Facility.GeneratorApi/GeneratorDto.g.cs b/src/Facility.GeneratorApi/GeneratorDto.g.cs index 565b5ca..258f33d 100644 --- a/src/Facility.GeneratorApi/GeneratorDto.g.cs +++ b/src/Facility.GeneratorApi/GeneratorDto.g.cs @@ -27,9 +27,9 @@ public GeneratorDto() public string? Name { get; set; } /// - /// Returns the DTO as JSON. + /// The JSON serializer. /// - public override string ToString() => SystemTextJsonServiceSerializer.Instance.ToJson(this); + protected override JsonServiceSerializer JsonSerializer => SystemTextJsonServiceSerializer.Instance; /// /// Determines if two DTOs are equivalent. diff --git a/src/Facility.GeneratorApi/GetApiInfoRequestDto.g.cs b/src/Facility.GeneratorApi/GetApiInfoRequestDto.g.cs index c5ace9f..74fb8f0 100644 --- a/src/Facility.GeneratorApi/GetApiInfoRequestDto.g.cs +++ b/src/Facility.GeneratorApi/GetApiInfoRequestDto.g.cs @@ -22,9 +22,9 @@ public GetApiInfoRequestDto() } /// - /// Returns the DTO as JSON. + /// The JSON serializer. /// - public override string ToString() => SystemTextJsonServiceSerializer.Instance.ToJson(this); + protected override JsonServiceSerializer JsonSerializer => SystemTextJsonServiceSerializer.Instance; /// /// Determines if two DTOs are equivalent. diff --git a/src/Facility.GeneratorApi/GetApiInfoResponseDto.g.cs b/src/Facility.GeneratorApi/GetApiInfoResponseDto.g.cs index 6dfda9d..42e4fc3 100644 --- a/src/Facility.GeneratorApi/GetApiInfoResponseDto.g.cs +++ b/src/Facility.GeneratorApi/GetApiInfoResponseDto.g.cs @@ -32,9 +32,9 @@ public GetApiInfoResponseDto() public string? Version { get; set; } /// - /// Returns the DTO as JSON. + /// The JSON serializer. /// - public override string ToString() => SystemTextJsonServiceSerializer.Instance.ToJson(this); + protected override JsonServiceSerializer JsonSerializer => SystemTextJsonServiceSerializer.Instance; /// /// Determines if two DTOs are equivalent. diff --git a/src/Facility.GeneratorApi/NamedTextDto.g.cs b/src/Facility.GeneratorApi/NamedTextDto.g.cs index 9784e50..a4701b3 100644 --- a/src/Facility.GeneratorApi/NamedTextDto.g.cs +++ b/src/Facility.GeneratorApi/NamedTextDto.g.cs @@ -32,9 +32,9 @@ public NamedTextDto() public string? Text { get; set; } /// - /// Returns the DTO as JSON. + /// The JSON serializer. /// - public override string ToString() => SystemTextJsonServiceSerializer.Instance.ToJson(this); + protected override JsonServiceSerializer JsonSerializer => SystemTextJsonServiceSerializer.Instance; /// /// Determines if two DTOs are equivalent. diff --git a/ts/package-lock.json b/ts/package-lock.json index 5c69663..caa28e9 100644 --- a/ts/package-lock.json +++ b/ts/package-lock.json @@ -1,8 +1,39 @@ { "name": "facility-generator-api", - "version": "0.5.0", - "lockfileVersion": 1, + "version": "0.6.0", + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "facility-generator-api", + "version": "0.6.0", + "license": "MIT", + "dependencies": { + "facility-core": "^2.2.0" + }, + "devDependencies": { + "typescript": "^3.9.10" + } + }, + "node_modules/facility-core": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/facility-core/-/facility-core-2.2.0.tgz", + "integrity": "sha512-2L0yZCu5+jpaIVc4i0cCRKU69Tv1aAMOIb0O3/4ZY+VWC31EAYsO2RDiuUjaHc2F2AQoGK7HD9tsMSvZF2QJ1g==" + }, + "node_modules/typescript": { + "version": "3.9.10", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", + "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + } + }, "dependencies": { "facility-core": { "version": "2.2.0", diff --git a/ts/package.json b/ts/package.json index f893955..edb4bae 100644 --- a/ts/package.json +++ b/ts/package.json @@ -1,6 +1,6 @@ { "name": "facility-generator-api", - "version": "0.5.0", + "version": "0.6.0", "description": "A web API client for generating code from Facility Service Definitions.", "scripts": { "build": "tsc", diff --git a/ts/src/facilityGeneratorApi.ts b/ts/src/facilityGeneratorApi.ts index 3e1c411..a01060e 100644 --- a/ts/src/facilityGeneratorApi.ts +++ b/ts/src/facilityGeneratorApi.ts @@ -38,8 +38,8 @@ class FacilityGeneratorApiHttpClient implements IFacilityGeneratorApi { .then(result => { const status = result.response.status; let value: IGetApiInfoResponse | null = null; - if (result.json) { - if (status === 200) { + if (status === 200) { + if (result.json) { value = result.json as IGetApiInfoResponse | null; } } @@ -62,8 +62,8 @@ class FacilityGeneratorApiHttpClient implements IFacilityGeneratorApi { .then(result => { const status = result.response.status; let value: IGenerateResponse | null = null; - if (result.json) { - if (status === 200) { + if (status === 200) { + if (result.json) { value = result.json as IGenerateResponse | null; } }