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:
#	bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll
#	bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
#	obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json
#	obj/BMA.EHR.Recruit.Service.csproj.nuget.g.props
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.genruntimeconfig.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
#	obj/Debug/net7.0/Sentry.Attributes.cs
#	obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll
#	obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll
#	obj/project.assets.json
#	obj/project.nuget.cache
This commit is contained in:
Suphonchai Phoonsawat 2023-03-24 15:17:09 +07:00
commit e33c19ae8a
18 changed files with 508 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,9 +9,17 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = BMA.EHR.Recruit.Service
build_property.RootNamespace = BMA.EHR.Recruit.Service
<<<<<<< HEAD
build_property.ProjectDir = D:\Develop\Source\BMA-EHR-Recruit-Service\
build_property.RazorLangVersion = 7.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = D:\Develop\Source\BMA-EHR-Recruit-Service
=======
build_property.ProjectDir = /Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/
build_property.RazorLangVersion = 7.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = /Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service
>>>>>>> develop
build_property._RazorSourceGeneratorDebug =

4
obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache
View file

@ -1 +1,5 @@
<<<<<<< HEAD
122b6472bf22a328ba8031fef1ad69109bfa88a7
=======
3964ea2c2ea39b9c39eed4b75cf1762d7372e6d3
>>>>>>> develop

4
obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt
View file

@ -356,6 +356,7 @@ D:/Develop/Source/BMA-EHR-Recruit-Service/obj/Debug/net7.0/BMA.EHR.Recruit.Servi
/Users/suphonchai/Develop/source/BMA-EHR/BMA-EHR-RECRUIT-SERVICE/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
/Users/suphonchai/Develop/source/BMA-EHR/BMA-EHR-RECRUIT-SERVICE/obj/Debug/net7.0/BMA.EHR.Recruit.Service.genruntimeconfig.cache
/Users/suphonchai/Develop/source/BMA-EHR/BMA-EHR-RECRUIT-SERVICE/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll
<<<<<<< HEAD
D:\Develop\Source\BMA-EHR-Recruit-Service\bin\Debug\net7.0\nuget.config
D:\Develop\Source\BMA-EHR-Recruit-Service\bin\Debug\net7.0\appsettings.Development.json
D:\Develop\Source\BMA-EHR-Recruit-Service\bin\Debug\net7.0\appsettings.json
@ -535,3 +536,6 @@ D:\Develop\Source\BMA-EHR-Recruit-Service\obj\Debug\net7.0\BMA.EHR.Recruit.Servi
D:\Develop\Source\BMA-EHR-Recruit-Service\obj\Debug\net7.0\BMA.EHR.Recruit.Service.pdb
D:\Develop\Source\BMA-EHR-Recruit-Service\obj\Debug\net7.0\BMA.EHR.Recruit.Service.genruntimeconfig.cache
D:\Develop\Source\BMA-EHR-Recruit-Service\obj\Debug\net7.0\ref\BMA.EHR.Recruit.Service.dll
=======
/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/bin/Debug/net7.0/AWSSDK.S3.dll
>>>>>>> develop

4
obj/Debug/net7.0/BMA.EHR.Recruit.Service.genruntimeconfig.cache
View file

@ -1 +1,5 @@
<<<<<<< HEAD
8db275d960cef9eef9fdfa8ab97510a96f0326ff
=======
592c44784036e353abd93e053c077d3a77090612
>>>>>>> develop

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

@ -11,7 +11,11 @@
using System;
using System.Reflection;
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyMetadata("Sentry.ProjectDirectory", "D:\\Develop\\Source\\BMA-EHR-Recruit-Service\\")]
=======
[assembly: System.Reflection.AssemblyMetadata("Sentry.ProjectDirectory", "/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/")]
>>>>>>> develop
// Generated by the MSBuild WriteCodeFragment class.