google/ASCU_ALL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78b2f5ac24
ASCU_ALL/ApiServer/obj/Debug/net5.0
History
Georgy Khatuncev 78b2f5ac24 Merge branch 'test' of https://git.mbucb.ru/google/ASCKU_PC into test 
# Conflicts:
#	.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2
#	.vs/ASCKU Projects/v16/.suo
#	ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache
#	ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache
#	DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache
#	DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache
#	Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache
#	Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache
#	PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache
#	PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.AssemblyReference.cache
#	SupportClasses/obj/Release/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache
#	Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache
#	Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache
#	Tests/obj/Debug/netcoreapp3.1/Tests.csproj.AssemblyReference.cache
#	Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache
#	test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache
#	test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache
2021-08-06 10:44:55 +05:00
..
ref Work 2021-07-31 22:27:59 +05:00
staticwebassets Work 2021-07-31 22:27:59 +05:00
.NETCoreApp,Version=v5.0.AssemblyAttributes.cs Work 2021-07-31 22:27:59 +05:00
ApiServer.AssemblyInfo.cs Work 2021-07-31 22:27:59 +05:00
ApiServer.AssemblyInfoInputs.cache Work 2021-07-31 22:27:59 +05:00
ApiServer.assets.cache Work 2021-08-03 11:34:44 +05:00
ApiServer.csproj.AssemblyReference.cache Home 2021-08-06 10:39:28 +05:00
ApiServer.csproj.CopyComplete Work 2021-07-31 22:27:59 +05:00
ApiServer.csproj.CoreCompileInputs.cache Work 2021-07-31 22:27:59 +05:00
ApiServer.csproj.FileListAbsolute.txt Work 2021-07-31 22:27:59 +05:00
ApiServer.dll Work 2021-07-31 22:27:59 +05:00
ApiServer.GeneratedMSBuildEditorConfig.editorconfig Work 2021-07-31 22:27:59 +05:00
ApiServer.genruntimeconfig.cache Work 2021-07-31 22:27:59 +05:00
ApiServer.MvcApplicationPartsAssemblyInfo.cache Work 2021-07-31 22:27:59 +05:00
ApiServer.pdb Work 2021-07-31 22:27:59 +05:00
ApiServer.RazorTargetAssemblyInfo.cache Work 2021-07-31 22:27:59 +05:00
apphost.exe Work 2021-07-31 22:27:59 +05:00