fix vsix versionning + missing icon (#36)

MrLuje · May 11, 2021 · 1298d04 · 1298d04
1 parent 8ee1c76
commit 1298d04
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/vs-commitizen/source.extension.vsixmanifest b/vs-commitizen/source.extension.vsixmanifest
@@ -1,31 +1,32 @@
 <?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="vs_commitizen.993809C6-9E90-4438-954E-ECE9D9E80E9B" Version="1.0.0.101" Language="en-US" Publisher="MrLuje" />
-        <DisplayName>VsCommitizen</DisplayName>
-        <Description xml:space="preserve">This extension adds commitizen support.</Description>
-        <MoreInfo>https://github.com/MrLuje/vs-commitizen</MoreInfo>
-        <Icon>Resources\Git_icon.png</Icon>
-        <Tags>git;commitizen;changelog;conventional-changelog</Tags>
-        <Preview>true</Preview>
-    </Metadata>
-    <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,17.0]" />
-        <InstallationTarget Version="[14.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
-        <InstallationTarget Version="[14.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
-    </Installation>
-    <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-        <Dependency d:Source="Installed" Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" Version="[14.0,17.0)" />
-    </Dependencies>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.8.27729.1,17.0)" DisplayName="Visual Studio core editor" />
-    </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|" 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|" TargetVersion="[16.0,17.0)" />
-    </Assets>
+  <Metadata>
+    <Identity Id="vs_commitizen.993809C6-9E90-4438-954E-ECE9D9E80E9B" Version="1.0.0.0" Language="en-US" Publisher="MrLuje" />
+    <!--CI changes the version, DO NOT CHANGE -->
+    <DisplayName>VsCommitizen</DisplayName>
+    <Description xml:space="preserve">This extension adds commitizen support.</Description>
+    <MoreInfo>https://github.com/MrLuje/vs-commitizen</MoreInfo>
+    <Icon>Resources\Git_icon.png</Icon>
+    <Tags>git;commitizen;changelog;conventional-changelog</Tags>
+    <Preview>true</Preview>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,17.0]" />
+    <InstallationTarget Version="[14.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[14.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    <Dependency d:Source="Installed" Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" Version="[14.0,17.0)" />
+  </Dependencies>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.8.27729.1,17.0)" DisplayName="Visual Studio core editor" />
+  </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|" 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|" TargetVersion="[16.0,17.0)" />
+  </Assets>
 </PackageManifest>
diff --git a/vs-commitizen/vs-commitizen.csproj b/vs-commitizen/vs-commitizen.csproj
@@ -88,10 +88,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\Git_icon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Content Include="Resources\Git_icon.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
-    </Resource>
+    </Content>
     <Resource Include="Resources\Git_vsicon.png" />
     <Resource Include="Resources\Open_6529.png" />
     <Resource Include="Resources\ToolWindow1Command.png" />