still refactoring

This commit is contained in:
2018-05-04 10:45:45 +02:00
parent d0668c3da5
commit 05879375e5
40 changed files with 305 additions and 348 deletions

View File

@ -1,28 +1,19 @@
include ../common.mk
include ../versioning.mk
include ../dnx.mk
MSBUILD=msbuild
all: build
build: project.lock.json
ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnu build --configuration=$(CONFIGURATION)
restore:
touch project.json
dnu restore
all: $(BINTARGETPATH)
msbuild-restore:
$(MSBUILD) cli.csproj /t:Restore
project.lock.json: project.json
dnu restore
run: project.lock.json
ASPNET_ENV=Development ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx run --configuration=$(CONFIGURATION)
ASPNET_ENV=$(ASPNET_ENV) dnx run --configuration=$(CONFIGURATION)
info:
@echo $(PRJNAME)
deploy-pkg: $(PACKAGE)
cp $(PACKAGE) $(NUGETSOURCE)
.PHONY: $(BINARY)

BIN
cli/Yavsc.1.0.5-rc15.nupkg Normal file

Binary file not shown.

View File

@ -7,7 +7,7 @@ using Yavsc.Models;
namespace Yavsc.Server
{
public class YavscServerFactory : IServerFactory
public class cliServerFactory : IServerFactory
{
public IFeatureCollection Initialize(IConfiguration configuration)
{
@ -21,4 +21,4 @@ namespace Yavsc.Server
return task;
}
}
}
}

View File

@ -107,6 +107,10 @@
<PackageReference Include="Microsoft.Dnx.Compilation.Abstractions" Version="1.0.0-rc1-final" />
<PackageReference Include="Microsoft.Dnx.Compilation.CSharp.Abstractions" Version="1.0.0-rc1-final" />
<PackageReference Include="Microsoft.Dnx.Compilation.CSharp.Common" Version="1.0.0-rc1-final" />
<PackageReference Include="Microsoft.Dnx.Compilation.CSharp.Common" Version="1.0.0-rc1-final" />
<PackageReference Include="Yavsc.Server" Version="1.0.5-rc17" />
<PackageReference Include="Yavsc.Abstract" Version="1.0.5-rc17" />
</ItemGroup>
<ItemGroup>
<Folder Include="Services\" />

26
cli/cli.nuspec Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>cli</id>
<title>Yavsc - cli</title>
<version>$version$</version>
<authors>Paul Schneider</authors>
<owners>Paul Schneider</owners>
<licenseUrl>https://github.com/pazof/yavsc/blob/vnext/Yavsc/License.md</licenseUrl>
<projectUrl>https://github.com/pazof/yavsc/README.md</projectUrl>
<iconUrl>https://github.com/pazof/yavsc/blob/vnext/Yavsc/wwwroot/images/yavsc.png</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>
A command line interface to Yavsc server runtime
</description>
<summary>
</summary>
<tags>Blog, POS, Web API</tags>
<dependencies>
<dependency id="Yavsc.Server" version="$version$"></dependency>
</dependencies>
</metadata>
<files>
<file src="bin/$config$/dnx451/cli.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
</files>
</package>

View File

@ -44,13 +44,13 @@
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
"Newtonsoft.Json": "9.0.1",
"Yavsc": {
"version": "1.0.5-rc14",
"target": "package"
},
"Yavsc.Abstract": {
"version": "1.0.5-rc14",
"target": "package"
"target": "package",
"version": "1.0.5-rc17"
},
"Yavsc.Server": {
"target": "package",
"version": "1.0.5-rc17"
}
},
"frameworks": {

View File

@ -2108,25 +2108,29 @@
"lib/net45/_._": {}
}
},
"Yavsc/1.0.5-rc14": {
"Yavsc.Abstract/1.0.5-rc17": {
"type": "package",
"dependencies": {
"Yavsc.Abstract": "1.0.5-rc14"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
"lib/dnx451/Yavsc.Abstract.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
"lib/dnx451/Yavsc.Abstract.dll": {}
}
},
"Yavsc.Abstract/1.0.5-rc14": {
"Yavsc.Server/1.0.5-rc17": {
"type": "package",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
"Yavsc.Abstract": "1.0.5-rc17"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
"lib/dnx451/Yavsc.Server.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
"lib/dnx451/Yavsc.Server.dll": {}
}
}
},
@ -4236,25 +4240,29 @@
"lib/net45/_._": {}
}
},
"Yavsc/1.0.5-rc14": {
"Yavsc.Abstract/1.0.5-rc17": {
"type": "package",
"dependencies": {
"Yavsc.Abstract": "1.0.5-rc14"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
"lib/dnx451/Yavsc.Abstract.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
"lib/dnx451/Yavsc.Abstract.dll": {}
}
},
"Yavsc.Abstract/1.0.5-rc14": {
"Yavsc.Server/1.0.5-rc17": {
"type": "package",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
"Yavsc.Abstract": "1.0.5-rc17"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
"lib/dnx451/Yavsc.Server.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
"lib/dnx451/Yavsc.Server.dll": {}
}
}
},
@ -6364,25 +6372,29 @@
"lib/net45/_._": {}
}
},
"Yavsc/1.0.5-rc14": {
"Yavsc.Abstract/1.0.5-rc17": {
"type": "package",
"dependencies": {
"Yavsc.Abstract": "1.0.5-rc14"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
"lib/dnx451/Yavsc.Abstract.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
"lib/dnx451/Yavsc.Abstract.dll": {}
}
},
"Yavsc.Abstract/1.0.5-rc14": {
"Yavsc.Server/1.0.5-rc17": {
"type": "package",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
"Yavsc.Abstract": "1.0.5-rc17"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
"lib/dnx451/Yavsc.Server.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
"lib/dnx451/Yavsc.Server.dll": {}
}
}
}
@ -8509,24 +8521,26 @@
"system.threading.nuspec"
]
},
"Yavsc/1.0.5-rc14": {
"Yavsc.Abstract/1.0.5-rc17": {
"type": "package",
"sha512": "qh7XoqBfHICTJuu7nwwOh9Wu7D8vntKvbpKPyiV9F61cXxssRBU0mlhmAfWfVmMeDOadTJMePXP43RDDjSxWpA==",
"sha512": "/uGlH4QFDBlr7wrmZERcuhKaGhRS+SEONqI+zWpwKXctWkMSbX/QauqIsrrWLWke/6JiC2yxSfo5HWpETy3L0w==",
"files": [
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll",
"Yavsc.1.0.5-rc14.nupkg",
"Yavsc.1.0.5-rc14.nupkg.sha512",
"Yavsc.nuspec"
"lib/dnx451/Yavsc.Abstract.dll",
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll",
"Yavsc.Abstract.1.0.5-rc17.nupkg",
"Yavsc.Abstract.1.0.5-rc17.nupkg.sha512",
"Yavsc.Abstract.nuspec"
]
},
"Yavsc.Abstract/1.0.5-rc14": {
"Yavsc.Server/1.0.5-rc17": {
"type": "package",
"sha512": "89rsGd4JcnNZkiEQEZU1hYj4YqxrPsDgePE+7U9XZJf28lmhCyFU86bOQHJiAoTow3q4dbVP/Wp2lDxNpMKuLA==",
"sha512": "QSqJadauqDNl7JwdKIjUiBGjRRGhgD5EP8uH1O/E9O0yk86xUnpdNDdCYybkM5DsWnQROUjmtTn0IrTb1eZegg==",
"files": [
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll",
"Yavsc.Abstract.1.0.5-rc14.nupkg",
"Yavsc.Abstract.1.0.5-rc14.nupkg.sha512",
"Yavsc.Abstract.nuspec"
"lib/dnx451/Yavsc.Server.dll",
"lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Server.dll",
"Yavsc.Server.1.0.5-rc17.nupkg",
"Yavsc.Server.1.0.5-rc17.nupkg.sha512",
"Yavsc.Server.nuspec"
]
}
},
@ -8558,8 +8572,8 @@
"Microsoft.Framework.Configuration.Json >= 1.0.0-beta8",
"Microsoft.Framework.ConfigurationModel.Json >= 1.0.0-beta4",
"Newtonsoft.Json >= 9.0.1",
"Yavsc >= 1.0.5-rc14",
"Yavsc.Abstract >= 1.0.5-rc14"
"Yavsc.Abstract >= 1.0.5-rc17",
"Yavsc.Server >= 1.0.5-rc17"
],
"DNX,Version=v4.5.1": []
}