Merge pull request #26 from RWS/Main_VSExtension

Make UpdateHintPath work with all program files variables
RWS · May 20, 2022 · 1c8e3bb · 1c8e3bb
2 parents c7de304 + 1bdb103
commit 1c8e3bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/TemplatesVSIX/Trados/Patches/ReferencePatch.cs b/TemplatesVSIX/Trados/Patches/ReferencePatch.cs
@@ -30,10 +30,8 @@ public void PatchPackages(IPackagesConfig packageConfig)
 
         private void UpdateHintPath(IReference reference)
         {
-            reference.HintPath = Regex.Replace(
-                reference.HintPath,
-                @"(\(ProgramFiles\)\\SDL\\SDL Trados Studio\\)Studio\d{1,2}",
-                @"(MSBuildProgramFiles32)\Trados\Trados Studio\Studio" + _newVersion);
+            reference.HintPath =
+                $@"$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio{_newVersion}\{reference.Include.Name}.dll";
 
             reference.DeleteElement("Private");
             reference.DeleteElement("SpecificVersion");

diff --git a/TemplatesVSIX/source.extension.vsixmanifest b/TemplatesVSIX/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="3D390539-4A5C-4A0E-AAF8-2BCD8EA83FF1" Version="17.0" Language="en-US" Publisher="RWS" />
+        <Identity Id="3D390539-4A5C-4A0E-AAF8-2BCD8EA83FF1" Version="17.0.01" Language="en-US" Publisher="RWS" />
         <DisplayName>Trados Studio 17 templates for Visual Studio 2022</DisplayName>
         <Description xml:space="preserve">Visual Studio templates for  Trados Studio 17 Copyright © 2011 - 2022 SDL as part of the RWS Holdings Plc group of companies ("RWS Group")</Description>
         <MoreInfo>http://appstore.sdl.com/language/developers</MoreInfo>