Merge pull request #183 from WildernessLabs/develop

Merge to main for 1.9.6 Release
WildernessLabs · Apr 4, 2024 · cb0d636 · cb0d636
2 parents 7c46a5c + 5959f7c
commit cb0d636
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -1,6 +1,6 @@
 name: VS4Win Extension
 env:
-  IDE_TOOLS_RELEASE_VERSION: 1.9.4
+  IDE_TOOLS_RELEASE_VERSION: 1.9.6
 
 on:
   push:
@@ -151,4 +151,4 @@ jobs:
     - 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 "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}}"
+        & "${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}}"
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.9.4" Language="en-US" Publisher="Wilderness Labs" />
+        <Identity Id="VS_Meadow_Extension.ProjectType..fe358059-9487-4fe7-a01a-4b67b8231321" Version="1.9.6" 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.9.4" Language="en-US" Publisher="Wilderness Labs" />
+        <Identity Id="VS_Meadow_Extension.2022.d5eb772d-2173-4795-b60b-67929a9bf12d" Version="1.9.6" 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/DeployProvider.cs b/VS_Meadow_Extension/VS_Meadow_Extension.Shared/DeployProvider.cs
@@ -31,14 +31,13 @@ internal class DeployProvider : IDeployProvider
         private ConfiguredProject configuredProject;
 
         const string MeadowSDKVersion = "Sdk=\"Meadow.Sdk/1.1.0\"";
-        private bool isDeploySupported = true;
+        private bool isDeploySupported = false;
 
         [ImportingConstructor]
         public DeployProvider(ConfiguredProject configuredProject)
         {
             this.configuredProject = configuredProject;
-            _ = Task.Run(async () => { isDeploySupported = await IsMeadowApp(); });
-
+            IsMeadowApp();
         }
 
         public async Task<bool> DeployMeadowProjectsAsync(CancellationToken cts, TextWriter outputPaneWriter)
@@ -57,12 +56,9 @@ public async Task<bool> DeployMeadowProjectsAsync(CancellationToken cts, TextWri
             var projFileContent = File.ReadAllText(filename);
             if (projFileContent.Contains(MeadowSDKVersion))
             {
-                if (await IsMeadowApp())
-                {
-                    await DeployOutputLogger?.ConnectTextWriter(outputPaneWriter);
+                await DeployOutputLogger?.ConnectTextWriter(outputPaneWriter);
 
-                    return await DeployMeadowAppAsync(cts, outputPaneWriter, filename);
-                }
+                return await DeployMeadowAppAsync(cts, outputPaneWriter, filename);
             }
 
             return false;
@@ -109,7 +105,8 @@ private static void DeployFailed()
 
         public async Task DeployAsync(CancellationToken cts, TextWriter outputPaneWriter)
         {
-            if (cts.IsCancellationRequested)
+            if (cts.IsCancellationRequested
+                || !await IsMeadowApp())
             {
                 return;
             }
@@ -186,10 +183,14 @@ private async Task<bool> IsMeadowApp()
             string assemblyName = await properties.GetEvaluatedPropertyValueAsync("AssemblyName");
             if (!string.IsNullOrEmpty(assemblyName) && assemblyName.Equals("App", StringComparison.OrdinalIgnoreCase))
             {
-                return true;
+                isDeploySupported = true;
+            }
+            else
+            {
+                isDeploySupported = false;
             }
 
-            return false;
+            return isDeploySupported;
         }
     }
 }
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.9.4.0";
+        public const string AssemblyVersion = "1.9.6.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.9.6
+
+- Do IsMeadowApp check earlier to avoid deployment of wrong project types
+
 ### 1.9.4
 
 - Fix for VS2022 v17.9.4 so that debugging works again.