Updated nuget for release

Updated change log Bumped version to 0.4.2
opensky-to · Feb 22, 2022 · bd1dfdd · bd1dfdd
1 parent 335dc3f
commit bd1dfdd
Show file tree

Hide file tree

Showing 7 changed files with 363 additions and 136 deletions.
diff --git a/OpenSky.Agent.Simulator/OpenAPIs/swagger.cs b/OpenSky.Agent.Simulator/OpenAPIs/swagger.cs
diff --git a/OpenSky.Agent.Simulator/OpenAPIs/swagger.json b/OpenSky.Agent.Simulator/OpenAPIs/swagger.json
@@ -987,6 +987,38 @@
         }
       }
     },
+    "/AircraftType/manufacturers": {
+      "get": {
+        "tags": [
+          "AircraftType"
+        ],
+        "summary": "Get the list aircraft manufacturers.",
+        "description": "sushi.at, 20/02/2022.",
+        "operationId": "GetAircraftManufacturers",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/AircraftManufacturerIEnumerableApiResponse"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AircraftManufacturerIEnumerableApiResponse"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AircraftManufacturerIEnumerableApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/AircraftType/image/{typeID}": {
       "get": {
         "tags": [
@@ -1157,38 +1189,6 @@
         }
       }
     },
-    "/AircraftType/manufacturers": {
-      "get": {
-        "tags": [
-          "AircraftType"
-        ],
-        "summary": "Get the list aircraft manufacturers.",
-        "description": "sushi.at, 20/02/2022.",
-        "operationId": "GetAircraftManufacturers",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/AircraftManufacturerIEnumerableApiResponse"
-                }
-              },
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AircraftManufacturerIEnumerableApiResponse"
-                }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AircraftManufacturerIEnumerableApiResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/AircraftType/simulator/{simulator}": {
       "get": {
         "tags": [
@@ -3262,43 +3262,51 @@
         }
       }
     },
-    "/Flight/start/{flightID}": {
+    "/Flight/start": {
       "post": {
         "tags": [
           "Flight"
         ],
         "summary": "Start flight.",
         "description": "sushi.at, 10/11/2021.",
         "operationId": "StartFlight",
-        "parameters": [
-          {
-            "name": "flightID",
-            "in": "path",
-            "description": "Identifier for the flight plan to start.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "format": "uuid"
+        "requestBody": {
+          "description": "The start flight model.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StartFlight"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StartFlight"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StartFlight"
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": {
             "description": "Success",
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/StringApiResponse"
+                  "$ref": "#/components/schemas/StartFlightStatusApiResponse"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/StringApiResponse"
+                  "$ref": "#/components/schemas/StartFlightStatusApiResponse"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/StringApiResponse"
+                  "$ref": "#/components/schemas/StartFlightStatusApiResponse"
                 }
               }
             }
@@ -4143,6 +4151,12 @@
             "type": "string",
             "description": "Gets or sets the airport icao."
           },
+          "airportName": {
+            "type": "string",
+            "description": "Gets the name of the airport.",
+            "nullable": true,
+            "readOnly": true
+          },
           "manufacturerID": {
             "maxLength": 5,
             "minLength": 3,
@@ -6121,10 +6135,11 @@
           12,
           13,
           14,
+          15,
           -1
         ],
         "type": "integer",
-        "description": "Financial categories. 0 = None, 1 = Aircraft, 2 = Fuel, 3 = Maintenance, 4 = AirportFees, 5 = Salaries, 6 = Loan, 7 = Interest, 8 = Shares, 9 = Dividend, 10 = FBO, 11 = Cargo, 12 = Passengers, 13 = SpecialtyJobs, 14 = Fines, -1 = Flight",
+        "description": "Financial categories. 0 = None, 1 = Aircraft, 2 = Fuel, 3 = Maintenance, 4 = AirportFees, 5 = Salaries, 6 = Loan, 7 = Interest, 8 = Shares, 9 = Dividend, 10 = FBO, 11 = Cargo, 12 = Passengers, 13 = SpecialtyJobs, 14 = Fines, 15 = Ferry, -1 = Flight",
         "format": "int32",
         "x-enumNames": [
           "None",
@@ -6142,6 +6157,7 @@
           "Passengers",
           "SpecialtyJobs",
           "Fines",
+          "Ferry",
           "Flight"
         ],
         "x-enum-varnames": [
@@ -6160,6 +6176,7 @@
           "Passengers",
           "SpecialtyJobs",
           "Fines",
+          "Ferry",
           "Flight"
         ]
       },
@@ -7517,6 +7534,26 @@
         "additionalProperties": false,
         "description": "API standard response model."
       },
+      "NewAircraftDeliveryOption": {
+        "enum": [
+          0,
+          1,
+          2
+        ],
+        "type": "integer",
+        "description": "New aircraft delivery options. 0 = ManufacturerDeliveryAirport, 1 = ManufacturerFerry, 2 = OutsourceFerry",
+        "format": "int32",
+        "x-enumNames": [
+          "ManufacturerDeliveryAirport",
+          "ManufacturerFerry",
+          "OutsourceFerry"
+        ],
+        "x-enum-varnames": [
+          "ManufacturerDeliveryAirport",
+          "ManufacturerFerry",
+          "OutsourceFerry"
+        ]
+      },
       "Payload": {
         "required": [
           "description",
@@ -7849,18 +7886,36 @@
       "PurchaseNewAircraft": {
         "type": "object",
         "properties": {
-          "airportICAO": {
+          "country": {
+            "$ref": "#/components/schemas/Country"
+          },
+          "deliveryAirportICAO": {
             "type": "string",
-            "description": "Gets or sets the airport ICAO.",
+            "description": "Gets or sets the delivery airport ICAO.",
             "nullable": true
           },
-          "country": {
-            "$ref": "#/components/schemas/Country"
+          "deliveryOption": {
+            "$ref": "#/components/schemas/NewAircraftDeliveryOption"
+          },
+          "ferryAirportICAO": {
+            "type": "string",
+            "description": "Gets or sets the ferry airport ICAO.",
+            "nullable": true
           },
           "forAirline": {
             "type": "boolean",
             "description": "Gets or sets a value indicating whether to purchase the aircraft for the airline or the user."
           },
+          "numberOfAircraft": {
+            "type": "integer",
+            "description": "Gets or sets the number of aircraft to purchase.",
+            "format": "int32"
+          },
+          "outsourceFerryRate": {
+            "type": "integer",
+            "description": "Gets or sets the outsource ferry rate (SkyBucks / NM).",
+            "format": "int32"
+          },
           "typeID": {
             "type": "string",
             "description": "Gets or sets the identifier of the type.",
@@ -8225,6 +8280,84 @@
           "XPlane11"
         ]
       },
+      "StartFlight": {
+        "type": "object",
+        "properties": {
+          "flightID": {
+            "type": "string",
+            "description": "Gets or sets the identifier of the flight.",
+            "format": "uuid"
+          },
+          "overrideStates": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StartFlightStatus"
+            },
+            "description": "Gets or sets a list of states to override the checks for.",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false,
+        "description": "Start flight model."
+      },
+      "StartFlightStatus": {
+        "enum": [
+          0,
+          1,
+          2,
+          3,
+          4,
+          -1
+        ],
+        "type": "integer",
+        "description": "Start flight status. 0 = Started, 1 = AircraftNotAtOrigin, 2 = OriginDoesntSellAvGas, 3 = OriginDoesntSellJetFuel, 4 = NonFlightPlanPayloadsFound, -1 = Error",
+        "format": "int32",
+        "x-enumNames": [
+          "Started",
+          "AircraftNotAtOrigin",
+          "OriginDoesntSellAvGas",
+          "OriginDoesntSellJetFuel",
+          "NonFlightPlanPayloadsFound",
+          "Error"
+        ],
+        "x-enum-varnames": [
+          "Started",
+          "AircraftNotAtOrigin",
+          "OriginDoesntSellAvGas",
+          "OriginDoesntSellJetFuel",
+          "NonFlightPlanPayloadsFound",
+          "Error"
+        ]
+      },
+      "StartFlightStatusApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "$ref": "#/components/schemas/StartFlightStatus"
+          },
+          "errorDetails": {
+            "type": "string",
+            "description": "Gets or sets the error details (NULL if no error).",
+            "nullable": true
+          },
+          "isError": {
+            "type": "boolean",
+            "description": "Gets or sets a value indicating whether this response is reporting an error."
+          },
+          "message": {
+            "type": "string",
+            "description": "Gets or sets the message.",
+            "nullable": true
+          },
+          "status": {
+            "type": "string",
+            "description": "Gets or sets the status.",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false,
+        "description": "API standard response model."
+      },
       "StringApiResponse": {
         "type": "object",
         "properties": {

diff --git a/OpenSky.Agent.Simulator/OpenSky.Agent.Simulator.csproj b/OpenSky.Agent.Simulator/OpenSky.Agent.Simulator.csproj
@@ -71,8 +71,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="TomsToolbox.Essentials, Version=2.7.4.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2, processorArchitecture=MSIL">
-      <HintPath>..\packages\TomsToolbox.Essentials.2.7.4\lib\net45\TomsToolbox.Essentials.dll</HintPath>
+    <Reference Include="TomsToolbox.Essentials, Version=2.7.6.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2, processorArchitecture=MSIL">
+      <HintPath>..\packages\TomsToolbox.Essentials.2.7.6\lib\net45\TomsToolbox.Essentials.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="XDMessaging.Lite, Version=5.0.6.0, Culture=neutral, PublicKeyToken=737bc70442f2c4af, processorArchitecture=MSIL">

diff --git a/OpenSky.Agent.Simulator/packages.config b/OpenSky.Agent.Simulator/packages.config
@@ -6,6 +6,6 @@
   <package id="MSFT.ParallelExtensionsExtras" version="1.2.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="OpenSky.FlightLogXML" version="0.1.5" targetFramework="net48" />
-  <package id="TomsToolbox.Essentials" version="2.7.4" targetFramework="net48" />
+  <package id="TomsToolbox.Essentials" version="2.7.6" targetFramework="net48" />
   <package id="XDMessaging.Lite" version="5.0.6" targetFramework="net48" />
 </packages>
diff --git a/OpenSky.Agent/OpenSky.Agent.csproj b/OpenSky.Agent/OpenSky.Agent.csproj
@@ -366,7 +366,7 @@
       <Version>2021.3.0</Version>
     </PackageReference>
     <PackageReference Include="MdXaml">
-      <Version>1.12.0</Version>
+      <Version>1.13.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <Version>6.0.0</Version>
@@ -392,16 +392,16 @@
       <Version>0.1.5</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.SfChart.WPF">
-      <Version>19.4.0.50</Version>
+      <Version>19.4.0.53</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.SfProgressBar.WPF">
-      <Version>19.4.0.50</Version>
+      <Version>19.4.0.53</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.Themes.MaterialDark.WPF">
-      <Version>19.4.0.50</Version>
+      <Version>19.4.0.53</Version>
     </PackageReference>
     <PackageReference Include="TomsToolbox.Wpf">
-      <Version>2.7.4</Version>
+      <Version>2.7.6</Version>
     </PackageReference>
     <PackageReference Include="XDMessaging.Lite">
       <Version>5.0.6</Version>

diff --git a/OpenSky.Agent/Properties/AssemblyInfo.cs b/OpenSky.Agent/Properties/AssemblyInfo.cs
@@ -21,8 +21,8 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly: AssemblyVersion("0.4.1")]
-[assembly: AssemblyFileVersion("0.4.1")]
+[assembly: AssemblyVersion("0.4.2")]
+[assembly: AssemblyFileVersion("0.4.2")]
 
 // This allows us to detect debug mode in XAML
 #if DEBUG