Used VSSDK to publish to the marketplace.

reduckted · Dec 19, 2021 · 9581049 · 9581049
1 parent b200985
commit 9581049
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 57 deletions.
diff --git a/.github/workflows/publish-vs2022.yml b/.github/workflows/publish-vs2022.yml
@@ -0,0 +1,22 @@
+name: Publish Visual Studio 2022 Extension
+
+on: workflow_dispatch
+
+jobs:
+    publish-visual-studio:
+        runs-on: windows-2022
+
+        env:
+            Configuration: Release
+            DeployExtension: false
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+
+            - name: Setup MSBuild
+              uses: microsoft/[email protected]
+
+            - name: Publish
+              working-directory: ./visual-studio
+              run: msbuild /t:PublishToMarketplace /Restore /v:Minimal /p:Configuration=Release /p:PersonalAccessToken=${{ secrets.PUBLISHER_TOKEN }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,27 +26,27 @@ jobs:
                   PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
               run: node_modules/.bin/vsce publish -p $PUBLISHER_TOKEN
 
-    publish-visual-studio:
-        runs-on: windows-2022
-
-        env:
-            Configuration: Release
-            DeployExtension: false
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Setup MSBuild
-              uses: microsoft/[email protected]
-
-            - name: Build
-              working-directory: ./visual-studio
-              run: msbuild /t:Rebuild /Restore /v:Minimal
-
-            - name: Publish
-              uses: cezarypiatek/[email protected]
-              with:
-                  extension-file: visual-studio\source\GitWebLinks\bin\Release\GitWebLinks.vsix
-                  publish-manifest-file: visual-studio\publish.json
-                  personal-access-code: ${{ secrets.PUBLISHER_TOKEN }}
+    # publish-visual-studio:
+    #     runs-on: windows-2022
+
+    #     env:
+    #         Configuration: Release
+    #         DeployExtension: false
+
+    #     steps:
+    #         - name: Checkout
+    #           uses: actions/checkout@v2
+
+    #         - name: Setup MSBuild
+    #           uses: microsoft/[email protected]
+
+    #         - name: Build
+    #           working-directory: ./visual-studio
+    #           run: msbuild /t:Rebuild /Restore /v:Minimal
+
+    #         - name: Publish
+    #           uses: cezarypiatek/[email protected]
+    #           with:
+    #               extension-file: visual-studio\source\GitWebLinks\bin\Release\GitWebLinks.vsix
+    #               publish-manifest-file: visual-studio\publish.json
+    #               personal-access-code: ${{ secrets.PUBLISHER_TOKEN }}
diff --git a/build/set-version.ps1 b/build/set-version.ps1
@@ -43,6 +43,7 @@ try {
 }
 
 Write-Host "Updating Visual Studio extension..."
+# Set the version in the props file.
 $manifestFileName = Join-Path $root -ChildPath "visual-studio/source/GitWebLinks/source.extension.vsixmanifest"
 $manifest = New-Object -TypeName System.Xml.XmlDocument
 $manifest.PreserveWhitespace = $true
@@ -52,9 +53,16 @@ $identity = Select-Xml -Xml $manifest -XPath "/x:PackageManifest/x:Metadata/x:Id
 ([System.Xml.XmlElement]$identity.Node).SetAttribute("Version", $new.ToString())
 $manifest.Save($manifestFileName)
 
+# Set the version in the manifest's generated code-behind file.
 $codeFileName = Join-Path -Path $root -ChildPath "visual-studio/source/GitWebLinks/source.extension.cs"
 $code = Get-Content -Path $codeFileName -Raw
 $code = $code -replace "public const string Version = `"[\d.]+`";", "public const string Version = `"$($new.ToString())`";"
 Set-Content -Path $codeFileName -Value $code -NoNewLine
 
+# Set the version in the assembly info.
+$assemblyInfoFileName = Join-Path -Path $root -ChildPath "visual-studio/source/GitWebLinks/Properties/AssemblyInfo.cs"
+$assemblyInfo = Get-Content -Path $assemblyInfoFileName -Raw
+$assemblyInfo = $assemblyInfo -replace "Version\(`"[\d.]+`"\)", "Version(`"$($new.ToString()).0`")"
+Set-Content -Path $assemblyInfoFileName -Value $assemblyInfo -NoNewLine
+
 Write-Host "Done"
diff --git a/visual-studio/build/PublishToMarketplace.targets b/visual-studio/build/PublishToMarketplace.targets
@@ -0,0 +1,31 @@
+<Project>
+    <ItemGroup>
+        <PackageReference Update="Microsoft.VSSDK.BuildTools">
+            <GeneratePathProperty>true</GeneratePathProperty>
+        </PackageReference>
+    </ItemGroup>
+
+    <Target Name="PublishToMarketplace" DependsOnTargets="Rebuild">
+        <Message Text="Publishing extension to the marketplace..." Importance="high"/>
+
+        <Error 
+            Condition="'$(Configuration)' != 'Release'"
+            Text="The configuration must be 'Release' when publishing to the marketplace."
+            />
+
+        <PropertyGroup>
+            <VsixPublisher>$(PkgMicrosoft_VSSDK_BuildTools)\tools\vssdk\bin\VsixPublisher.exe</VsixPublisher>
+            <PublishManifestFileName>$(MSBuildThisFileDirectory)..\publish.json</PublishManifestFileName>
+            <ExtensionFileName>$(ProjectDir)$(TargetVsixContainer)</ExtensionFileName>
+        </PropertyGroup>
+
+        <Exec 
+            Command="$(VsixPublisher) publish -personalAccessToken $(PersonalAccessToken) -payload $(ExtensionFileName) -publishManifest $(PublishManifestFileName)"
+            StandardOutputImportance="high"
+            StandardErrorImportance="high"
+            LogStandardErrorAsError="true"
+            />
+
+        <Message Text="Finished publishing." Importance="high"/>
+    </Target>
+</Project>
diff --git a/visual-studio/build/SetVsixVersion.targets b/visual-studio/build/SetVsixVersion.targets
diff --git a/visual-studio/source/GitWebLinks/GitWebLinks.csproj b/visual-studio/source/GitWebLinks/GitWebLinks.csproj
@@ -254,5 +254,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\SetVsixVersion.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\PublishToMarketplace.targets" />
 </Project>
diff --git a/visual-studio/source/GitWebLinks/Properties/AssemblyInfo.cs b/visual-studio/source/GitWebLinks/Properties/AssemblyInfo.cs
@@ -13,6 +13,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.6.1.0")]
+[assembly: AssemblyFileVersion("2.6.1.0")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]