Fix changes view (#31)

* proper target version to mef components

* fix: only load proper version of assemblies

Previous version was loading all versions (2015, 2017, 2019) due to assembly scanning, now we only pick the proper one

* fix: "open local config" not enabled if file doesn't exist

Author: MrLuje

vs-commitizen.Settings/ExtensionRegistry.cs

@@ -14,7 +14,22 @@ public ExtensionRegistry()
             this.Scan(i =>
             {
                 i.TheCallingAssembly();
-                i.AssembliesFromPath(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location));
+                i.Assembly("vs-commitizen");
+
+                var productMajorPart = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileVersionInfo.ProductMajorPart;
+                if (productMajorPart == 14)
+                {
+                    i.Assembly("vs-commitizen.vs2015");
+                }
+                else if (productMajorPart == 15)
+                {
+                    i.Assembly("vs-commitizen.vs2017");
+                }
+                else if (productMajorPart >= 16)
+                {
+                    i.Assembly("vs-commitizen.vs2019");
+                }
+
                 i.WithDefaultConventions();
                 i.LookForRegistries();
             });

vs-commitizen.Tests/MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:vs_commitizen.Tests"
-        xmlns:vs="clr-namespace:vs_commitizen.vs;assembly=vs-commitizen.vs2017" x:Class="vs_commitizen.Tests.MainWindow"
+        xmlns:vs="clr-namespace:vs_commitizen.vs;assembly=vs-commitizen.vs2019" x:Class="vs_commitizen.Tests.MainWindow"
         mc:Ignorable="d"
         Title="MainWindow" Height="650" Width="525">
     <Grid>

vs-commitizen.Tests/vs-commitizen.Tests.csproj

@@ -54,7 +54,7 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.TeamFoundation.Controls">
-      <HintPath>..\lib\vs2017\Microsoft.TeamFoundation.Controls.dll</HintPath>
+      <HintPath>..\lib\vs2019\Microsoft.TeamFoundation.Controls.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -93,9 +93,9 @@
       <Project>{1952D753-DC63-46B4-9561-7D84CF215D6A}</Project>
       <Name>vs-commitizen.Settings</Name>
     </ProjectReference>
-    <ProjectReference Include="..\vs-commitizen.vs2017\vs-commitizen.vs2017.csproj">
-      <Project>{93748016-5aa8-4d74-887e-64959d8d2496}</Project>
-      <Name>vs-commitizen.vs2017</Name>
+    <ProjectReference Include="..\vs-commitizen.vs2019\vs-commitizen.vs2019.csproj">
+      <Project>{c6ecb6ff-d446-499c-b3cc-db5cb6455db7}</Project>
+      <Name>vs-commitizen.vs2019</Name>
     </ProjectReference>
     <ProjectReference Include="..\vs-commitizen\vs-commitizen.csproj">
       <Project>{8382bf18-b8bc-4c54-9826-8d9d20cd868d}</Project>

vs-commitizen.vs2019/vs-commitizen.vs2019.csproj

@@ -33,16 +33,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.TeamFoundation.Controls, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.TeamFoundation.Controls">
       <HintPath>..\lib\vs2019\Microsoft.TeamFoundation.Controls.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.TeamFoundation.Git.Controls">
       <HintPath>..\lib\vs2019\Microsoft.TeamFoundation.Git.Controls.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.TeamFoundation.Git.Provider">
       <HintPath>..\lib\vs2019\Microsoft.TeamFoundation.Git.Provider.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

vs-commitizen/Infrastructure/ConfigFileProvider.cs

@@ -112,10 +112,7 @@ public async Task<string> TryGetLocalConfigAsync()
             var (isRepositoryLoaded, repositoryPath) = await GetLocalPathAsync(); // await GetCurrentSolutionAsync();
             if (isRepositoryLoaded)
             {
-                var localConfigPath = Path.Combine(repositoryPath, CONFIGFILE_NAME);
-
-                if (this.fileAccessor.Exists(localConfigPath))
-                    return localConfigPath;
+                return Path.Combine(repositoryPath, CONFIGFILE_NAME);
             }
 
             return string.Empty;

vs-commitizen/source.extension.vsixmanifest

@@ -22,9 +22,9 @@
     </Prerequisites>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%.vs2015" Path="|vs-commitizen.vs2015|" />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%.vs2017" Path="|vs-commitizen.vs2017|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%.vs2015" Path="|vs-commitizen.vs2015|" TargetVersion="[14.0,15.0)" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%.vs2017" Path="|vs-commitizen.vs2017|" TargetVersion="[15.0,16.0)" />
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%.Settings" Path="|vs-commitizen.Settings|" />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%.vs2019" Path="|vs-commitizen.vs2019|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%.vs2019" Path="|vs-commitizen.vs2019|" TargetVersion="[16.0,17.0)" />
     </Assets>
 </PackageManifest>