hrms-bangkok/hrms-api-recruit
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into working

Browse source 
# Conflicts:
#	.vs/BMA.EHR.Recruit.Service/v17/.suo
#	obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache
#	obj/Debug/net7.0/Sentry.Attributes.cs
#	obj/project.assets.json
#	obj/project.nuget.cache
This commit is contained in:
Suphonchai Phoonsawat 2025-03-31 13:12:47 +07:00
commit 315ceb261a
8 changed files with 48 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json
View file

@ -110,10 +110,13 @@
"target": "Package",
"version": "[2.19.0, )"
},
<<<<<<< HEAD
"NEST": {
"target": "Package",
"version": "[7.17.5, )"
},
=======
>>>>>>> develop
"Newtonsoft.Json": {
"target": "Package",
"version": "[13.0.3, )"

2
obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs
View file

@ -15,7 +15,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("BMA.EHR.Recruit.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+996c08c9e8817c79b8bb546e8dcd2446e8650a74")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04a324bff2631f94ba4d5e6df817618812353c7c")]
[assembly: System.Reflection.AssemblyProductAttribute("BMA.EHR.Recruit.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("BMA.EHR.Recruit.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
View file

@ -1 +1 @@
6273544200a81281138b8799a4b9f6c09b687d02dd68279af5a973b09453ab1f
c3d07eeb8270378e83e76975dc8c2133f5422a38fb6021b7d66d242f1ebbb676

21
obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig Normal file
View file

@ -0,0 +1,21 @@
is_global = true
build_property.TargetFramework = net7.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb = true
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = BMA.EHR.Recruit.Service
build_property.RootNamespace = BMA.EHR.Recruit.Service
build_property.ProjectDir = D:\Develop\SourceCode\hrms-api-recruit\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.RazorLangVersion = 7.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = D:\Develop\SourceCode\hrms-api-recruit
build_property._RazorSourceGeneratorDebug =
build_property.EffectiveAnalysisLevelStyle = 7.0
build_property.EnableCodeStyleSeverity =

BIN
obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache Normal file
View file

Binary file not shown.

3
obj/Debug/net7.0/Sentry.Attributes.cs
View file

@ -1,7 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
<<<<<<< HEAD
// Runtime Version:4.0.30319.42000
=======
>>>>>>> develop
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

12
obj/project.assets.json
View file

@ -2564,6 +2564,7 @@
}
}
},
<<<<<<< HEAD
"NEST/7.17.5": {
"type": "package",
"dependencies": {
@ -2580,6 +2581,8 @@
}
}
},
=======
>>>>>>> develop
"NETStandard.Library/1.6.1": {
"type": "package",
"dependencies": {
@ -8270,6 +8273,7 @@
"mysqlconnector.nuspec"
]
},
<<<<<<< HEAD
"NEST/7.17.5": {
"sha512": "bo9UyuIoVRx4IUQiuC8ZrlZuvAXKIccernC7UUKukQCEmRq2eVIk+gubHlnMQljrP51q0mN4cjgy9vv5uZPkoA==",
"type": "package",
@ -8289,6 +8293,8 @@
"nuget-icon.png"
]
},
=======
>>>>>>> develop
"NETStandard.Library/1.6.1": {
"sha512": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==",
"type": "package",
@ -13710,7 +13716,10 @@
"Microsoft.VisualStudio.Azure.Containers.Tools.Targets >= 1.17.0",
"MongoDB.Driver >= 2.19.0",
"MongoDB.Driver.GridFS >= 2.19.0",
<<<<<<< HEAD
"NEST >= 7.17.5",
=======
>>>>>>> develop
"Newtonsoft.Json >= 13.0.3",
"Pomelo.EntityFrameworkCore.MySql >= 7.0.0",
"Pomelo.EntityFrameworkCore.MySql.Design >= 1.1.2",
@ -13837,10 +13846,13 @@
"target": "Package",
"version": "[2.19.0, )"
},
<<<<<<< HEAD
"NEST": {
"target": "Package",
"version": "[7.17.5, )"
},
=======
>>>>>>> develop
"Newtonsoft.Json": {
"target": "Package",
"version": "[13.0.3, )"

7
obj/project.nuget.cache
View file

@ -1,6 +1,10 @@
{
"version": 2,
<<<<<<< HEAD
"dgSpecHash": "2b/aE3ltIAI=",
=======
"dgSpecHash": "so4FDnKvBAM=",
>>>>>>> develop
"success": true,
"projectFilePath": "D:\\Develop\\SourceCode\\hrms-api-recruit\\BMA.EHR.Recruit.Service.csproj",
"expectedPackageFiles": [
@ -149,7 +153,10 @@
"C:\\Users\\jack\\.nuget\\packages\\mono.texttemplating\\2.2.1\\mono.texttemplating.2.2.1.nupkg.sha512",
"C:\\Users\\jack\\.nuget\\packages\\mysql.data\\8.0.29\\mysql.data.8.0.29.nupkg.sha512",
"C:\\Users\\jack\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512",
<<<<<<< HEAD
"C:\\Users\\jack\\.nuget\\packages\\nest\\7.17.5\\nest.7.17.5.nupkg.sha512",
=======
>>>>>>> develop
"C:\\Users\\jack\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
"C:\\Users\\jack\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
"C:\\Users\\jack\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",