From 00686311d42eac65416e11734ca8b95219f26181 Mon Sep 17 00:00:00 2001 From: Lucidiot Date: Sun, 30 Sep 2018 21:41:31 +0200 Subject: [PATCH] Use Brainshit NuGet server for DasConzoleCore --- Makefile | 17 ++++------- nuget.config | 9 ++++++ .../LyokoCMD.CommandLine.csproj | 29 ++++++++++--------- src/LyokoCMD.Sim/LyokoCMD.Sim.csproj | 2 +- 4 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 nuget.config diff --git a/Makefile b/Makefile index 182f696..121ab0a 100644 --- a/Makefile +++ b/Makefile @@ -1,25 +1,18 @@ -run: require-dasconzole +run: cd src/LyokoCMD.CommandLine && dotnet run -debug: require-dasconzole +debug: cd src/LyokoCMD.CommandLine && dotnet run -- --debug -all: require-dasconzole +all: dotnet build clean: rm -rf {test/LyokoCMD.Sim.Tests,src/LyokoCMD.{Sim,CommandLine,Xana}}/bin -tests: require-dasconzole +tests: dotnet test test/LyokoCMD.Sim.Tests/LyokoCMD.Sim.Tests.csproj -restore: require-dasconzole +restore: dotnet restore - -require-dasconzole: - @if [ ! -d "../DasConzole/src/DasConzoleCore" ]; then echo "Missing DasConzoleCore dependency in ../DasConzole/src/DasConzoleCore. Use make clone to clone the DasConzole repository in the parent folder."; exit 1; fi - -clone: - git clone https://gitlab.com/Lucidiot/DasConzole ../DasConzole - diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..00a248d --- /dev/null +++ b/nuget.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/LyokoCMD.CommandLine/LyokoCMD.CommandLine.csproj b/src/LyokoCMD.CommandLine/LyokoCMD.CommandLine.csproj index ae47231..c69aace 100644 --- a/src/LyokoCMD.CommandLine/LyokoCMD.CommandLine.csproj +++ b/src/LyokoCMD.CommandLine/LyokoCMD.CommandLine.csproj @@ -1,13 +1,16 @@ - - - - Exe - netcoreapp2.1 - - - - - - - - + + + + Exe + netcoreapp2.1 + + + + + + + + + + + diff --git a/src/LyokoCMD.Sim/LyokoCMD.Sim.csproj b/src/LyokoCMD.Sim/LyokoCMD.Sim.csproj index 8007de4..2ca9943 100644 --- a/src/LyokoCMD.Sim/LyokoCMD.Sim.csproj +++ b/src/LyokoCMD.Sim/LyokoCMD.Sim.csproj @@ -6,7 +6,7 @@ - +