Merge branch 'develop'

Author: ethanhann

src/Dockerfile

@@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+WORKDIR /app
+
+# Copy everything
+COPY . ./
+# Restore as distinct layers
+RUN dotnet restore
+# Build and publish a release
+RUN dotnet publish -c Release -o out
+
+# Build runtime image
+FROM mcr.microsoft.com/dotnet/aspnet:6.0
+WORKDIR /app
+COPY --from=build-env /app/out .
+ENTRYPOINT ["dotnet", "InEngine.dll"]

src/InEngine/Dockerfile

@@ -23,19 +23,11 @@
     <ProjectReference Include="..\InEngine.Commands\InEngine.Commands.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Common.Logging.Serilog" Version="4.4.0" />
     <PackageReference Include="NETStandard.Library" Version="2.0.1" />
     <PackageReference Include="CommandLineParser" Version="1.9.71" />
   </ItemGroup>
   <ItemGroup>
-    <None Update="Install.ps1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Uninstall.ps1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="inengine">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -45,9 +37,6 @@
     <None Update="Dockerfile">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="docker-compose.yml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="app.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/InEngine/InEngine.csproj

@@ -1,7 +1,7 @@
 {
   "InEngine": {
     "Plugins": {
-      "InEngine.Commands": "./Plugins/"
+//      "InEngine.Commands": "./Plugins/"
     },
     "ExecWhitelist": {
     },