Bump to1.1.2 (#139)

* Bump to 1.1.2 * Modify CI to handle publishing out of sync with CLI tooling.
WildernessLabs · Jul 23, 2023 · 4bbde8e · 4bbde8e
1 parent 384dbcd
commit 4bbde8e
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 16 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -1,10 +1,13 @@
 name: VS4Win Extension
+env:
+  IDE_TOOLS_RELEASE_VERSION: 1.1.2
 
 on:
   push:
     branches: [ main, develop ]
   pull_request:
     branches: [ main, develop ]
+
   workflow_dispatch:
 
 jobs:
@@ -18,7 +21,16 @@ jobs:
       with:
         path: main
 
-    - name: Checkout Meadow.CLI.Core side-by-side
+    - if: ${{ github.ref == 'refs/heads/main' }}
+      name: Checkout Meadow.CLI.Core side-by-side
+      uses: actions/checkout@v2
+      with:
+        repository: WildernessLabs/Meadow.CLI
+        path: Meadow.CLI
+        ref: main
+
+    - if: ${{ github.ref != 'refs/heads/main' }}
+      name: Checkout Meadow.CLI.Core side-by-side
       uses: actions/checkout@v2
       with:
         repository: WildernessLabs/Meadow.CLI
@@ -38,6 +50,13 @@ jobs:
     - name: Add MSBuild to Path
       uses: microsoft/[email protected]
 
+    - if: ${{ github.event_name == 'workflow_dispatch' }}
+      name: Update VS2019 Version Numbers
+      run: |
+        $content = Get-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest | Out-String
+        $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.IDE_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"'
+        $newcontent | Set-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest
+
     - name: Restore VS2019 dependencies
       run: msbuild main/VS_Meadow_Extension.2019.sln /t:Restore /p:Configuration=Release
 
@@ -50,13 +69,13 @@ jobs:
     - name: Upload VSIX Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.2019.vsix
+        name: Meadow.Win.VS2019.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
         path: 'main\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\*.vsix'
 
-#     - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-#       name: Publish VS2019 Extension
-#       run: |
-#         & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe" publish -payload "main\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\Meadow.2019.vsix" -publishManifest "main\publishManifest.json" -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}"
+    #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
+    #  name: Publish VS2019 Extension
+    #  run: |
+    #    & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe" publish -payload "vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\Meadow.2019.vsix" -publishManifest "vs-win\publishManifest.json" -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}"
 
   build-2022:
     runs-on: windows-2022
@@ -68,7 +87,16 @@ jobs:
       with:
         path: main
 
-    - name: Checkout Meadow.CLI.Core side-by-side
+    - if: ${{ github.ref == 'refs/heads/main' }}
+      name: Checkout Meadow.CLI.Core side-by-side
+      uses: actions/checkout@v2
+      with:
+        repository: WildernessLabs/Meadow.CLI
+        path: Meadow.CLI
+        ref: main
+
+    - if: ${{ github.ref != 'refs/heads/main' }}
+      name: Checkout Meadow.CLI.Core side-by-side
       uses: actions/checkout@v2
       with:
         repository: WildernessLabs/Meadow.CLI
@@ -79,8 +107,8 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          5.0.x
           6.0.x
+          7.0.x
 
     - name: Setup NuGet
       uses: NuGet/[email protected]
@@ -90,6 +118,13 @@ jobs:
       with:
         vs-version: '[17.0, 18.0)'
 
+    - if: ${{ github.event_name == 'workflow_dispatch' }}
+      name: Update VS2022 Version Numbers
+      run: |
+        $content = Get-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2022/source.extension.vsixmanifest | Out-String
+        $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.IDE_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"'
+        $newcontent | Set-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2022/source.extension.vsixmanifest
+
     - name: Restore VS2022 dependencies
       run: msbuild main/VS_Meadow_Extension.2022.sln /t:Restore /p:Configuration=Release
 
@@ -102,7 +137,7 @@ jobs:
     - name: Upload VSIX Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.2022.vsix
+        name: Meadow.Win.VS2022.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
         path: 'main\VS_Meadow_Extension\VS_Meadow_Extension.2022\bin\Release\*.vsix'
 
 #     - uses: actions/create-release@v1
@@ -113,7 +148,7 @@ jobs:
 #         tag_name: ${{ github.ref }}
 #         release_name: ${{ github.ref }}
 
-#     - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-#       name: Publish VS2022 Extension
-#       run: |
-#         & "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe" publish -payload "main\VS_Meadow_Extension\VS_Meadow_Extension.2022\bin\Release\Meadow.2022.vsix" -publishManifest "main\publishManifest.2022.json" -ignoreWarnings "None" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}"
+    - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
+      name: Publish VS2022 Extension
+      run: |
+        & "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe" publish -payload "vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2022\bin\Release\Meadow.2022.vsix" -publishManifest "vs-win\publishManifest.2022.json" -ignoreWarnings "None" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}"
diff --git a/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest b/VS_Meadow_Extension/VS_Meadow_Extension.2019/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="VS_Meadow_Extension.ProjectType..fe358059-9487-4fe7-a01a-4b67b8231321" Version="1.1.1" Language="en-US" Publisher="Wilderness Labs" />
+        <Identity Id="VS_Meadow_Extension.ProjectType..fe358059-9487-4fe7-a01a-4b67b8231321" Version="1.1.2" Language="en-US" Publisher="Wilderness Labs" />
         <DisplayName>VS 2019 Tools for Meadow</DisplayName>
         <Description xml:space="preserve">Tools for developing Meadow applications</Description>
         <Icon>wildernesslabs_icon.png</Icon>

diff --git a/VS_Meadow_Extension/VS_Meadow_Extension.2022/source.extension.vsixmanifest b/VS_Meadow_Extension/VS_Meadow_Extension.2022/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="VS_Meadow_Extension.2022.d5eb772d-2173-4795-b60b-67929a9bf12d" Version="1.1.1" Language="en-US" Publisher="Wilderness Labs" />
+        <Identity Id="VS_Meadow_Extension.2022.d5eb772d-2173-4795-b60b-67929a9bf12d" Version="1.1.2" Language="en-US" Publisher="Wilderness Labs" />
         <DisplayName>VS 2022 Tools for Meadow</DisplayName>
         <Description xml:space="preserve">Tools for developing Meadow applications</Description>
         <Icon>wildernesslabs_icon.png</Icon>

diff --git a/VS_Meadow_Extension/VS_Meadow_Extension.Shared/Globals.cs b/VS_Meadow_Extension/VS_Meadow_Extension.Shared/Globals.cs
@@ -9,7 +9,7 @@ namespace Meadow
 {
     public static class Globals
     {
-        public const string AssemblyVersion = "1.1.1.0";
+        public const string AssemblyVersion = "1.1.2.0";
 
         public const string MeadowCapability = "Meadow";
 

diff --git a/overview.md b/overview.md
@@ -4,6 +4,10 @@ For step by step instructions on using this extension, [check out the tutorial](
 
 ## Release Notes
 
+### 1.1.2
+
+- Update spacing meadow.*.yaml to meet specs and sync with Meadow.Sdk templates.
+
 ### 1.1.1
 
 - Update spacing app.*.yaml to meet specs and sync with Meadow.Sdk templates.