mirror of
https://github.com/DorkSquadRR/DorkNet.git
synced 2026-10-25 15:08:47 -07:00
Merge december-2020-12-18 into microservices-scaffold
Resolve modify/delete conflicts in favor of the microservices scaffold: re-add the Contracts, ServiceDefaults, Gateway, and Identity/Notify/Rooms service projects that december had removed. Keep december's branding and route-case updates, and preserve its DorkNet.ApiRouteCoverage tool in the solution (union of both branches' projects).
This commit is contained in:
+3
-1
@@ -48,6 +48,7 @@ dist$ZIPNAME.zip
|
||||
## time someone rebuilds. Keep the source committed, regenerate output.
|
||||
DorkNet.Server/wwwroot/admin/index.html
|
||||
DorkNet.Server/wwwroot/admin/assets/
|
||||
DorkNet.Server/wwwroot/admin/brand/
|
||||
DorkNet.Server/wwwroot/admin/*.map
|
||||
DorkNet.Server/admin-ui/node_modules/
|
||||
DorkNet.Server/admin-ui/dist/
|
||||
@@ -58,6 +59,7 @@ DorkNet.Server/admin-ui/tsconfig.tsbuildinfo
|
||||
## Same reasoning as admin-ui above: hashed output, regenerate per build.
|
||||
DorkNet.Server/wwwroot/site/index.html
|
||||
DorkNet.Server/wwwroot/site/assets/
|
||||
DorkNet.Server/wwwroot/site/brand/
|
||||
DorkNet.Server/wwwroot/site/*.map
|
||||
DorkNet.Server/site/node_modules/
|
||||
DorkNet.Server/site/dist/
|
||||
@@ -83,4 +85,4 @@ Recovered/
|
||||
Recovered(*)/
|
||||
|
||||
|
||||
local-releases/**
|
||||
local-releases/**
|
||||
|
||||
Reference in New Issue
Block a user