From c2fddb62255558decb6a2c35206ea5f2aab44429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Henrique=20Guard=C3=A3o=20Gandarez?=
 <gandarez@gmail.com>
Date: Sat, 3 Feb 2024 10:33:42 -0300
Subject: [PATCH] Revert changes on vsix manifest file

---
 .github/workflows/on_push.yml       |  6 ++++++
 Dev16/publishManifest.json          | 32 +----------------------------
 Dev16/source.extension.vsixmanifest | 20 ++++++++++++++++++
 Dev17/publishManifest.json          | 16 +--------------
 Dev17/source.extension.vsixmanifest | 22 ++++++++++++++++++++
 5 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/on_push.yml b/.github/workflows/on_push.yml
index 677c17f..6e50820 100644
--- a/.github/workflows/on_push.yml
+++ b/.github/workflows/on_push.yml
@@ -73,6 +73,9 @@ jobs:
           (Get-Content -Path Dev16\publishManifest.json) |
             ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
               Set-Content -Path Dev16\publishManifest.json
+          (Get-Content -Path Dev16\source.extension.vsixmanifest) |
+              ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
+                Set-Content -Path Dev16\source.extension.vsixmanifest
           (Get-Content -Path Dev16\Properties\AssemblyInfo.cs) |
             ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
               Set-Content -Path Dev16\Properties\AssemblyInfo.cs
@@ -121,6 +124,9 @@ jobs:
           (Get-Content -Path Dev17\publishManifest.json) |
             ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
               Set-Content -Path Dev17\publishManifest.json
+          (Get-Content -Path Dev17\source.extension.vsixmanifest) |
+              ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
+                Set-Content -Path Dev17\source.extension.vsixmanifest
           (Get-Content -Path Dev17\Properties\AssemblyInfo.cs) |
             ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
               Set-Content -Path Dev17\Properties\AssemblyInfo.cs
diff --git a/Dev16/publishManifest.json b/Dev16/publishManifest.json
index 5ffab0a..1953547 100644
--- a/Dev16/publishManifest.json
+++ b/Dev16/publishManifest.json
@@ -7,37 +7,7 @@
         "description": "Metrics, insights, and time tracking automatically generated from your programming activity.",
         "tags": [ "Analytics", "Coding","Productivity", "Productivity Tool", "Time Tracking", "Timer", "Code Time", "Metrics", "Time Tracker", "Reports" ],
         "vsixId": "52d9c3ff-c893-408e-95e4-d7484ec7fa47",
-        "version": "1.0.0",
-        "installTargets": [
-            {
-                "sku": "Microsoft.VisualStudio.Community",
-                "version": "[15.0,17.0)"
-            },
-            {
-                "sku": "Microsoft.VisualStudio.Pro",
-                "version": "[15.0,17.0)"
-            },
-            {
-                "sku": "Microsoft.VisualStudio.Enterprise",
-                "version": "[15.0,17.0)"
-            },
-            {
-                "sku": "Microsoft.VisualStudio.IntegratedShell",
-                "version": "[15.0,17.0)"
-            },
-            {
-                "sku": "Microsoft.VisualStudio.Ultimate",
-                "version": "[15.0,17.0)"
-            },
-            {
-                "sku": "Microsoft.VisualStudio.Premium",
-                "version": "[15.0,17.0)"
-            },
-            {
-                "sku": "Microsoft.VisualStudio.VSLS",
-                "version": "[15.0,17.0)"
-            }
-        ]
+        "version": "1.0.0"
     },
 
     "overview": "OVERVIEW.md",
diff --git a/Dev16/source.extension.vsixmanifest b/Dev16/source.extension.vsixmanifest
index 5682c48..cde8155 100644
--- a/Dev16/source.extension.vsixmanifest
+++ b/Dev16/source.extension.vsixmanifest
@@ -1,5 +1,25 @@
 <?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 Publisher="WakaTime" Version="1.0.0" Id="52d9c3ff-c893-408e-95e4-d7484ec7fa47" Language="en-US" />
+		<DisplayName>WakaTime</DisplayName>
+		<Description xml:space="preserve">Metrics, insights, and time tracking automatically generated from your programming activity.</Description>
+		<MoreInfo>https://github.com/wakatime/visualstudio-wakatime</MoreInfo>
+		<License>LICENSE</License>
+		<Icon>Assets\wakatime-120.png</Icon>
+		<PreviewImage>Assets\dashboard.png</PreviewImage>
+	</Metadata>
+
+	<Installation>
+		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
+		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
+		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
+		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
+		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Ultimate" />
+		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Premium" />
+		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.VSLS" />
+	</Installation>
+
 	<Dependencies>
 		<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8,)" />
 		<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0,17.0)" />
diff --git a/Dev17/publishManifest.json b/Dev17/publishManifest.json
index e1be172..fd4b3cb 100644
--- a/Dev17/publishManifest.json
+++ b/Dev17/publishManifest.json
@@ -7,21 +7,7 @@
         "description": "Metrics, insights, and time tracking automatically generated from your programming activity.",
         "tags": [ "Analytics", "Coding","Productivity", "Productivity Tool", "Time Tracking", "Timer", "Code Time", "Metrics", "Time Tracker", "Reports" ],
         "vsixId": "41DB9DFA-9F21-45A4-B111-22FBD1C3AD94",
-        "version": "1.0.0",
-        "installTargets": [
-            {
-                "sku": "Microsoft.VisualStudio.Community",
-                "version": "[17.0,18.0)"
-            },
-            {
-                "sku": "Microsoft.VisualStudio.Pro",
-                "version": "[17.0,18.0)"
-            },
-            {
-                "sku": "Microsoft.VisualStudio.Enterprise",
-                "version": "[17.0,18.0)"
-            }
-        ]
+        "version": "1.0.0"
     },
 
     "overview": "OVERVIEW.md",
diff --git a/Dev17/source.extension.vsixmanifest b/Dev17/source.extension.vsixmanifest
index 974e887..4e3edc7 100644
--- a/Dev17/source.extension.vsixmanifest
+++ b/Dev17/source.extension.vsixmanifest
@@ -1,5 +1,27 @@
 <?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 Publisher="WakaTime" Version="1.0.0" Id="41DB9DFA-9F21-45A4-B111-22FBD1C3AD94" Language="en-US" />
+        <DisplayName>WakaTime</DisplayName>
+        <Description xml:space="preserve">Metrics, insights, and time tracking automatically generated from your programming activity.</Description>
+        <MoreInfo>https://github.com/wakatime/visualstudio-wakatime</MoreInfo>
+        <License>LICENSE</License>
+        <Icon>Assets\wakatime-120.png</Icon>
+        <PreviewImage>Assets\dashboard.png</PreviewImage>
+    </Metadata>
+
+    <Installation>
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+    </Installation>
+
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8,)" />
         <Dependency Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" d:Source="Installed" Version="[16.0,17.0)" />