Merge branch 'working' into develop
# Conflicts: # .vs/BMA.EHR.Recruit.Service/v17/.suo # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
This commit is contained in:
Suphonchai Phoonsawat
commit
1e9b168697
41 changed files with 8781 additions and 9755 deletions
|
|
@ -1,28 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="GetEFProjectMetadata">
|
||||
<MSBuild Condition=" '$(TargetFramework)' == '' "
|
||||
Projects="$(MSBuildProjectFile)"
|
||||
Targets="GetEFProjectMetadata"
|
||||
Properties="TargetFramework=$(TargetFrameworks.Split(';')[0]);EFProjectMetadataFile=$(EFProjectMetadataFile)" />
|
||||
<ItemGroup Condition=" '$(TargetFramework)' != '' ">
|
||||
<EFProjectMetadata Include="AssemblyName: $(AssemblyName)" />
|
||||
<EFProjectMetadata Include="Language: $(Language)" />
|
||||
<EFProjectMetadata Include="OutputPath: $(OutputPath)" />
|
||||
<EFProjectMetadata Include="Platform: $(Platform)" />
|
||||
<EFProjectMetadata Include="PlatformTarget: $(PlatformTarget)" />
|
||||
<EFProjectMetadata Include="ProjectAssetsFile: $(ProjectAssetsFile)" />
|
||||
<EFProjectMetadata Include="ProjectDir: $(ProjectDir)" />
|
||||
<EFProjectMetadata Include="RootNamespace: $(RootNamespace)" />
|
||||
<EFProjectMetadata Include="RuntimeFrameworkVersion: $(RuntimeFrameworkVersion)" />
|
||||
<EFProjectMetadata Include="TargetFileName: $(TargetFileName)" />
|
||||
<EFProjectMetadata Include="TargetFrameworkMoniker: $(TargetFrameworkMoniker)" />
|
||||
<EFProjectMetadata Include="Nullable: $(Nullable)" />
|
||||
<EFProjectMetadata Include="TargetFramework: $(TargetFramework)" />
|
||||
<EFProjectMetadata Include="TargetPlatformIdentifier: $(TargetPlatformIdentifier)" />
|
||||
</ItemGroup>
|
||||
<WriteLinesToFile Condition=" '$(TargetFramework)' != '' "
|
||||
File="$(EFProjectMetadataFile)"
|
||||
Lines="@(EFProjectMetadata)" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -110,6 +110,10 @@
|
|||
"target": "Package",
|
||||
"version": "[2.19.0, )"
|
||||
},
|
||||
"NEST": {
|
||||
"target": "Package",
|
||||
"version": "[7.17.5, )"
|
||||
},
|
||||
"Newtonsoft.Json": {
|
||||
"target": "Package",
|
||||
"version": "[13.0.3, )"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<Import Project="$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\7.0.0\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\7.0.0\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)sentry\3.29.1\buildTransitive\Sentry.targets" Condition="Exists('$(NuGetPackageRoot)sentry\3.29.1\buildTransitive\Sentry.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.visualstudio.azure.containers.tools.targets\1.17.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.visualstudio.azure.containers.tools.targets\1.17.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets')" />
|
||||
</ImportGroup>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<Import Project="$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\7.0.0\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\7.0.0\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)sentry\3.29.1\buildTransitive\Sentry.targets" Condition="Exists('$(NuGetPackageRoot)sentry\3.29.1\buildTransitive\Sentry.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.visualstudio.azure.containers.tools.targets\1.17.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.visualstudio.azure.containers.tools.targets\1.17.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets')" />
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -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+831e67604282eb3e82a74774be73ba99ec472e57")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6748d01aa46af106321ce776d114ca5b76e74bf2")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("BMA.EHR.Recruit.Service")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("BMA.EHR.Recruit.Service")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
46e58d4bbba0e23723a59aa64185ffde2dc0004dada1c8c5e7340999d46cc964
|
||||
18782c2453613fb6b79d879c5b0cf9b43fdf0fc4b8bacf291e009707682783b3
|
||||
|
|
|
|||
|
|
@ -1,23 +1,24 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("DotNetEd.CoreAdmin")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Microsoft.AspNetCore.Mvc.Versioning")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Microsoft.AspNetCore.OpenApi")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Mvc.Grid.Core")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.Annotations")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.SwaggerGen")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WatchDog")]
|
||||
|
||||
// Generated by the MSBuild WriteCodeFragment class.
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.42000
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("DotNetEd.CoreAdmin")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Microsoft.AspNetCore.Mvc.Versioning")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Microsoft.AspNetCore.OpenApi")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Mvc.Grid.Core")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.Annotations")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.SwaggerGen")]
|
||||
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("WatchDog")]
|
||||
|
||||
// Generated by the MSBuild WriteCodeFragment class.
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
118adb39fa17e550a6ea3f0884bcc470c472eff8c41b45c6866e270cec7ab054
|
||||
b3124fd4c4016491f5d30ffb74ef9ab034b453eddb7643416b841a217eb48e03
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
48b99599757630e72457bb87242ce14f53dc48b77c68e94f7d93523f2a74ffa8
|
||||
1ac8c898b4be5e4b0e3e5d4c2b884f5ff73ae58e10f6d08eb2faa4812afbfec0
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,7 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.42000
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
<Project>
|
||||
<Import Project="Microsoft.AspNetCore.StaticWebAssetEndpoints.props" />
|
||||
<Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
|
||||
<Project>
|
||||
<Import Project="Microsoft.AspNetCore.StaticWebAssetEndpoints.props" />
|
||||
<Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
|
||||
</Project>
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
<Project>
|
||||
<Import Project="..\build\BMA.EHR.Recruit.Service.props" />
|
||||
<Project>
|
||||
<Import Project="..\build\BMA.EHR.Recruit.Service.props" />
|
||||
</Project>
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
<Project>
|
||||
<Import Project="..\buildMultiTargeting\BMA.EHR.Recruit.Service.props" />
|
||||
<Project>
|
||||
<Import Project="..\buildMultiTargeting\BMA.EHR.Recruit.Service.props" />
|
||||
</Project>
|
||||
|
|
@ -2564,6 +2564,22 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"NEST/7.17.5": {
|
||||
"type": "package",
|
||||
"dependencies": {
|
||||
"Elasticsearch.Net": "7.17.5"
|
||||
},
|
||||
"compile": {
|
||||
"lib/netstandard2.0/Nest.dll": {
|
||||
"related": ".pdb;.xml"
|
||||
}
|
||||
},
|
||||
"runtime": {
|
||||
"lib/netstandard2.0/Nest.dll": {
|
||||
"related": ".pdb;.xml"
|
||||
}
|
||||
}
|
||||
},
|
||||
"NETStandard.Library/1.6.1": {
|
||||
"type": "package",
|
||||
"dependencies": {
|
||||
|
|
@ -8254,6 +8270,25 @@
|
|||
"mysqlconnector.nuspec"
|
||||
]
|
||||
},
|
||||
"NEST/7.17.5": {
|
||||
"sha512": "bo9UyuIoVRx4IUQiuC8ZrlZuvAXKIccernC7UUKukQCEmRq2eVIk+gubHlnMQljrP51q0mN4cjgy9vv5uZPkoA==",
|
||||
"type": "package",
|
||||
"path": "nest/7.17.5",
|
||||
"files": [
|
||||
".nupkg.metadata",
|
||||
".signature.p7s",
|
||||
"lib/net461/Nest.dll",
|
||||
"lib/net461/Nest.pdb",
|
||||
"lib/net461/Nest.xml",
|
||||
"lib/netstandard2.0/Nest.dll",
|
||||
"lib/netstandard2.0/Nest.pdb",
|
||||
"lib/netstandard2.0/Nest.xml",
|
||||
"license.txt",
|
||||
"nest.7.17.5.nupkg.sha512",
|
||||
"nest.nuspec",
|
||||
"nuget-icon.png"
|
||||
]
|
||||
},
|
||||
"NETStandard.Library/1.6.1": {
|
||||
"sha512": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==",
|
||||
"type": "package",
|
||||
|
|
@ -13675,6 +13710,7 @@
|
|||
"Microsoft.VisualStudio.Azure.Containers.Tools.Targets >= 1.17.0",
|
||||
"MongoDB.Driver >= 2.19.0",
|
||||
"MongoDB.Driver.GridFS >= 2.19.0",
|
||||
"NEST >= 7.17.5",
|
||||
"Newtonsoft.Json >= 13.0.3",
|
||||
"Pomelo.EntityFrameworkCore.MySql >= 7.0.0",
|
||||
"Pomelo.EntityFrameworkCore.MySql.Design >= 1.1.2",
|
||||
|
|
@ -13801,6 +13837,10 @@
|
|||
"target": "Package",
|
||||
"version": "[2.19.0, )"
|
||||
},
|
||||
"NEST": {
|
||||
"target": "Package",
|
||||
"version": "[7.17.5, )"
|
||||
},
|
||||
"Newtonsoft.Json": {
|
||||
"target": "Package",
|
||||
"version": "[13.0.3, )"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": 2,
|
||||
"dgSpecHash": "so4FDnKvBAM=",
|
||||
"dgSpecHash": "2b/aE3ltIAI=",
|
||||
"success": true,
|
||||
"projectFilePath": "D:\\Develop\\SourceCode\\hrms-api-recruit\\BMA.EHR.Recruit.Service.csproj",
|
||||
"expectedPackageFiles": [
|
||||
|
|
@ -149,6 +149,7 @@
|
|||
"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",
|
||||
"C:\\Users\\jack\\.nuget\\packages\\nest\\7.17.5\\nest.7.17.5.nupkg.sha512",
|
||||
"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",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue