Merge branch 'master' of http://git.legu.cc/liwei_3d/dfbattle

2023-05-12 20:38:25 +08:00 · 2023-05-12 20:38:25 +08:00 · 8ab452dfdd
commit 8ab452dfdd
parent d6b7af4cd3
13 changed files with 2 additions and 144 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,4 +12,5 @@
 *.log
 /output
 /obj
-/publish
+/publish
+/bin
--- a/bin/Debug/net6.0/Google.Protobuf.dll
+++ b/bin/Debug/net6.0/Google.Protobuf.dll
--- a/bin/release/net6.0/Fleck.dll
+++ b/bin/release/net6.0/Fleck.dll
--- a/bin/release/net6.0/Google.Protobuf.dll
+++ b/bin/release/net6.0/Google.Protobuf.dll
--- a/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
+++ b/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
--- a/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.dll
+++ b/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.dll
--- a/bin/release/net6.0/battle.dll
+++ b/bin/release/net6.0/battle.dll
--- a/bin/release/net6.0/dfbattle
+++ b/bin/release/net6.0/dfbattle
--- a/bin/release/net6.0/dfbattle.deps.json
+++ b/bin/release/net6.0/dfbattle.deps.json
@ -1,131 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v6.0",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETCoreApp,Version=v6.0": {
-      "dfbattle/1.0.0": {
-        "dependencies": {
-          "Fleck": "1.2.0",
-          "Microsoft.Extensions.DependencyInjection": "2.1.1",
-          "battle": "1.0.0.0",
-          "FightRunner": "1.0.0.0",
-          "GameFight": "1.0.0.0",
-          "GameProto": "1.0.0.0"
-        },
-        "runtime": {
-          "dfbattle.dll": {}
-        }
-      },
-      "Fleck/1.2.0": {
-        "runtime": {
-          "lib/netcoreapp2.0/Fleck.dll": {
-            "assemblyVersion": "1.2.0.0",
-            "fileVersion": "1.2.0.0"
-          }
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection/2.1.1": {
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1"
-        },
-        "runtime": {
-          "lib/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.dll": {
-            "assemblyVersion": "2.1.1.0",
-            "fileVersion": "2.1.1.18157"
-          }
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
-        "runtime": {
-          "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
-            "assemblyVersion": "2.1.1.0",
-            "fileVersion": "2.1.1.18157"
-          }
-        }
-      },
-      "battle/1.0.0.0": {
-        "runtime": {
-          "battle.dll": {
-            "assemblyVersion": "1.0.0.0",
-            "fileVersion": "1.0.0.0"
-          }
-        }
-      },
-      "FightRunner/1.0.0.0": {
-        "runtime": {
-          "FightRunner.dll": {
-            "assemblyVersion": "1.0.0.0",
-            "fileVersion": "1.0.0.0"
-          }
-        }
-      },
-      "GameFight/1.0.0.0": {
-        "runtime": {
-          "GameFight.dll": {
-            "assemblyVersion": "1.0.0.0",
-            "fileVersion": "1.0.0.0"
-          }
-        }
-      },
-      "GameProto/1.0.0.0": {
-        "runtime": {
-          "GameProto.dll": {
-            "assemblyVersion": "1.0.0.0",
-            "fileVersion": "1.0.0.0"
-          }
-        }
-      }
-    }
-  },
-  "libraries": {
-    "dfbattle/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Fleck/1.2.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-bPLXn6QbLAFoviur6XbrKB0Zn6x04E8VibHXyHZeJsoC7bkUl5DVtzM5cZgDuqHkIrBqAXJyTNJwSNIc6wBJ2Q==",
-      "path": "fleck/1.2.0",
-      "hashPath": "fleck.1.2.0.nupkg.sha512"
-    },
-    "Microsoft.Extensions.DependencyInjection/2.1.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-RVdgNWT/73M0eCpreGpWv5NmbHFGQzzW+G7nChK8ej84m+d1nzeWrtqcRYnEpKNx3B8V/Uek4tNP0WCaCNjYnQ==",
-      "path": "microsoft.extensions.dependencyinjection/2.1.1",
-      "hashPath": "microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512"
-    },
-    "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-MgYpU5cwZohUMKKg3sbPhvGG+eAZ/59E9UwPwlrUkyXU+PGzqwZg9yyQNjhxuAWmoNoFReoemeCku50prYSGzA==",
-      "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.1",
-      "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512"
-    },
-    "battle/1.0.0.0": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "FightRunner/1.0.0.0": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "GameFight/1.0.0.0": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "GameProto/1.0.0.0": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    }
-  }
-}
--- a/bin/release/net6.0/dfbattle.dll
+++ b/bin/release/net6.0/dfbattle.dll
--- a/bin/release/net6.0/dfbattle.exe
+++ b/bin/release/net6.0/dfbattle.exe
--- a/bin/release/net6.0/dfbattle.pdb
+++ b/bin/release/net6.0/dfbattle.pdb
--- a/bin/release/net6.0/dfbattle.runtimeconfig.json
+++ b/bin/release/net6.0/dfbattle.runtimeconfig.json
@ -1,12 +0,0 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
-}