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

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
# Conflicts:
#	obj/project.assets.json
#	obj/project.nuget.cache
This commit is contained in:
Suphonchai Phoonsawat 2023-03-30 10:37:43 +07:00
commit 338322986e
31 changed files with 1711 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
obj/Debug/net7.0/apphost.exe
View file

Binary file not shown.

18
obj/project.assets.json
View file

@ -8088,17 +8088,30 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "D:\\Develop\\Source\\BMA-EHR-Recurit-Exam-Service\\BMA-EHR-Recurit-Exam-Service.csproj",
"projectName": "BMA-EHR-Recurit-Exam-Service",
"projectPath": "D:\\Develop\\Source\\BMA-EHR-Recurit-Exam-Service\\BMA-EHR-Recurit-Exam-Service.csproj",
"packagesPath": "C:\\Users\\suphonchai\\.nuget\\packages\\",
"outputPath": "D:\\Develop\\Source\\BMA-EHR-Recurit-Exam-Service\\obj\\",
=======
"projectUniqueName": "D:\\BMA-EHR-Recurit-Exam-Service\\BMA.EHR.Recurit.Exam.Service.csproj",
"projectName": "BMA.EHR.Recurit.Exam.Service",
"projectPath": "D:\\BMA-EHR-Recurit-Exam-Service\\BMA.EHR.Recurit.Exam.Service.csproj",
"packagesPath": "C:\\Users\\M\\.nuget\\packages\\",
"outputPath": "D:\\BMA-EHR-Recurit-Exam-Service\\obj\\",
>>>>>>> origin/develop
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
<<<<<<< HEAD
"C:\\Users\\suphonchai\\AppData\\Roaming\\NuGet\\NuGet.Config",
=======
"D:\\BMA-EHR-Recurit-Exam-Service\\NuGet.Config",
"C:\\Users\\M\\AppData\\Roaming\\NuGet\\NuGet.Config",
>>>>>>> origin/develop
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@ -8106,9 +8119,14 @@
"net7.0"
],
"sources": {
<<<<<<< HEAD
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files\\dotnet\\library-packs": {},
"https://api.nuget.org/v3/index.json": {}
=======
"https://api.nuget.org/v3/index.json": {},
"https://nuget.frappet.synology.me/v3/index.json": {}
>>>>>>> origin/develop
},
"frameworks": {
"net7.0": {

6
obj/project.nuget.cache
View file

@ -1,8 +1,14 @@
{
"version": 2,
<<<<<<< HEAD
"dgSpecHash": "ChnI3WhXjP+sxAKLkSP8S8mz3WOzlnkCZXbBnqR2HJ/SOQOepaa34U2OC3GEmT8xAdinmgkUc82x7WgjOC7iRw==",
"success": true,
"projectFilePath": "D:\\Develop\\Source\\BMA-EHR-Recurit-Exam-Service\\BMA-EHR-Recurit-Exam-Service.csproj",
=======
"dgSpecHash": "jARShbZ7PIhhIRmoQr9ZlMRsoMjKYArRP27wUCJoLnZq6aAb2nxywy+XINyZW0hQINikWB8ZFgzBjUw6XqNheQ==",
"success": true,
"projectFilePath": "D:\\BMA-EHR-Recurit-Exam-Service\\BMA.EHR.Recurit.Exam.Service.csproj",
>>>>>>> origin/develop
"expectedPackageFiles": [
"C:\\Users\\suphonchai\\.nuget\\packages\\bma.ehr.core\\1.0.0\\bma.ehr.core.1.0.0.nupkg.sha512",
"C:\\Users\\suphonchai\\.nuget\\packages\\bma.ehr.extensions\\1.0.1\\bma.ehr.extensions.1.0.1.nupkg.sha512",