reorg

Directory.Packages.props

@@ -59,4 +59,4 @@
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.2" />
   </ItemGroup>
-</Project>
+</Project>

contrib/Makefile

@@ -21,12 +21,11 @@ rmep: build_publish
 	for f in Api Org; do
 		pushd $(SLNDIR)/src/$$prj
 		SOURCE_DIR=bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish/
-		mv $(SOURCE_DIR)/appsettings.json $(SOURCE_DIR)/appsettings.new.json
 		sudo cp -a $(SOURCE_DIR)/* $(DESTDIR) 
 		sudo chown -R $(USER_AND_GROUP) $(DESTDIR)
-		sudo sync
 		popd
 	done
+	sudo sync
 	sudo systemctl start yavsc-org
 	sudo systemctl start yavsc-api
 	

src/Api/Api.csproj

@@ -8,6 +8,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-    <ProjectReference Include="../Server/Server.csproj" />
+    <ProjectReference Include="../Yavsc.Server/Yavsc.Server.csproj" />
   </ItemGroup>
 </Project>