Fixing bug for VS2022 options page not working when no solution open. (…

…#1410) closes #1407
belav · Dec 20, 2024 · 5cf6488 · 5cf6488
1 parent 3c6f9ce
commit 5cf6488
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 19 deletions.
diff --git a/Shell/PublishVS.psm1 b/Shell/PublishVS.psm1
@@ -7,6 +7,14 @@ function CSH-PublishVS {
     $repositoryRoot = Join-Path $PSScriptRoot ".."
     $vsRoot = Join-Path $repositoryRoot "/Src/CSharpier.VisualStudio"
 
+    $msbuild = "C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\msbuild.exe"
+
+    & $msbuild $vsRoot\CSharpier.VisualStudio.sln -p:Configuration=Release
+
+    if ($LASTEXITCODE -ne 0) {
+        return
+    }
+
     $vsixPath = "C:\Program Files\Microsoft Visual Studio\2022\Professional\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe"
 
     & $vsixPath publish `

diff --git a/Src/CSharpier.VisualStudio/CONTRIBUTING.md b/Src/CSharpier.VisualStudio/CONTRIBUTING.md
@@ -7,7 +7,6 @@ Uninstalling both csharpier and csharpier 2019 from the test instance and restar
 Publishing
 - Update version in BOTH files at CSharpier.VisualStudio[2019]/source.extension.vsixmanifest
 - Update ChangeLog.md
-- build solution in release (can this happen via command line?)
 - use cli
   - CSH-PublishVS [AccessToken] 
 - old way

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudio/CSharpier.VisualStudio.csproj b/Src/CSharpier.VisualStudio/CSharpier.VisualStudio/CSharpier.VisualStudio.csproj
@@ -76,8 +76,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.6.36389" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.6.2164">
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.12.40392" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudio/source.extension.vsixmanifest b/Src/CSharpier.VisualStudio/CSharpier.VisualStudio/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="83d6b6a0-9e25-4034-80f3-38445d8a8837" Version="1.9.0" Language="en-US" Publisher="CSharpier" />
+        <Identity Id="83d6b6a0-9e25-4034-80f3-38445d8a8837" Version="1.9.1" Language="en-US" Publisher="CSharpier" />
         <DisplayName>CSharpier</DisplayName>
         <Description xml:space="preserve">CSharpier is an opinionated code formatter for c#. It uses Roslyn to parse your code and re-prints it using its own rules.</Description>
         <MoreInfo>https://github.com/belav/csharpier</MoreInfo>

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudio2019/CSharpier.VisualStudio2019.csproj b/Src/CSharpier.VisualStudio/CSharpier.VisualStudio2019/CSharpier.VisualStudio2019.csproj
@@ -38,6 +38,7 @@
     <DefineConstants>TRACE;DEBUG;DEV16</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DeployExtension>False</DeployExtension>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -46,6 +47,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DeployExtension>False</DeployExtension>
   </PropertyGroup>
   <ItemGroup>
     <None Include="source.extension.vsixmanifest">
@@ -76,8 +78,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.11.35" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.10.31321.278" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.11.69" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudio2019/source.extension.vsixmanifest b/Src/CSharpier.VisualStudio/CSharpier.VisualStudio2019/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="edd8b38c-baa1-46c6-b82e-1da7a0ba597b" Version="1.9.0" Language="en-US" Publisher="CSharpier" />
+        <Identity Id="edd8b38c-baa1-46c6-b82e-1da7a0ba597b" Version="1.9.1" Language="en-US" Publisher="CSharpier" />
         <DisplayName>CSharpier 2019</DisplayName>
         <Description xml:space="preserve">CSharpier is an opinionated code formatter for c#. It uses Roslyn to parse your code and re-prints it using its own rules.</Description>
         <MoreInfo>https://github.com/belav/csharpier</MoreInfo>

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierOptions.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierOptions.cs
@@ -60,7 +60,7 @@ protected void LoadFrom(CSharpierOptions newInstance)
             ThreadHelper.JoinableTaskFactory
         );
 
-        private static FileSystemWatcher _hotReloadWatcher;
+        private static FileSystemWatcher? hotReloadWatcher;
 
         public static CSharpierOptions Instance
         {
@@ -83,7 +83,7 @@ private static async Task<CSharpierOptions> CreateAsync()
 
         public void Load()
         {
-            ThreadHelper.JoinableTaskFactory.Run(LoadAsync);
+            ThreadHelper.JoinableTaskFactory.Run(this.LoadAsync);
         }
 
         private async Task LoadAsync()
@@ -140,7 +140,7 @@ await LoadOptionsFromFile(
 
         public void Save()
         {
-            ThreadHelper.JoinableTaskFactory.Run(SaveAsync);
+            ThreadHelper.JoinableTaskFactory.Run(this.SaveAsync);
         }
 
         public async Task SaveAsync()
@@ -204,6 +204,7 @@ await SaveOptions(
 
         private static async Task<string?> GetSolutionOptionsFileNameAsync()
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
 #pragma warning disable VSSDK006
             var solution =
                 await AsyncServiceProvider.GlobalProvider.GetServiceAsync(typeof(SVsSolution))
@@ -212,16 +213,20 @@ await AsyncServiceProvider.GlobalProvider.GetServiceAsync(typeof(SVsSolution))
             solution!.GetSolutionInfo(out _, out _, out var userOptsFile);
 
             return userOptsFile != null
-                ? Path.Combine(Path.GetDirectoryName(userOptsFile), "csharpier.json")
+                ? Path.Combine(Path.GetDirectoryName(userOptsFile)!, "csharpier.json")
                 : null;
         }
 
         private static async Task InitializeHotReloadWatcherAsync()
         {
-            string filePath = await GetSolutionOptionsFileNameAsync();
+            var filePath = await GetSolutionOptionsFileNameAsync();
+            if (filePath is null)
+            {
+                return;
+            }
 
-            _hotReloadWatcher = new FileSystemWatcher(
-                Path.GetDirectoryName(filePath),
+            hotReloadWatcher = new FileSystemWatcher(
+                Path.GetDirectoryName(filePath)!,
                 Path.GetFileName(filePath)
             );
 
@@ -236,11 +241,11 @@ static void OnFileChanged(object sender, FileSystemEventArgs e)
 #pragma warning restore
             }
 
-            _hotReloadWatcher.Changed += OnFileChanged;
-            _hotReloadWatcher.Created += OnFileChanged;
-            _hotReloadWatcher.Renamed += OnFileChanged;
+            hotReloadWatcher.Changed += OnFileChanged;
+            hotReloadWatcher.Created += OnFileChanged;
+            hotReloadWatcher.Renamed += OnFileChanged;
 
-            _hotReloadWatcher.EnableRaisingEvents = true;
+            hotReloadWatcher.EnableRaisingEvents = true;
         }
 
         private class OptionsDto

diff --git a/Src/CSharpier.VisualStudio/ChangeLog.md b/Src/CSharpier.VisualStudio/ChangeLog.md
@@ -1,4 +1,7 @@
-## [1.9.0]
+## [1.9.1]
+- Fix bug if you open CSharpier options page without a solution loaded in VisualStudio
+
+## [1.9.0]
 - Configuration will hot reload: changes to `.vs/$(SolutionName)/v17/csharpier.json` will trigger a reload of the configuration in an opened Visual Studio instance.
 
 ## [1.8.0]