From b169b7e2771f92c726d641593b4ac50526dc67c2 Mon Sep 17 00:00:00 2001 From: Mitch Capper Date: Tue, 14 Mar 2023 00:07:47 -0700 Subject: [PATCH 1/2] vs2022 support and updated tooling --- .editorconfig | 170 ++++++++++++++++++ JustMyCodeToggle.sln | 29 +-- .../Tvl.VisualStudio.JustMyCodeToggle.csproj | 104 ++++++----- .../source.extension.vsixmanifest | 48 ++--- 4 files changed, 267 insertions(+), 84 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..cfd039e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,170 @@ +# NOTE: Requires **VS2019 16.3** or later + +# Rules for JustMyCodeToggle +# Description: Code analysis rules for JustMyCodeToggle. + +# Code files +[*.{cs,vb}] + + +dotnet_diagnostic.CA1001.severity = warning + +dotnet_diagnostic.CA1009.severity = warning + +dotnet_diagnostic.CA1016.severity = warning + +dotnet_diagnostic.CA1033.severity = warning + +dotnet_diagnostic.CA1049.severity = warning + +dotnet_diagnostic.CA1060.severity = warning + +dotnet_diagnostic.CA1061.severity = warning + +dotnet_diagnostic.CA1063.severity = warning + +dotnet_diagnostic.CA1065.severity = warning + +dotnet_diagnostic.CA1301.severity = warning + +dotnet_diagnostic.CA1400.severity = warning + +dotnet_diagnostic.CA1401.severity = warning + +dotnet_diagnostic.CA1403.severity = warning + +dotnet_diagnostic.CA1404.severity = warning + +dotnet_diagnostic.CA1405.severity = warning + +dotnet_diagnostic.CA1410.severity = warning + +dotnet_diagnostic.CA1415.severity = warning + +dotnet_diagnostic.CA1821.severity = warning + +dotnet_diagnostic.CA1900.severity = warning + +dotnet_diagnostic.CA1901.severity = warning + +dotnet_diagnostic.CA2002.severity = warning + +dotnet_diagnostic.CA2100.severity = warning + +dotnet_diagnostic.CA2101.severity = warning + +dotnet_diagnostic.CA2108.severity = warning + +dotnet_diagnostic.CA2111.severity = warning + +dotnet_diagnostic.CA2112.severity = warning + +dotnet_diagnostic.CA2114.severity = warning + +dotnet_diagnostic.CA2116.severity = warning + +dotnet_diagnostic.CA2117.severity = warning + +dotnet_diagnostic.CA2122.severity = warning + +dotnet_diagnostic.CA2123.severity = warning + +dotnet_diagnostic.CA2124.severity = warning + +dotnet_diagnostic.CA2126.severity = warning + +dotnet_diagnostic.CA2131.severity = warning + +dotnet_diagnostic.CA2132.severity = warning + +dotnet_diagnostic.CA2133.severity = warning + +dotnet_diagnostic.CA2134.severity = warning + +dotnet_diagnostic.CA2137.severity = warning + +dotnet_diagnostic.CA2138.severity = warning + +dotnet_diagnostic.CA2140.severity = warning + +dotnet_diagnostic.CA2141.severity = warning + +dotnet_diagnostic.CA2146.severity = warning + +dotnet_diagnostic.CA2147.severity = warning + +dotnet_diagnostic.CA2149.severity = warning + +dotnet_diagnostic.CA2200.severity = warning + +dotnet_diagnostic.CA2202.severity = warning + +dotnet_diagnostic.CA2207.severity = warning + +dotnet_diagnostic.CA2212.severity = warning + +dotnet_diagnostic.CA2213.severity = warning + +dotnet_diagnostic.CA2214.severity = warning + +dotnet_diagnostic.CA2216.severity = warning + +dotnet_diagnostic.CA2220.severity = warning + +dotnet_diagnostic.CA2229.severity = warning + +dotnet_diagnostic.CA2231.severity = warning + +dotnet_diagnostic.CA2232.severity = warning + +dotnet_diagnostic.CA2235.severity = warning + +dotnet_diagnostic.CA2236.severity = warning + +dotnet_diagnostic.CA2237.severity = warning + +dotnet_diagnostic.CA2238.severity = warning + +dotnet_diagnostic.CA2240.severity = warning + +dotnet_diagnostic.CA2241.severity = warning + +dotnet_diagnostic.CA2242.severity = warning + +dotnet_diagnostic.CS1573.severity = silent + +dotnet_diagnostic.CS1591.severity = silent + +dotnet_diagnostic.CS1712.severity = silent + +# IDE0003 duplicates functionality provided by SX1101 +dotnet_diagnostic.IDE0003.severity = none + +dotnet_diagnostic.SA1101.severity = none + +# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2275 +dotnet_diagnostic.SA1139.severity = none + +dotnet_diagnostic.SA1202.severity = none + +dotnet_diagnostic.SA1204.severity = none + +dotnet_diagnostic.SA1309.severity = none + +dotnet_diagnostic.SA1412.severity = warning + +dotnet_diagnostic.SA1600.severity = none + +dotnet_diagnostic.SA1601.severity = none + +dotnet_diagnostic.SA1602.severity = none + +dotnet_diagnostic.SA1611.severity = none + +dotnet_diagnostic.SA1615.severity = none + +dotnet_diagnostic.SX1101.severity = warning + +dotnet_diagnostic.SX1309.severity = warning + +dotnet_diagnostic.SX1309S.severity = warning diff --git a/JustMyCodeToggle.sln b/JustMyCodeToggle.sln index 69854fb..1834bf0 100644 --- a/JustMyCodeToggle.sln +++ b/JustMyCodeToggle.sln @@ -1,29 +1,32 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.12 -MinimumVisualStudioVersion = 15.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{05CB4485-3F59-4189-96D8-F046221EC9CE}" - ProjectSection(SolutionItems) = preProject - .gitattributes = .gitattributes - .gitignore = .gitignore - appveyor.yml = appveyor.yml - LICENSE.txt = LICENSE.txt - README.md = README.md - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tvl.VisualStudio.JustMyCodeToggle", "Tvl.VisualStudio.JustMyCodeToggle\Tvl.VisualStudio.JustMyCodeToggle.csproj", "{10CAD392-E083-41EB-92C9-B5F3142FA9F8}" +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33417.168 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tvl.VisualStudio.JustMyCodeToggle", "Tvl.VisualStudio.JustMyCodeToggle\Tvl.VisualStudio.JustMyCodeToggle.csproj", "{10CAD392-E083-41EB-92C9-B5F3142FA9F8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|arm64 = Debug|arm64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|arm64 = Release|arm64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|arm64.ActiveCfg = Debug|arm64 + {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|arm64.Build.0 = Debug|arm64 + {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|x86.ActiveCfg = Debug|x86 + {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|x86.Build.0 = Debug|x86 {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|Any CPU.Build.0 = Release|Any CPU + {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|arm64.ActiveCfg = Release|arm64 + {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|arm64.Build.0 = Release|arm64 + {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|x86.ActiveCfg = Release|x86 + {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Tvl.VisualStudio.JustMyCodeToggle/Tvl.VisualStudio.JustMyCodeToggle.csproj b/Tvl.VisualStudio.JustMyCodeToggle/Tvl.VisualStudio.JustMyCodeToggle.csproj index 729399a..5f50d23 100644 --- a/Tvl.VisualStudio.JustMyCodeToggle/Tvl.VisualStudio.JustMyCodeToggle.csproj +++ b/Tvl.VisualStudio.JustMyCodeToggle/Tvl.VisualStudio.JustMyCodeToggle.csproj @@ -1,94 +1,102 @@  - - - + - net45 - + 17.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + Debug + AnyCPU + 2.0 + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + v4.7.2 + Properties Adds the Just My Code command button to Visual Studio. Tunnel Vision Laboratories, LLC Copyright © Sam Harwell 2017 - 1.3.0.0 - 1.3.0.0 - 1.3.0-dev - + 1.4.0.0 + 1.4.0.0 + 1.4.0-dev + {10CAD392-E083-41EB-92C9-B5F3142FA9F8} + Library true true true false false true - false - - true - SharedKey.snk + true - - - - False - - - true - - - - full + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 - - + pdbonly - true + true + bin\Release\ + TRACE + prompt + 4 - true - $(MSBuildThisFileDirectory)..\JustMyCodeToggle.ruleset + + + AnyCPU - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + - - - - - + + Designer + - - - + - LICENSE.txt true - 1000 Designer - VSPackage.resources true - - - - - - + + + + \ No newline at end of file diff --git a/Tvl.VisualStudio.JustMyCodeToggle/source.extension.vsixmanifest b/Tvl.VisualStudio.JustMyCodeToggle/source.extension.vsixmanifest index 80a4a5e..c124e8e 100644 --- a/Tvl.VisualStudio.JustMyCodeToggle/source.extension.vsixmanifest +++ b/Tvl.VisualStudio.JustMyCodeToggle/source.extension.vsixmanifest @@ -1,25 +1,27 @@ - + - - - Just My Code Toggle - Adds the Just My Code command button to Visual Studio. - https://github.com/tunnelvisionlabs/JustMyCodeToggle - LICENSE.txt - - - https://github.com/tunnelvisionlabs/JustMyCodeToggle/releases/latest - - - debugging, just my code - - - - - - - - - - + + + Just My Code Toggle + Adds the Just My Code command button to Visual Studio. + https://github.com/tunnelvisionlabs/JustMyCodeToggle + LICENSE.txt + + + https://github.com/tunnelvisionlabs/JustMyCodeToggle/releases/latest + + + debugging, just my code + + + + amd64 + + + + + + + + From 9256bf3e4a0e84a39a8e2abfb0f553b75b93a399 Mon Sep 17 00:00:00 2001 From: Mitch Capper Date: Thu, 16 Mar 2023 11:49:29 -0700 Subject: [PATCH 2/2] Updated to new csproj format --- JustMyCodeToggle.sln | 12 -- .../Properties/AssemblyInfo.cs | 12 -- .../Tvl.VisualStudio.JustMyCodeToggle.csproj | 172 ++++++++---------- 3 files changed, 71 insertions(+), 125 deletions(-) delete mode 100644 Tvl.VisualStudio.JustMyCodeToggle/Properties/AssemblyInfo.cs diff --git a/JustMyCodeToggle.sln b/JustMyCodeToggle.sln index 1834bf0..f4b2121 100644 --- a/JustMyCodeToggle.sln +++ b/JustMyCodeToggle.sln @@ -8,25 +8,13 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|arm64 = Debug|arm64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|arm64 = Release|arm64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|arm64.ActiveCfg = Debug|arm64 - {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|arm64.Build.0 = Debug|arm64 - {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|x86.ActiveCfg = Debug|x86 - {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Debug|x86.Build.0 = Debug|x86 {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|Any CPU.Build.0 = Release|Any CPU - {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|arm64.ActiveCfg = Release|arm64 - {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|arm64.Build.0 = Release|arm64 - {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|x86.ActiveCfg = Release|x86 - {10CAD392-E083-41EB-92C9-B5F3142FA9F8}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Tvl.VisualStudio.JustMyCodeToggle/Properties/AssemblyInfo.cs b/Tvl.VisualStudio.JustMyCodeToggle/Properties/AssemblyInfo.cs deleted file mode 100644 index e16d031..0000000 --- a/Tvl.VisualStudio.JustMyCodeToggle/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved. -// Licensed under the MIT License. See LICENSE.txt in the project root for license information. - -using System; -using System.Runtime.InteropServices; - -[assembly: CLSCompliant(false)] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] diff --git a/Tvl.VisualStudio.JustMyCodeToggle/Tvl.VisualStudio.JustMyCodeToggle.csproj b/Tvl.VisualStudio.JustMyCodeToggle/Tvl.VisualStudio.JustMyCodeToggle.csproj index 5f50d23..6bdfd1c 100644 --- a/Tvl.VisualStudio.JustMyCodeToggle/Tvl.VisualStudio.JustMyCodeToggle.csproj +++ b/Tvl.VisualStudio.JustMyCodeToggle/Tvl.VisualStudio.JustMyCodeToggle.csproj @@ -1,102 +1,72 @@ - - - - 17.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - Debug - AnyCPU - 2.0 - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - v4.7.2 - Properties - Adds the Just My Code command button to Visual Studio. - Tunnel Vision Laboratories, LLC - Copyright © Sam Harwell 2017 - 1.4.0.0 - 1.4.0.0 - 1.4.0-dev - {10CAD392-E083-41EB-92C9-B5F3142FA9F8} - Library - true - true - true - false - false - true - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - true - - - AnyCPU - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - Designer - - - - - - - - LICENSE.txt - true - - - - - 1000 - Designer - - - - - VSPackage.resources - true - - - - - + + + net472 + + Properties + Adds the Just My Code command button to Visual Studio. + Tunnel Vision Laboratories, LLC + Copyright © Sam Harwell 2017 + 1.4.0.0 + 1.4.0.0 + 1.4.0-dev + true + true + true + false + false + true + true + obj + obj/int + True + + + $(MSBuildThisFileDirectory)..\JustMyCodeToggle.ruleset + + + pdbonly + true + + + + False + + + true + + + + + + + + + + + + + + Designer + + + + + LICENSE.txt + true + + + + + 1000 + Designer + + + + + VSPackage.resources + true + + + + \ No newline at end of file