Removed support for Visual Studio 2019.

reduckted · Dec 24, 2021 · 8546463 · 8546463
1 parent a11a685
commit 8546463
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,8 @@ name: Continuous Integration
 on:
     push:
         branches:
-            - master
+            - "**"
+
         tags-ignore:
             - "**"
 
@@ -12,7 +13,7 @@ on:
 
 jobs:
     build:
-        runs-on: windows-latest
+        runs-on: windows-2022
 
         env:
             Configuration: Release
@@ -24,8 +25,6 @@ jobs:
 
             - name: Setup MSBuild
               uses: microsoft/[email protected]
-              with:
-                  vs-version: "[16.9,16.10)"
 
             - name: Build
               run: msbuild /t:Rebuild /Restore /v:Minimal

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
     publish:
-        runs-on: windows-latest
+        runs-on: windows-2022
 
         env:
             Configuration: Release
@@ -18,18 +18,6 @@ jobs:
 
             - name: Setup MSBuild
               uses: microsoft/[email protected]
-              with:
-                  vs-version: "[16.9,16.10)"
-
-            - name: Build
-              run: msbuild /t:Rebuild /Restore /v:Minimal
-
-            - name: Test
-              run: msbuild tests/ProjectFilter.UnitTests /t:Test /v:Minimal
 
             - name: Publish
-              uses: cezarypiatek/[email protected]
-              with:
-                  extension-file: source\ProjectFilter\bin\Release\ProjectFilter.vsix
-                  publish-manifest-file: publish.json
-                  personal-access-code: ${{ secrets.PUBLISHER_TOKEN }}
+              run: msbuild source/ProjectFilter/ProjectFilter.csproj /t:PublishToMarketplace /Restore /v:Minimal /p:PersonalAccessToken=${{ secrets.PUBLISHER_TOKEN }}
diff --git a/ProjectFilter.sln b/ProjectFilter.sln
@@ -1,15 +1,35 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30225.117
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.31911.260
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectFilter", "source\ProjectFilter\ProjectFilter.csproj", "{38D81205-16DE-4064-8997-2F1484A7309C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "source", "source", "{EF75E5C6-8BFF-4F7A-95FA-62185AFD4F8F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D9DDC553-BAF0-4629-990D-01A7E6484F12}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectFilter.UnitTests", "tests\ProjectFilter.UnitTests\ProjectFilter.UnitTests.csproj", "{721A6D73-B256-4495-A5DF-428943B63940}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectFilter.UnitTests", "tests\ProjectFilter.UnitTests\ProjectFilter.UnitTests.csproj", "{721A6D73-B256-4495-A5DF-428943B63940}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{10892EE3-E000-490A-ADCE-63ED679EB7FF}"
+	ProjectSection(SolutionItems) = preProject
+		CHANGELOG.md = CHANGELOG.md
+		nuget.config = nuget.config
+		build\PublishToMarketplace.targets = build\PublishToMarketplace.targets
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{8C622692-8DB9-4633-B05C-D51B146E3C0E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{F5194B30-0E46-4787-B097-91D30733FF57}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\ci.yml = .github\workflows\ci.yml
+		.github\workflows\publish.yml = .github\workflows\publish.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{079B72C9-D06A-4C15-A8D0-3A4283902361}"
+	ProjectSection(SolutionItems) = preProject
+		build\PublishToMarketplace.targets = build\PublishToMarketplace.targets
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -32,6 +52,9 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{38D81205-16DE-4064-8997-2F1484A7309C} = {EF75E5C6-8BFF-4F7A-95FA-62185AFD4F8F}
 		{721A6D73-B256-4495-A5DF-428943B63940} = {D9DDC553-BAF0-4629-990D-01A7E6484F12}
+		{8C622692-8DB9-4633-B05C-D51B146E3C0E} = {10892EE3-E000-490A-ADCE-63ED679EB7FF}
+		{F5194B30-0E46-4787-B097-91D30733FF57} = {8C622692-8DB9-4633-B05C-D51B146E3C0E}
+		{079B72C9-D06A-4C15-A8D0-3A4283902361} = {10892EE3-E000-490A-ADCE-63ED679EB7FF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CBDB8F23-C340-4B01-8476-7E2A0DAABDBC}

diff --git a/README.md b/README.md
@@ -1,11 +1,13 @@
 # Project Filter
 
-A Visual Studio extension to quickly load and unload projects. Perfect for large solutions.
+A Visual Studio 2022 extension to quickly load and unload projects. Perfect for large solutions.
 
 ## Installation
 
 Get the extension from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=reduckted.ProjectFilter), or search for "Project Filter" in Visual Studio's _Manage Extensions_ dialog.
 
+:information_source: A version for Visual Studio 2019 can be found [here](https://github.com/reduckted/ProjectFilter/releases/tag/1.1.1).
+
 ## How To Use
 
 Once the extension is installed, a _Filter Projects_ button will be shown in Solution Explorer. That button will open the _Project Filter_ dialog. Simply tick on the projects that you want loaded and untick the projects that you want unloaded, then click _OK_. You can also choose to load all project dependencies of the projects that are loaded.

diff --git a/build/PublishToMarketplace.targets b/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/source/ProjectFilter/ProjectFilter.csproj b/source/ProjectFilter/ProjectFilter.csproj
@@ -147,5 +147,6 @@
 
     <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
     <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
+    <Import Project="$(MSBuildThisFileDirectory)..\..\build\PublishToMarketplace.targets" />
 
 </Project>
diff --git a/source/ProjectFilter/source.extension.vsixmanifest b/source/ProjectFilter/source.extension.vsixmanifest
@@ -8,13 +8,12 @@
         <Icon>Resources\Icon.png</Icon>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" 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.5,)" />
-    </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />