Browse Source
Merge branch 'master' of http://202.166.220.79:3000/JME-JAPAN/AgentSystem
Merge branch 'master' of http://202.166.220.79:3000/JME-JAPAN/AgentSystem
# Conflicts: # Business/bin/Debug/Repository.dll # Business/bin/Debug/Repository.pdb # JMEAgentSystem/bin/JMEAgentSystem.dll # JMEAgentSystem/bin/JMEAgentSystem.pdb # JMEAgentSystem/bin/Repository.dll # JMEAgentSystem/bin/Repository.pdb # Repository/bin/Debug/Repository.dll # Repository/bin/Debug/Repository.pdbmaster
shakun
1 year ago
33 changed files with 733 additions and 749 deletions
-
2.gitignore
-
BIN.vs/JMEAgentSystem/v16/TestStore/0/000.testlog
-
BIN.vs/JMEAgentSystem/v16/TestStore/0/testlog.manifest
-
1Business/obj/Debug/Business.csproj.CoreCompileInputs.cache
-
61Business/obj/Debug/Business.csproj.FileListAbsolute.txt
-
259JMEAgentSystem/Scripts/Customer/CustomerRegistration.js
-
11JMEAgentSystem/Scripts/Customer/Document.js
-
30JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js
-
458JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx
-
3JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs
-
8JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.designer.cs
-
2JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.cs
-
10JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx
-
11JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs
-
4JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs
-
70JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx
-
65JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs
-
276JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs
-
15JMEAgentSystem/app.config
-
BINJMEAgentSystem/obj/Debug/DesignTimeResolveAssemblyReferences.cache
-
BINJMEAgentSystem/obj/Debug/JMEAgentSystem.dll
-
BINJMEAgentSystem/obj/Debug/JMEAgentSystem.pdb
-
3Repository/Repository/OnlineCustomerDao/CustomerRepository.cs
-
1Repository/obj/Debug/Repository.csproj.CoreCompileInputs.cache
-
39Repository/obj/Debug/Repository.csproj.FileListAbsolute.txt
-
BINRepository/obj/Debug/Repository.dll
-
BINRepository/obj/Debug/Repository.pdb
-
BINpackages/WebGrease.1.5.2/.signature.p7s
-
BINpackages/WebGrease.1.5.2/WebGrease.1.5.2.nupkg
-
BINpackages/WebGrease.1.5.2/lib/WebGrease.dll
-
BINpackages/WebGrease.1.5.2/tools/WG.exe
-
90packages/WebGrease.1.5.2/tools/install.ps1
-
63packages/WebGrease.1.5.2/tools/uninstall.ps1
@ -0,0 +1 @@ |
|||
da07f6758244d471e97edb1e72de3c9c3705929b |
@ -0,0 +1,61 @@ |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Business.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Business.pdb |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Autofac.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Common.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Newtonsoft.Json.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Repository.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Common.pdb |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Repository.pdb |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Autofac.pdb |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Autofac.xml |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\bin\Debug\Newtonsoft.Json.xml |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\obj\Debug\Business.csprojAssemblyReference.cache |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\obj\Debug\Business.csproj.CoreCompileInputs.cache |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\obj\Debug\Business.csproj.CopyComplete |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\obj\Debug\Business.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Business\obj\Debug\Business.pdb |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Business.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Business.pdb |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Autofac.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Common.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Newtonsoft.Json.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Repository.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Common.pdb |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Repository.pdb |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Autofac.pdb |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Autofac.xml |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\bin\Debug\Newtonsoft.Json.xml |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\obj\Debug\Business.csprojAssemblyReference.cache |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\obj\Debug\Business.csproj.CoreCompileInputs.cache |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\obj\Debug\Business.csproj.CopyComplete |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\obj\Debug\Business.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Business\obj\Debug\Business.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Business.dll.config |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Business.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Business.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Antlr3.Runtime.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Autofac.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Common.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Microsoft.Web.Infrastructure.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Newtonsoft.Json.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Repository.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\System.Web.Optimization.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Select.HtmlToPdf.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Common.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Common.dll.config |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Repository.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Repository.dll.config |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Antlr3.Runtime.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Autofac.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Autofac.xml |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Newtonsoft.Json.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Newtonsoft.Json.xml |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\System.Web.Optimization.xml |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Select.HtmlToPdf.xml |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\Select.Html.dep |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\obj\Debug\Business.csproj.AssemblyReference.cache |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\obj\Debug\Business.csproj.CoreCompileInputs.cache |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\obj\Debug\Business.csproj.CopyComplete |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\obj\Debug\Business.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\obj\Debug\Business.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Business\bin\Debug\WebGrease.dll |
@ -0,0 +1,15 @@ |
|||
<?xml version="1.0" encoding="utf-8"?> |
|||
<configuration> |
|||
<runtime> |
|||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> |
|||
<dependentAssembly> |
|||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> |
|||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> |
|||
</dependentAssembly> |
|||
<dependentAssembly> |
|||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" /> |
|||
<bindingRedirect oldVersion="0.0.0.0-1.5.1.25624" newVersion="1.5.1.25624" /> |
|||
</dependentAssembly> |
|||
</assemblyBinding> |
|||
</runtime> |
|||
</configuration> |
@ -0,0 +1 @@ |
|||
ca84c5f48d720dd34b85967c092737ef02f3855a |
@ -0,0 +1,39 @@ |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\bin\Debug\Repository.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\bin\Debug\Repository.pdb |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\bin\Debug\Common.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\bin\Debug\Newtonsoft.Json.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\bin\Debug\Common.pdb |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\bin\Debug\Newtonsoft.Json.xml |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\obj\Debug\Repository.csprojAssemblyReference.cache |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\obj\Debug\Repository.csproj.CoreCompileInputs.cache |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\obj\Debug\Repository.csproj.CopyComplete |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\obj\Debug\Repository.dll |
|||
H:\JME\JME_Remit_Dev\JMEAgentSystem\Repository\obj\Debug\Repository.pdb |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\bin\Debug\Repository.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\bin\Debug\Repository.pdb |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\bin\Debug\Common.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\bin\Debug\Newtonsoft.Json.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\bin\Debug\Common.pdb |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\bin\Debug\Newtonsoft.Json.xml |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\obj\Debug\Repository.csprojAssemblyReference.cache |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\obj\Debug\Repository.csproj.CoreCompileInputs.cache |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\obj\Debug\Repository.csproj.CopyComplete |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\obj\Debug\Repository.dll |
|||
H:\JME\JME_Remit_Live\JMEAgentSystem\Repository\obj\Debug\Repository.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Repository.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Repository.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Common.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Newtonsoft.Json.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Select.HtmlToPdf.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Common.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Common.dll.config |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Newtonsoft.Json.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Newtonsoft.Json.xml |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Select.HtmlToPdf.xml |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\Select.Html.dep |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\obj\Debug\Repository.csproj.AssemblyReference.cache |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\obj\Debug\Repository.csproj.CoreCompileInputs.cache |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\obj\Debug\Repository.csproj.CopyComplete |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\obj\Debug\Repository.dll |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\obj\Debug\Repository.pdb |
|||
E:\#JME-JAPAN\12. Agent_Login\Repository\bin\Debug\WebGrease.dll |
@ -0,0 +1,90 @@ |
|||
param($installPath, $toolsPath, $package, $project) |
|||
|
|||
# Return a relative path with reference to root as Uri object |
|||
# $rootPath - root path |
|||
# $relativePath - relative path |
|||
# $appendToRelativePath - Optional parameter. If provided will be appended to relative Path using Path.Combine() |
|||
Function GetRelativeUri($rootPath, $relativePath, $appendToRelativePath) |
|||
{ |
|||
if($rootPath -eq $null) |
|||
{ |
|||
return $null |
|||
} |
|||
|
|||
if($relativePath -eq $null) |
|||
{ |
|||
return $null |
|||
} |
|||
|
|||
$rootUri = new-object system.Uri($rootPath) |
|||
$targetPath = $relativePath |
|||
|
|||
# If appendToRelativePath is provided then use it |
|||
if($appendToRelativePath -ne $null) |
|||
{ |
|||
$targetPath = [io.path]::Combine($relativePath, $appendToRelativePath) |
|||
} |
|||
|
|||
$targetUri = new-object system.Uri($targetPath) |
|||
$relativeUri = $rootUri.MakeRelativeUri($targetUri) |
|||
|
|||
return $relativeUri |
|||
} |
|||
|
|||
# Visual Studio execution done via NuGet Package Manager |
|||
Function VSExecution($installPath, $package, $project) |
|||
{ |
|||
#$project.DTE.ExecuteCommand("File.SaveAll", [system.string]::Empty) |
|||
|
|||
# Get the msbuild version of the project and add the import |
|||
$msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1 |
|||
|
|||
# add a property for us to be able to reference the path where the package was installed |
|||
$relativePackageUri = GetRelativeUri $project.FullName $installPath"\lib" |
|||
|
|||
$msbuild.Xml.AddProperty("WebGreaseLibPath", $relativePackageUri.ToString().Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)) |
|||
|
|||
# save the project |
|||
$project.Save() |
|||
} |
|||
|
|||
# Command line execution done by any external tool (For example, NuGetUpdater) |
|||
# $package - package id |
|||
# $project - parameter value is path to Project file in this case. |
|||
Function CommandLineExecution($installPath, $package, $project) |
|||
{ |
|||
[Reflection.Assembly]::LoadWithPartialName("Microsoft.Build") |
|||
[Reflection.Assembly]::LoadWithPartialName("System.Xml") |
|||
[Reflection.Assembly]::LoadWithPartialName("System.Xml.Linq") |
|||
|
|||
# Get the msbuild version of the project and add the import |
|||
$projXDoc = [System.Xml.Linq.XDocument]::Load($project) |
|||
|
|||
$defaultNameSpace = $projXDoc.Root.GetDefaultNamespace() |
|||
|
|||
$propertyGroup = [System.Xml.Linq.XName]::Get("PropertyGroup", $defaultNameSpace.NamespaceName) |
|||
$webGreaseBuildLocation = [System.Xml.Linq.XName]::Get("WebGreaseLibPath", $defaultNameSpace.NamespaceName) |
|||
|
|||
# add a property for us to be able to reference the path where the package was installed |
|||
$relativePackageUri = GetRelativeUri $project.FullName $installPath"\lib" |
|||
|
|||
$propGroupElement = $projXDoc.Root.Elements($propertyGroup) | Select-Object -First 1 |
|||
IF ($propGroupElement -ne $null) |
|||
{ |
|||
$newElement = new-object System.Xml.Linq.XElement($webGreaseBuildLocation, $relativePackageUri.ToString().Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)) |
|||
$propGroupElement.Add($newElement) |
|||
} |
|||
|
|||
# save the project |
|||
$projXDoc.Save($project) |
|||
} |
|||
|
|||
|
|||
IF ($project -is [system.string]) |
|||
{ |
|||
CommandLineExecution $installPath $package $project |
|||
} |
|||
ELSE |
|||
{ |
|||
VSExecution $installPath $package $project |
|||
} |
@ -0,0 +1,63 @@ |
|||
param($installPath, $toolsPath, $package, $project) |
|||
|
|||
# Visual Studio execution done via NuGet Package Manager |
|||
Function VSExecution($toolsPath, $project) |
|||
{ |
|||
|
|||
|
|||
$project.DTE.ExecuteCommand("File.SaveAll", [system.string]::Empty) |
|||
|
|||
# Get the msbuild version of the project and add the import |
|||
$msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1 |
|||
|
|||
# now remove our property that points to this package path, "WebGreaseLibPath" |
|||
foreach ($property in $msbuild.Properties) |
|||
{ |
|||
if ($property.Name -eq "WebGreaseLibPath") |
|||
{ |
|||
$propertyToRemove = $property |
|||
} |
|||
} |
|||
|
|||
if ($propertyToRemove -ne $null) |
|||
{ |
|||
$propertyToRemove.Project.RemoveProperty($propertyToRemove) |
|||
$project.Save() |
|||
} |
|||
|
|||
$project.DTE.ExecuteCommand("File.SaveAll", [system.string]::Empty) |
|||
} |
|||
|
|||
# Command line execution done by any external tool (For example, NuGetUpdater) |
|||
# $project - parameter value is path to Project file in this case. |
|||
Function CommandLineExecution($toolsPath, $project) |
|||
{ |
|||
[Reflection.Assembly]::LoadWithPartialName("System.Xml") |
|||
[Reflection.Assembly]::LoadWithPartialName("System.Xml.Linq") |
|||
|
|||
|
|||
|
|||
$projXDoc = [System.Xml.Linq.XDocument]::Load($project) |
|||
$defaultNameSpace = $projXDoc.Root.GetDefaultNamespace() |
|||
$xmlReader = $projXDoc.CreateReader() |
|||
$namespaceManager = new-object System.Xml.XmlNamespaceManager($xmlReader.NameTable) |
|||
$namespaceManager.AddNamespace("my", $defaultNameSpace.NamespaceName) |
|||
|
|||
$msnRfPackageElement = [System.Xml.XPath.Extensions]::XPathSelectElement($projXDoc.Root, "//my:WebGreaseLibPath", $namespaceManager) |
|||
if($msnRfPackageElement -ne $null) |
|||
{ |
|||
$msnRfPackageElement.Remove() |
|||
} |
|||
|
|||
# save the project |
|||
$projXDoc.Save($project) |
|||
} |
|||
|
|||
IF ($project -is [system.string]) |
|||
{ |
|||
CommandLineExecution $toolsPath $project |
|||
} |
|||
ELSE |
|||
{ |
|||
VSExecution $toolsPath $project |
|||
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue