diff --git a/ScheMe/ScheMe.csproj b/ScheMe/ScheMe.csproj index 7845dce..c5a0848 100644 --- a/ScheMe/ScheMe.csproj +++ b/ScheMe/ScheMe.csproj @@ -19,7 +19,6 @@ - ..\packages\WebGrease.1.5.2\lib @@ -91,8 +90,9 @@ - - ..\packages\WebGrease.1.5.2\lib\WebGrease.dll + + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll + True diff --git a/ScheMe/Web.config b/ScheMe/Web.config index 85574e3..ae6a45d 100644 --- a/ScheMe/Web.config +++ b/ScheMe/Web.config @@ -137,7 +137,7 @@ - + diff --git a/ScheMe/bin/MedPred.dll b/ScheMe/bin/MedPred.dll index b2039c5..2114425 100644 Binary files a/ScheMe/bin/MedPred.dll and b/ScheMe/bin/MedPred.dll differ diff --git a/ScheMe/bin/MedPred.dll.config b/ScheMe/bin/MedPred.dll.config index 85574e3..ae6a45d 100644 --- a/ScheMe/bin/MedPred.dll.config +++ b/ScheMe/bin/MedPred.dll.config @@ -137,7 +137,7 @@ - + diff --git a/ScheMe/bin/MedPred_Data.dll b/ScheMe/bin/MedPred_Data.dll index 7b8b64e..4e89561 100644 Binary files a/ScheMe/bin/MedPred_Data.dll and b/ScheMe/bin/MedPred_Data.dll differ diff --git a/ScheMe/bin/SteamWare.dll b/ScheMe/bin/SteamWare.dll index b407afe..b93be1a 100644 Binary files a/ScheMe/bin/SteamWare.dll and b/ScheMe/bin/SteamWare.dll differ diff --git a/ScheMe/bin/WebGrease.dll b/ScheMe/bin/WebGrease.dll index 1d308f8..a6a80d3 100644 Binary files a/ScheMe/bin/WebGrease.dll and b/ScheMe/bin/WebGrease.dll differ diff --git a/ScheMe/packages.config b/ScheMe/packages.config index 0ee531f..33e0402 100644 --- a/ScheMe/packages.config +++ b/ScheMe/packages.config @@ -15,5 +15,5 @@ - + \ No newline at end of file diff --git a/ScheMe_Data/bin/Debug/MedPred_Data.dll b/ScheMe_Data/bin/Debug/MedPred_Data.dll index 7b8b64e..4e89561 100644 Binary files a/ScheMe_Data/bin/Debug/MedPred_Data.dll and b/ScheMe_Data/bin/Debug/MedPred_Data.dll differ diff --git a/ScheMe_Data/bin/Debug/SteamWare.dll b/ScheMe_Data/bin/Debug/SteamWare.dll index b407afe..b93be1a 100644 Binary files a/ScheMe_Data/bin/Debug/SteamWare.dll and b/ScheMe_Data/bin/Debug/SteamWare.dll differ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index bd27787..484f1c9 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll 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 deleted file mode 100644 index ce50bd5..0000000 Binary files a/packages/WebGrease.1.5.2/WebGrease.1.5.2.nupkg and /dev/null differ diff --git a/packages/WebGrease.1.5.2/lib/WebGrease.dll b/packages/WebGrease.1.5.2/lib/WebGrease.dll deleted file mode 100644 index 1d308f8..0000000 Binary files a/packages/WebGrease.1.5.2/lib/WebGrease.dll and /dev/null differ diff --git a/packages/WebGrease.1.5.2/tools/WG.exe b/packages/WebGrease.1.5.2/tools/WG.exe deleted file mode 100644 index c6120a9..0000000 Binary files a/packages/WebGrease.1.5.2/tools/WG.exe and /dev/null differ diff --git a/packages/WebGrease.1.5.2/tools/install.ps1 b/packages/WebGrease.1.5.2/tools/install.ps1 deleted file mode 100644 index df7a527..0000000 --- a/packages/WebGrease.1.5.2/tools/install.ps1 +++ /dev/null @@ -1,90 +0,0 @@ -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 deleted file mode 100644 index 99dec62..0000000 --- a/packages/WebGrease.1.5.2/tools/uninstall.ps1 +++ /dev/null @@ -1,63 +0,0 @@ -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 -} diff --git a/packages/WebGrease.1.6.0/WebGrease.1.6.0.nupkg b/packages/WebGrease.1.6.0/WebGrease.1.6.0.nupkg new file mode 100644 index 0000000..cb6d8ea Binary files /dev/null and b/packages/WebGrease.1.6.0/WebGrease.1.6.0.nupkg differ diff --git a/packages/WebGrease.1.6.0/lib/WebGrease.dll b/packages/WebGrease.1.6.0/lib/WebGrease.dll new file mode 100644 index 0000000..a6a80d3 Binary files /dev/null and b/packages/WebGrease.1.6.0/lib/WebGrease.dll differ diff --git a/packages/WebGrease.1.6.0/tools/WG.EXE b/packages/WebGrease.1.6.0/tools/WG.EXE new file mode 100644 index 0000000..139c5ec Binary files /dev/null and b/packages/WebGrease.1.6.0/tools/WG.EXE differ