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

75
obj/project.assets.json
View file

@ -2,7 +2,7 @@
"version": 3,
"targets": {
"net7.0": {
"AWSSDK.Core/3.7.100.14": {
"AWSSDK.Core/3.7.106.5": {
"type": "package",
"compile": {
"lib/netcoreapp3.1/AWSSDK.Core.dll": {
@ -15,6 +15,22 @@
}
}
},
"AWSSDK.S3/3.7.103.35": {
"type": "package",
"dependencies": {
"AWSSDK.Core": "[3.7.106.5, 4.0.0)"
},
"compile": {
"lib/netcoreapp3.1/AWSSDK.S3.dll": {
"related": ".pdb;.xml"
}
},
"runtime": {
"lib/netcoreapp3.1/AWSSDK.S3.dll": {
"related": ".pdb;.xml"
}
}
},
"AWSSDK.SecurityToken/3.7.100.14": {
"type": "package",
"dependencies": {
@ -5127,15 +5143,15 @@
}
},
"libraries": {
"AWSSDK.Core/3.7.100.14": {
"sha512": "gnEgxBlk4PFEfdPE8Lkf4+D16MZFYSaW7/o6Wwe5e035QWUkTJX0Dn4LfTCdV5QSEL/fOFxu+yCAm55eIIBgog==",
"AWSSDK.Core/3.7.106.5": {
"sha512": "Ko+ZIM9HVtisWy6v+sNDmTGfSsMgQT2KxtYHLa3ztpEiN7ta9BiuBmgiNAc1BPSu3xMs4NsBBdt+qMrMKfUB/A==",
"type": "package",
"path": "awssdk.core/3.7.100.14",
"path": "awssdk.core/3.7.106.5",
"hasTools": true,
"files": [
".nupkg.metadata",
".signature.p7s",
"awssdk.core.3.7.100.14.nupkg.sha512",
"awssdk.core.3.7.106.5.nupkg.sha512",
"awssdk.core.nuspec",
"lib/net35/AWSSDK.Core.dll",
"lib/net35/AWSSDK.Core.pdb",
@ -5152,6 +5168,33 @@
"tools/account-management.ps1"
]
},
"AWSSDK.S3/3.7.103.35": {
"sha512": "zQMIHW6BCt+3wt0WkuuL1TUotvaDUTB7ykZ42sYJDKg2O8NeNn5pCibA4np9Kp1WBsulTGKZBU+dSMF1mvd69A==",
"type": "package",
"path": "awssdk.s3/3.7.103.35",
"hasTools": true,
"files": [
".nupkg.metadata",
".signature.p7s",
"analyzers/dotnet/cs/AWSSDK.S3.CodeAnalysis.dll",
"awssdk.s3.3.7.103.35.nupkg.sha512",
"awssdk.s3.nuspec",
"lib/net35/AWSSDK.S3.dll",
"lib/net35/AWSSDK.S3.pdb",
"lib/net35/AWSSDK.S3.xml",
"lib/net45/AWSSDK.S3.dll",
"lib/net45/AWSSDK.S3.pdb",
"lib/net45/AWSSDK.S3.xml",
"lib/netcoreapp3.1/AWSSDK.S3.dll",
"lib/netcoreapp3.1/AWSSDK.S3.pdb",
"lib/netcoreapp3.1/AWSSDK.S3.xml",
"lib/netstandard2.0/AWSSDK.S3.dll",
"lib/netstandard2.0/AWSSDK.S3.pdb",
"lib/netstandard2.0/AWSSDK.S3.xml",
"tools/install.ps1",
"tools/uninstall.ps1"
]
},
"AWSSDK.SecurityToken/3.7.100.14": {
"sha512": "dGCVuVo0CFUKWW85W8YENO+aREf8sCBDjvGbnNvxJuNW4Ss+brEU9ltHhq2KfZze2VUNK1/wygbPG1bmbpyXEw==",
"type": "package",
@ -13658,6 +13701,7 @@
},
"projectFileDependencyGroups": {
"net7.0": [
"AWSSDK.S3 >= 3.7.103.35",
"BMA.EHR.Core >= 1.0.0",
"BMA.EHR.Extensions >= 1.0.1",
"CoreAdmin >= 2.7.0",
@ -13696,20 +13740,33 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "D:\\Develop\\Source\\BMA-EHR-Recruit-Service\\BMA.EHR.Recruit.Service.csproj",
"projectName": "BMA.EHR.Recruit.Service",
"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\\",
=======
"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"
@ -13735,6 +13792,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, )"
@ -13873,7 +13934,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
}
}
}