From 1551370655cea43fb5ee42d4be3f682e8a771c47 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Mon, 13 May 2024 21:19:50 +0200
Subject: [PATCH] simplify folder structure

---
 package-lock.json                            |  6 ------
 tanks-backend/TanksServer.sln                |  8 --------
 tanks-backend/TanksServer/TanksServer.csproj | 19 ++++++++++++++-----
 tanks-backend/global.json                    |  6 ------
 tanks-backend/shared.props                   | 20 --------------------
 5 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 package-lock.json
 delete mode 100644 tanks-backend/global.json
 delete mode 100644 tanks-backend/shared.props

diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index fa1abcd..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "cccb-tanks-cs",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}
diff --git a/tanks-backend/TanksServer.sln b/tanks-backend/TanksServer.sln
index b28b08a..c4a9016 100644
--- a/tanks-backend/TanksServer.sln
+++ b/tanks-backend/TanksServer.sln
@@ -4,13 +4,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TanksServer", "TanksServer\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{12DB7D48-1BB2-488B-B4D9-4126087D2F8C}"
 	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-		shared.props = shared.props
 		Dockerfile = Dockerfile
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServicePoint2", "..\..\servicepoint2\servicepoint2-binding-cs\ServicePoint2\ServicePoint2.csproj", "{BC27CED4-82FE-4CD4-B784-B7596586801D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,9 +17,5 @@ Global
 		{D88BF376-47A4-4C72-ADD1-983F9285C351}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D88BF376-47A4-4C72-ADD1-983F9285C351}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D88BF376-47A4-4C72-ADD1-983F9285C351}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC27CED4-82FE-4CD4-B784-B7596586801D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC27CED4-82FE-4CD4-B784-B7596586801D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC27CED4-82FE-4CD4-B784-B7596586801D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC27CED4-82FE-4CD4-B784-B7596586801D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/tanks-backend/TanksServer/TanksServer.csproj b/tanks-backend/TanksServer/TanksServer.csproj
index 8da3166..a2845d3 100644
--- a/tanks-backend/TanksServer/TanksServer.csproj
+++ b/tanks-backend/TanksServer/TanksServer.csproj
@@ -1,14 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-    <Import Project="../shared.props" />
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>disable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
 
     <PropertyGroup>
         <PublishAot>true</PublishAot>
+        <IsAotCompatible>true</IsAotCompatible>
+        <InvariantGlobalization>true</InvariantGlobalization>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <AnalysisMode>Recommended</AnalysisMode>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <NoWarn>CA1805,CA1848</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="DotNext.Threading" Version="5.3.0" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+        <PackageReference Include="ServicePoint2" Version="0.2.0" />
         <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
     </ItemGroup>
 
@@ -16,8 +29,4 @@
         <None Include="./assets/**" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Always"/>
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\servicepoint2\servicepoint2-binding-cs\ServicePoint2\ServicePoint2.csproj" />
-    </ItemGroup>
-
 </Project>
diff --git a/tanks-backend/global.json b/tanks-backend/global.json
deleted file mode 100644
index 8eb62be..0000000
--- a/tanks-backend/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "8.0.0",
-    "rollForward": "latestMajor"
-  }
-}
diff --git a/tanks-backend/shared.props b/tanks-backend/shared.props
deleted file mode 100644
index 2417333..0000000
--- a/tanks-backend/shared.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>disable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <IsAotCompatible>true</IsAotCompatible>
-        <InvariantGlobalization>true</InvariantGlobalization>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <AnalysisMode>Recommended</AnalysisMode>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NoWarn>CA1805,CA1848</NoWarn>
-    </PropertyGroup>
-
-</Project>