diff --git a/.gitignore b/.gitignore index 81fe9ae..c934bae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ /.vs/JMEAgentSystem/config/applicationhost.config /.vs/JMEAgentSystem/v16/.suo -/API/API.csproj /API/bin/Debug/API.dll /API/bin/Debug/API.pdb /API/bin/Debug/Common.dll @@ -557,7 +556,6 @@ /Common/obj/Debug/Common.dll /Common/obj/Debug/Common.pdb /Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache -/JMEAgentSystem.sln /JMEAgentSystem/bin/Business.dll /JMEAgentSystem/bin/Business.pdb /JMEAgentSystem/bin/Common.dll diff --git a/.vs/JMEAgentSystem/v16/TestStore/0/000.testlog b/.vs/JMEAgentSystem/v16/TestStore/0/000.testlog new file mode 100644 index 0000000..4b0c912 Binary files /dev/null and b/.vs/JMEAgentSystem/v16/TestStore/0/000.testlog differ diff --git a/.vs/JMEAgentSystem/v16/TestStore/0/testlog.manifest b/.vs/JMEAgentSystem/v16/TestStore/0/testlog.manifest new file mode 100644 index 0000000..e92ede2 Binary files /dev/null and b/.vs/JMEAgentSystem/v16/TestStore/0/testlog.manifest differ diff --git a/Business/bin/Debug/Repository.dll b/Business/bin/Debug/Repository.dll index e7a3d4a..da546a0 100644 Binary files a/Business/bin/Debug/Repository.dll and b/Business/bin/Debug/Repository.dll differ diff --git a/Business/bin/Debug/Repository.pdb b/Business/bin/Debug/Repository.pdb index 276c2e2..904606d 100644 Binary files a/Business/bin/Debug/Repository.pdb and b/Business/bin/Debug/Repository.pdb differ diff --git a/Business/obj/Debug/Business.csproj.CoreCompileInputs.cache b/Business/obj/Debug/Business.csproj.CoreCompileInputs.cache index 4c295e4..eec9a69 100644 --- a/Business/obj/Debug/Business.csproj.CoreCompileInputs.cache +++ b/Business/obj/Debug/Business.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b22bcc85d9679d57062ea2aa39ca08bbb582f25a +da07f6758244d471e97edb1e72de3c9c3705929b diff --git a/Business/obj/Debug/Business.csproj.FileListAbsolute.txt b/Business/obj/Debug/Business.csproj.FileListAbsolute.txt index 498844b..d52b813 100644 --- a/Business/obj/Debug/Business.csproj.FileListAbsolute.txt +++ b/Business/obj/Debug/Business.csproj.FileListAbsolute.txt @@ -58,3 +58,4 @@ E:\#JME-JAPAN\12. Agent_Login\Business\obj\Debug\Business.csproj.CoreCompileInpu 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 diff --git a/JMEAgentSystem/app.config b/JMEAgentSystem/app.config new file mode 100644 index 0000000..eb62e88 --- /dev/null +++ b/JMEAgentSystem/app.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/JMEAgentSystem/bin/JMEAgentSystem.dll b/JMEAgentSystem/bin/JMEAgentSystem.dll index 01acd9f..b491207 100644 Binary files a/JMEAgentSystem/bin/JMEAgentSystem.dll and b/JMEAgentSystem/bin/JMEAgentSystem.dll differ diff --git a/JMEAgentSystem/bin/JMEAgentSystem.pdb b/JMEAgentSystem/bin/JMEAgentSystem.pdb index e300923..a5ed3fd 100644 Binary files a/JMEAgentSystem/bin/JMEAgentSystem.pdb and b/JMEAgentSystem/bin/JMEAgentSystem.pdb differ diff --git a/JMEAgentSystem/bin/Repository.dll b/JMEAgentSystem/bin/Repository.dll index e7a3d4a..da546a0 100644 Binary files a/JMEAgentSystem/bin/Repository.dll and b/JMEAgentSystem/bin/Repository.dll differ diff --git a/JMEAgentSystem/bin/Repository.pdb b/JMEAgentSystem/bin/Repository.pdb index 276c2e2..904606d 100644 Binary files a/JMEAgentSystem/bin/Repository.pdb and b/JMEAgentSystem/bin/Repository.pdb differ diff --git a/JMEAgentSystem/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/JMEAgentSystem/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 165c230..f5e894a 100644 Binary files a/JMEAgentSystem/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/JMEAgentSystem/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/JMEAgentSystem/obj/Debug/JMEAgentSystem.dll b/JMEAgentSystem/obj/Debug/JMEAgentSystem.dll index 01acd9f..b491207 100644 Binary files a/JMEAgentSystem/obj/Debug/JMEAgentSystem.dll and b/JMEAgentSystem/obj/Debug/JMEAgentSystem.dll differ diff --git a/JMEAgentSystem/obj/Debug/JMEAgentSystem.pdb b/JMEAgentSystem/obj/Debug/JMEAgentSystem.pdb index e300923..a5ed3fd 100644 Binary files a/JMEAgentSystem/obj/Debug/JMEAgentSystem.pdb and b/JMEAgentSystem/obj/Debug/JMEAgentSystem.pdb differ diff --git a/Repository/bin/Debug/Repository.dll b/Repository/bin/Debug/Repository.dll index e7a3d4a..da546a0 100644 Binary files a/Repository/bin/Debug/Repository.dll and b/Repository/bin/Debug/Repository.dll differ diff --git a/Repository/bin/Debug/Repository.pdb b/Repository/bin/Debug/Repository.pdb index 276c2e2..904606d 100644 Binary files a/Repository/bin/Debug/Repository.pdb and b/Repository/bin/Debug/Repository.pdb differ diff --git a/Repository/obj/Debug/Repository.csproj.CoreCompileInputs.cache b/Repository/obj/Debug/Repository.csproj.CoreCompileInputs.cache index a92a1f2..6b0ab4f 100644 --- a/Repository/obj/Debug/Repository.csproj.CoreCompileInputs.cache +++ b/Repository/obj/Debug/Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4be122ccd1bb5f97aa37e3b5aafe2729269f5949 +ca84c5f48d720dd34b85967c092737ef02f3855a diff --git a/Repository/obj/Debug/Repository.csproj.FileListAbsolute.txt b/Repository/obj/Debug/Repository.csproj.FileListAbsolute.txt index d0ab8c6..6fbe7e4 100644 --- a/Repository/obj/Debug/Repository.csproj.FileListAbsolute.txt +++ b/Repository/obj/Debug/Repository.csproj.FileListAbsolute.txt @@ -36,3 +36,4 @@ E:\#JME-JAPAN\12. Agent_Login\Repository\obj\Debug\Repository.csproj.CoreCompile 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 diff --git a/Repository/obj/Debug/Repository.dll b/Repository/obj/Debug/Repository.dll index e7a3d4a..da546a0 100644 Binary files a/Repository/obj/Debug/Repository.dll and b/Repository/obj/Debug/Repository.dll differ diff --git a/Repository/obj/Debug/Repository.pdb b/Repository/obj/Debug/Repository.pdb index 276c2e2..904606d 100644 Binary files a/Repository/obj/Debug/Repository.pdb and b/Repository/obj/Debug/Repository.pdb differ diff --git a/packages/WebGrease.1.5.2/.signature.p7s b/packages/WebGrease.1.5.2/.signature.p7s new file mode 100644 index 0000000..567db87 Binary files /dev/null and b/packages/WebGrease.1.5.2/.signature.p7s differ diff --git a/packages/WebGrease.1.5.2/WebGrease.1.5.2.nupkg b/packages/WebGrease.1.5.2/WebGrease.1.5.2.nupkg new file mode 100644 index 0000000..3dad091 Binary files /dev/null and b/packages/WebGrease.1.5.2/WebGrease.1.5.2.nupkg differ diff --git a/packages/WebGrease.1.5.2/lib/WebGrease.dll b/packages/WebGrease.1.5.2/lib/WebGrease.dll new file mode 100644 index 0000000..1d308f8 Binary files /dev/null and b/packages/WebGrease.1.5.2/lib/WebGrease.dll differ diff --git a/packages/WebGrease.1.5.2/tools/WG.exe b/packages/WebGrease.1.5.2/tools/WG.exe new file mode 100644 index 0000000..c6120a9 Binary files /dev/null and b/packages/WebGrease.1.5.2/tools/WG.exe differ diff --git a/packages/WebGrease.1.5.2/tools/install.ps1 b/packages/WebGrease.1.5.2/tools/install.ps1 new file mode 100644 index 0000000..df7a527 --- /dev/null +++ b/packages/WebGrease.1.5.2/tools/install.ps1 @@ -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 +} diff --git a/packages/WebGrease.1.5.2/tools/uninstall.ps1 b/packages/WebGrease.1.5.2/tools/uninstall.ps1 new file mode 100644 index 0000000..99dec62 --- /dev/null +++ b/packages/WebGrease.1.5.2/tools/uninstall.ps1 @@ -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 +}