上传obj代码
This commit is contained in:
parent
2062bd3672
commit
bf6293aebb
Binary file not shown.
Binary file not shown.
@ -1,4 +1,4 @@
|
|||||||
// <autogenerated />
|
// <autogenerated />
|
||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = "")]
|
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]
|
||||||
|
Binary file not shown.
@ -18,5 +18,5 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyTitleAttribute("dfbattle")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("dfbattle")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||||
|
|
||||||
// Generated by the MSBuild WriteCodeFragment class.
|
// 由 MSBuild WriteCodeFragment 类生成。
|
||||||
|
|
||||||
|
@ -7,8 +7,4 @@ build_property.InvariantGlobalization =
|
|||||||
build_property.PlatformNeutralAssembly =
|
build_property.PlatformNeutralAssembly =
|
||||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||||
build_property.RootNamespace = dfbattle
|
build_property.RootNamespace = dfbattle
|
||||||
<<<<<<< HEAD
|
|
||||||
build_property.ProjectDir = F:\work\c#\dfbattle\
|
build_property.ProjectDir = F:\work\c#\dfbattle\
|
||||||
=======
|
|
||||||
build_property.ProjectDir = /home/liwei/dfbattle/
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
|
Binary file not shown.
@ -1,5 +1 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
2b1963df72e0393b2f54a2f373236d9512a77a15
|
2b1963df72e0393b2f54a2f373236d9512a77a15
|
||||||
=======
|
|
||||||
043079b008ce5df4c13617bd2af47e214e500e6f
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
|
@ -1,25 +1,3 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\dfbattle.exe
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\dfbattle.deps.json
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\dfbattle.runtimeconfig.json
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\dfbattle.dll
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\dfbattle.pdb
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.AssemblyReference.cache
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.AssemblyInfoInputs.cache
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.AssemblyInfo.cs
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.CoreCompileInputs.cache
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.dll
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\refint\dfbattle.dll
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.pdb
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.genruntimeconfig.cache
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\ref\dfbattle.dll
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\Fleck.dll
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\Google.Protobuf.dll
|
|
||||||
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.CopyComplete
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.dll
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
|
||||||
E:\c#\dfbattle\bin\Debug\net6.0\battle.dll
|
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.exe
|
F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.exe
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.deps.json
|
F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.deps.json
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.runtimeconfig.json
|
F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.runtimeconfig.json
|
||||||
@ -29,6 +7,9 @@ F:\work\c#\dfbattle\bin\Debug\net6.0\Fleck.dll
|
|||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.dll
|
F:\work\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.dll
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
F:\work\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\battle.dll
|
F:\work\c#\dfbattle\bin\Debug\net6.0\battle.dll
|
||||||
|
F:\work\c#\dfbattle\bin\Debug\net6.0\FightRunner.dll
|
||||||
|
F:\work\c#\dfbattle\bin\Debug\net6.0\GameFight.dll
|
||||||
|
F:\work\c#\dfbattle\bin\Debug\net6.0\GameProto.dll
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.AssemblyReference.cache
|
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.AssemblyReference.cache
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.AssemblyInfoInputs.cache
|
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.AssemblyInfoInputs.cache
|
||||||
@ -40,50 +21,3 @@ F:\work\c#\dfbattle\obj\Debug\net6.0\refint\dfbattle.dll
|
|||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.pdb
|
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.pdb
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.genruntimeconfig.cache
|
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.genruntimeconfig.cache
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\ref\dfbattle.dll
|
F:\work\c#\dfbattle\obj\Debug\net6.0\ref\dfbattle.dll
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\FightRunner.dll
|
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\GameFight.dll
|
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\GameProto.dll
|
|
||||||
=======
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.exe
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.deps.json
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.runtimeconfig.json
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.dll
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.pdb
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfoInputs.cache
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfo.cs
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.dll
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/refint/dfbattle.dll
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.pdb
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/ref/dfbattle.dll
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/Fleck.dll
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/Google.Protobuf.dll
|
|
||||||
E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CopyComplete
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
|
||||||
E:/c#/dfbattle/bin/Debug/net6.0/battle.dll
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle.deps.json
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle.runtimeconfig.json
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle.dll
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle.pdb
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/Fleck.dll
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/Google.Protobuf.dll
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
|
||||||
/home/liwei/dfbattle/bin/Debug/net6.0/battle.dll
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfoInputs.cache
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfo.cs
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CopyComplete
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.dll
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/refint/dfbattle.dll
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.pdb
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache
|
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/ref/dfbattle.dll
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
|
Binary file not shown.
@ -1,5 +1 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
e467f67f7c05efce451b802592739e7f55c06ec5
|
e467f67f7c05efce451b802592739e7f55c06ec5
|
||||||
=======
|
|
||||||
ce008eecd25694de187e069485ceb927ba88ca04
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"format": 1,
|
"format": 1,
|
||||||
"restore": {
|
"restore": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"F:\\work\\c#\\dfbattle\\dfbattle.csproj": {}
|
"F:\\work\\c#\\dfbattle\\dfbattle.csproj": {}
|
||||||
},
|
},
|
||||||
"projects": {
|
"projects": {
|
||||||
@ -16,22 +15,6 @@
|
|||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
||||||
=======
|
|
||||||
"/home/liwei/dfbattle/dfbattle.csproj": {}
|
|
||||||
},
|
|
||||||
"projects": {
|
|
||||||
"/home/liwei/dfbattle/dfbattle.csproj": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"restore": {
|
|
||||||
"projectUniqueName": "/home/liwei/dfbattle/dfbattle.csproj",
|
|
||||||
"projectName": "dfbattle",
|
|
||||||
"projectPath": "/home/liwei/dfbattle/dfbattle.csproj",
|
|
||||||
"packagesPath": "/root/.nuget/packages/",
|
|
||||||
"outputPath": "/home/liwei/dfbattle/obj/",
|
|
||||||
"projectStyle": "PackageReference",
|
|
||||||
"configFilePaths": [
|
|
||||||
"/root/.nuget/NuGet/NuGet.Config"
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
],
|
],
|
||||||
"originalTargetFrameworks": [
|
"originalTargetFrameworks": [
|
||||||
"net6.0"
|
"net6.0"
|
||||||
@ -98,11 +81,7 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100-preview.7.22377.5\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100-preview.7.22377.5\\RuntimeIdentifierGraph.json"
|
||||||
=======
|
|
||||||
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/6.0.403/RuntimeIdentifierGraph.json"
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
|
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
|
||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
||||||
<<<<<<< HEAD
|
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
|
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||||
@ -12,14 +11,5 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||||
<SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
|
<SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
|
||||||
=======
|
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/root/.nuget/packages/</NuGetPackageRoot>
|
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/root/.nuget/packages/</NuGetPackageFolders>
|
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.3.1</NuGetToolVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<SourceRoot Include="/root/.nuget/packages/" />
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
@ -11,22 +11,6 @@
|
|||||||
"lib/netcoreapp2.0/Fleck.dll": {}
|
"lib/netcoreapp2.0/Fleck.dll": {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
"Google.Protobuf/3.21.9": {
|
|
||||||
"type": "package",
|
|
||||||
"compile": {
|
|
||||||
"lib/net5.0/Google.Protobuf.dll": {
|
|
||||||
"related": ".pdb;.xml"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net5.0/Google.Protobuf.dll": {
|
|
||||||
"related": ".pdb;.xml"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
"Microsoft.Extensions.DependencyInjection/2.1.1": {
|
"Microsoft.Extensions.DependencyInjection/2.1.1": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@ -112,16 +96,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"packageFolders": {
|
"packageFolders": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"C:\\Users\\Administrator\\.nuget\\packages\\": {}
|
"C:\\Users\\Administrator\\.nuget\\packages\\": {}
|
||||||
=======
|
|
||||||
"/root/.nuget/packages/": {}
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
},
|
},
|
||||||
"project": {
|
"project": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"projectUniqueName": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
"projectUniqueName": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
||||||
"projectName": "dfbattle",
|
"projectName": "dfbattle",
|
||||||
"projectPath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
"projectPath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
||||||
@ -130,16 +109,6 @@
|
|||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
||||||
=======
|
|
||||||
"projectUniqueName": "/home/liwei/dfbattle/dfbattle.csproj",
|
|
||||||
"projectName": "dfbattle",
|
|
||||||
"projectPath": "/home/liwei/dfbattle/dfbattle.csproj",
|
|
||||||
"packagesPath": "/root/.nuget/packages/",
|
|
||||||
"outputPath": "/home/liwei/dfbattle/obj/",
|
|
||||||
"projectStyle": "PackageReference",
|
|
||||||
"configFilePaths": [
|
|
||||||
"/root/.nuget/NuGet/NuGet.Config"
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
],
|
],
|
||||||
"originalTargetFrameworks": [
|
"originalTargetFrameworks": [
|
||||||
"net6.0"
|
"net6.0"
|
||||||
@ -206,11 +175,7 @@
|
|||||||
"privateAssets": "all"
|
"privateAssets": "all"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100-preview.7.22377.5\\RuntimeIdentifierGraph.json"
|
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100-preview.7.22377.5\\RuntimeIdentifierGraph.json"
|
||||||
=======
|
|
||||||
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/6.0.403/RuntimeIdentifierGraph.json"
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": 2,
|
"version": 2,
|
||||||
<<<<<<< HEAD
|
|
||||||
"dgSpecHash": "BBp5wqZ2XAQY794M4tYkeLMy/p0T1Mmgp2CSpUhLV3NZACcr6Wh9QxvKSK1zJ6lQ74nVyW6X3SfX2hATVqkvfQ==",
|
"dgSpecHash": "BBp5wqZ2XAQY794M4tYkeLMy/p0T1Mmgp2CSpUhLV3NZACcr6Wh9QxvKSK1zJ6lQ74nVyW6X3SfX2hATVqkvfQ==",
|
||||||
"success": true,
|
"success": true,
|
||||||
"projectFilePath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
"projectFilePath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
||||||
@ -12,16 +11,6 @@
|
|||||||
"C:\\Users\\Administrator\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\6.0.7\\microsoft.windowsdesktop.app.ref.6.0.7.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\6.0.7\\microsoft.windowsdesktop.app.ref.6.0.7.nupkg.sha512",
|
||||||
"C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\6.0.7\\microsoft.aspnetcore.app.ref.6.0.7.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\6.0.7\\microsoft.aspnetcore.app.ref.6.0.7.nupkg.sha512",
|
||||||
"C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.app.host.win-x64\\6.0.7\\microsoft.netcore.app.host.win-x64.6.0.7.nupkg.sha512"
|
"C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.app.host.win-x64\\6.0.7\\microsoft.netcore.app.host.win-x64.6.0.7.nupkg.sha512"
|
||||||
=======
|
|
||||||
"dgSpecHash": "zBovY5NBf0c1R/WPihpnHEfJMjRwvylLUCWpeIn14fvCWbKy0J5NOisGvz90yskeRxteThXft7l9+5VrPTHd3Q==",
|
|
||||||
"success": true,
|
|
||||||
"projectFilePath": "/home/liwei/dfbattle/dfbattle.csproj",
|
|
||||||
"expectedPackageFiles": [
|
|
||||||
"/root/.nuget/packages/fleck/1.2.0/fleck.1.2.0.nupkg.sha512",
|
|
||||||
"/root/.nuget/packages/google.protobuf/3.21.9/google.protobuf.3.21.9.nupkg.sha512",
|
|
||||||
"/root/.nuget/packages/microsoft.extensions.dependencyinjection/2.1.1/microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512",
|
|
||||||
"/root/.nuget/packages/microsoft.extensions.dependencyinjection.abstractions/2.1.1/microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512"
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
||||||
],
|
],
|
||||||
"logs": []
|
"logs": []
|
||||||
}
|
}
|
@ -1,4 +0,0 @@
|
|||||||
// <autogenerated />
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = "")]
|
|
Binary file not shown.
Binary file not shown.
@ -1,22 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// This code was generated by a tool.
|
|
||||||
//
|
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
|
||||||
// the code is regenerated.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("dfbattle")]
|
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("release")]
|
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
|
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("dfbattle")]
|
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("dfbattle")]
|
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
|
||||||
|
|
||||||
// Generated by the MSBuild WriteCodeFragment class.
|
|
||||||
|
|
@ -1 +0,0 @@
|
|||||||
90e72506fa6a5e4bb11238e13048bb74d1a90769
|
|
@ -1,14 +0,0 @@
|
|||||||
is_global = true
|
|
||||||
build_property.TargetFramework = net6.0
|
|
||||||
build_property.TargetPlatformMinVersion =
|
|
||||||
build_property.UsingMicrosoftNETSdkWeb =
|
|
||||||
build_property.ProjectTypeGuids =
|
|
||||||
build_property.InvariantGlobalization =
|
|
||||||
build_property.PlatformNeutralAssembly =
|
|
||||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
|
||||||
build_property.RootNamespace = dfbattle
|
|
||||||
<<<<<<< HEAD
|
|
||||||
build_property.ProjectDir = F:\work\c#\dfbattle\
|
|
||||||
=======
|
|
||||||
build_property.ProjectDir = /home/liwei/dfbattle/
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
@ -1,8 +0,0 @@
|
|||||||
// <auto-generated/>
|
|
||||||
global using global::System;
|
|
||||||
global using global::System.Collections.Generic;
|
|
||||||
global using global::System.IO;
|
|
||||||
global using global::System.Linq;
|
|
||||||
global using global::System.Net.Http;
|
|
||||||
global using global::System.Threading;
|
|
||||||
global using global::System.Threading.Tasks;
|
|
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
cdb420ed9d2cd23254dbcdf062ae3dab201b3fa5
|
|
||||||
=======
|
|
||||||
88be5f3aedb4327d1960419193f5964d1643dce7
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
@ -1,66 +0,0 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\dfbattle.exe
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\dfbattle.deps.json
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\dfbattle.runtimeconfig.json
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\dfbattle.dll
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\dfbattle.pdb
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\Fleck.dll
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\Google.Protobuf.dll
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\Microsoft.Extensions.DependencyInjection.dll
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
|
||||||
E:\c#\dfbattle\bin\release\net6.0\battle.dll
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.AssemblyReference.cache
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.AssemblyInfoInputs.cache
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.AssemblyInfo.cs
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.CoreCompileInputs.cache
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.CopyComplete
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.dll
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\refint\dfbattle.dll
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.pdb
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\dfbattle.genruntimeconfig.cache
|
|
||||||
E:\c#\dfbattle\obj\release\net6.0\ref\dfbattle.dll
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\dfbattle.exe
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\dfbattle.deps.json
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\dfbattle.runtimeconfig.json
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\dfbattle.dll
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\dfbattle.pdb
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\Fleck.dll
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\Google.Protobuf.dll
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\Microsoft.Extensions.DependencyInjection.dll
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
|
||||||
F:\work\c#\dfbattle\bin\release\net6.0\battle.dll
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.AssemblyReference.cache
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.AssemblyInfoInputs.cache
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.AssemblyInfo.cs
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.CoreCompileInputs.cache
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.CopyComplete
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.dll
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\refint\dfbattle.dll
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.pdb
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.genruntimeconfig.cache
|
|
||||||
F:\work\c#\dfbattle\obj\release\net6.0\ref\dfbattle.dll
|
|
||||||
=======
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/dfbattle
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/dfbattle.deps.json
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/dfbattle.runtimeconfig.json
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/dfbattle.dll
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/dfbattle.pdb
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/Fleck.dll
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/Google.Protobuf.dll
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.dll
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
|
||||||
/home/liwei/dfbattle/bin/release/net6.0/battle.dll
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.csproj.AssemblyReference.cache
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.AssemblyInfoInputs.cache
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.AssemblyInfo.cs
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.csproj.CoreCompileInputs.cache
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.csproj.CopyComplete
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.dll
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/refint/dfbattle.dll
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.pdb
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/dfbattle.genruntimeconfig.cache
|
|
||||||
/home/liwei/dfbattle/obj/release/net6.0/ref/dfbattle.dll
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
Binary file not shown.
@ -1,5 +0,0 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
16fd2c759a11de13b6ae27331c561236ddac0ac6
|
|
||||||
=======
|
|
||||||
1325482b98face973291ed3e9a15254102c923dc
|
|
||||||
>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user