Merge branch 'develop' into working
# Conflicts: # .vs/BMA.EHR.Recruit.Service/v17/.suo # obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig # obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache # obj/Debug/net7.0/Sentry.Attributes.cs # obj/project.assets.json # obj/project.nuget.cache
This commit is contained in:
commit
315ceb261a
8 changed files with 48 additions and 2 deletions
|
|
@ -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+996c08c9e8817c79b8bb546e8dcd2446e8650a74")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04a324bff2631f94ba4d5e6df817618812353c7c")]
|
||||
[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 @@
|
|||
6273544200a81281138b8799a4b9f6c09b687d02dd68279af5a973b09453ab1f
|
||||
c3d07eeb8270378e83e76975dc8c2133f5422a38fb6021b7d66d242f1ebbb676
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
is_global = true
|
||||
build_property.TargetFramework = net7.0
|
||||
build_property.TargetPlatformMinVersion =
|
||||
build_property.UsingMicrosoftNETSdkWeb = true
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = BMA.EHR.Recruit.Service
|
||||
build_property.RootNamespace = BMA.EHR.Recruit.Service
|
||||
build_property.ProjectDir = D:\Develop\SourceCode\hrms-api-recruit\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
build_property.RazorLangVersion = 7.0
|
||||
build_property.SupportLocalizedComponentNames =
|
||||
build_property.GenerateRazorMetadataSourceChecksumAttributes =
|
||||
build_property.MSBuildProjectDirectory = D:\Develop\SourceCode\hrms-api-recruit
|
||||
build_property._RazorSourceGeneratorDebug =
|
||||
build_property.EffectiveAnalysisLevelStyle = 7.0
|
||||
build_property.EnableCodeStyleSeverity =
|
||||
BIN
obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache
Normal file
BIN
obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache
Normal file
Binary file not shown.
|
|
@ -1,7 +1,10 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
<<<<<<< HEAD
|
||||
// Runtime Version:4.0.30319.42000
|
||||
=======
|
||||
>>>>>>> develop
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue