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

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

@ -1,6 +1,7 @@
{
"format": 1,
"restore": {
<<<<<<< HEAD
"D:\\Develop\\Source\\BMA-EHR-Recruit-Service\\BMA.EHR.Recruit.Service.csproj": {}
},
"projects": {
@ -12,15 +13,33 @@
"projectPath": "D:\\Develop\\Source\\BMA-EHR-Recruit-Service\\BMA.EHR.Recruit.Service.csproj",
"packagesPath": "C:\\Users\\suphonchai\\.nuget\\packages\\",
"outputPath": "D:\\Develop\\Source\\BMA-EHR-Recruit-Service\\obj\\",
=======
"/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/BMA.EHR.Recruit.Service.csproj": {}
},
"projects": {
"/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/BMA.EHR.Recruit.Service.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/BMA.EHR.Recruit.Service.csproj",
"projectName": "BMA.EHR.Recruit.Service",
"projectPath": "/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/BMA.EHR.Recruit.Service.csproj",
"packagesPath": "/Users/suphonchai/.nuget/packages/",
"outputPath": "/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/obj/",
>>>>>>> develop
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
<<<<<<< HEAD
"D:\\Develop\\Source\\BMA-EHR-Recruit-Service\\NuGet.Config",
"C:\\Users\\suphonchai\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
=======
"/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/NuGet.Config",
"/Users/suphonchai/.nuget/NuGet/NuGet.Config"
>>>>>>> develop
],
"originalTargetFrameworks": [
"net7.0"
@ -46,6 +65,10 @@
"net7.0": {
"targetAlias": "net7.0",
"dependencies": {
"AWSSDK.S3": {
"target": "Package",
"version": "[3.7.103.35, )"
},
"BMA.EHR.Core": {
"target": "Package",
"version": "[1.0.0, )"
@ -184,7 +207,11 @@
"privateAssets": "all"
}
},
<<<<<<< HEAD
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
=======
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/7.0.202/RuntimeIdentifierGraph.json"
>>>>>>> develop
}
}
}