Merge branch 'master' into pitming-feature/MethodTransformer

This commit is contained in:
TomPallister
2020-02-09 16:55:14 +00:00
22 changed files with 1566 additions and 1130 deletions

View File

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Folder Include="wwwroot\"/>
<Folder Include="wwwroot\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App"/>
<PackageReference Include="Ocelot" Version="12.0.1"/>
<PackageReference Include="Ocelot.Administration" Version="0.1.0"/>
<PackageReference Include="Ocelot" Version="14.0.3" />
<PackageReference Include="Ocelot.Administration" Version="14.0.3" />
</ItemGroup>
</Project>

View File

@ -1,19 +1,14 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Ocelot.Administration;
using Ocelot.DependencyInjection;
using Ocelot.Middleware;
using Ocelot.Administration;
using System.IO;
namespace AdministrationApi
{
public class Program
public class Program
{
public static void Main(string[] args)
{