From 8a9bbc8190b6bacac5fde514874f910d0c295075 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 1 Nov 2020 20:28:00 +0000
Subject: [PATCH] fixes a strange restore behavior

---
 Makefile                            |  8 ++++++++
 src/OAuth.AspNet.Token/project.json |  6 ++++++
 src/Yavsc.Server/project.json       |  6 ++++++
 src/Yavsc/project.json              | 10 +++++++---
 src/test/Makefile                   |  3 +++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index acb29c82..cac92cd1 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,14 @@ updatedeps:
 	cp src/Yavsc/bin/output/approot/packages/*/*/lib/*net451*/*.dll private/lib/
 	cp src/Yavsc/bin/output/approot/packages/*/*/lib/*dnx451*/*.dll private/lib/
 
+restore:
+	make -C src/OAuth.AspNet.AuthServer  restore
+	make -C src/OAuth.AspNet.Token  restore
+	make -C src/Yavsc.Server restore
+	make -C src/Yavsc restore
+	make -C src/cli restore
+	make -C src/test restore
+
 test:
 	make -C src/test
 
diff --git a/src/OAuth.AspNet.Token/project.json b/src/OAuth.AspNet.Token/project.json
index ecacfbf4..b336b020 100644
--- a/src/OAuth.AspNet.Token/project.json
+++ b/src/OAuth.AspNet.Token/project.json
@@ -34,5 +34,11 @@
         "dnx451": {
             "frameworkAssemblies": {}
         }
+    },
+    "scripts": {
+      "postrestore": [
+          "grep -v '\\.\\.dll' project.lock.json > new.project.lock.json",
+          "mv new.project.lock.json project.lock.json"
+      ]
     }
 }
diff --git a/src/Yavsc.Server/project.json b/src/Yavsc.Server/project.json
index 41f33c53..12069ae6 100644
--- a/src/Yavsc.Server/project.json
+++ b/src/Yavsc.Server/project.json
@@ -120,5 +120,11 @@
     "commands": {
         "ef": "EntityFramework.Commands",
         "gen": "Microsoft.Extensions.CodeGeneration"
+    },
+    "scripts": {
+      "postrestore": [
+          "grep -v '\\.\\.dll' project.lock.json > new.project.lock.json",
+          "mv new.project.lock.json project.lock.json"
+      ]
     }
 }
diff --git a/src/Yavsc/project.json b/src/Yavsc/project.json
index c2eb1b17..248d9db3 100644
--- a/src/Yavsc/project.json
+++ b/src/Yavsc/project.json
@@ -31,8 +31,8 @@
     "contrib"
   ],
   "buildOptions": {
-    "debugType": "full",
-    "emitEntryPoint": true,
+    "debugType": "portable",
+    "emitEntryPoint": false,
     "outputName": "Yavsc",
     "compile": {
       "include": "*.cs",
@@ -185,7 +185,11 @@
     ]
   },
   "scripts": {
-    "prepublish": "make minify"
+    "prepublish": "make minify",
+    "postrestore": [
+        "grep -v '\\.\\.dll' project.lock.json > new.project.lock.json",
+        "mv new.project.lock.json project.lock.json"
+    ]
   },
   "embed": "Views/**/*.cshtml"
 }
diff --git a/src/test/Makefile b/src/test/Makefile
index 71470160..f0dd0f7d 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -30,6 +30,9 @@ node_modules/ansi-to-html:
 test: $(BINTARGET) node_modules/ansi-to-html
 	ASPNET_ENV=Development dnx test -maxthreads 1 -trait regres=no
 
+restore:
+	dnu restore --ignore-failed-sources
+
 clean:
 	rm -rf bin obj testingrepo