Skip to content
This repository was archived by the owner on Aug 9, 2025. It is now read-only.

Commit 2bd7fdd

Browse files
t-johnsont-johnson
committed
Convert pacakges.config to PackageReference
Update Nuget packages retarget visxmanifest for VS2022 (note, new project guid!)
1 parent c91a3b1 commit 2bd7fdd

File tree

7 files changed

+59
-161
lines changed

7 files changed

+59
-161
lines changed

‎CPPCheckPlugin/CPPCheckPlugin.csproj‎

Lines changed: 28 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<AssemblyName>CppcheckPlugin</AssemblyName>
4545
<SignAssembly>True</SignAssembly>
4646
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
47-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
47+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
4848
</PropertyGroup>
4949
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
5050
<DebugSymbols>true</DebugSymbols>
@@ -65,110 +65,17 @@
6565
<RunCodeAnalysis>true</RunCodeAnalysis>
6666
</PropertyGroup>
6767
<ItemGroup>
68-
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
69-
<EmbedInteropTypes>False</EmbedInteropTypes>
70-
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
7368
<Reference Include="Microsoft.CSharp" />
74-
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.15.6.27740\lib\net46\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
76-
</Reference>
77-
<Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.VisualStudio.ImageCatalog.15.9.28307\lib\net45\Microsoft.VisualStudio.ImageCatalog.dll</HintPath>
79-
</Reference>
80-
<Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81-
<HintPath>..\packages\Microsoft.VisualStudio.Imaging.15.9.28307\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
82-
</Reference>
83-
<Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.14.3.26930\lib\net20\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll</HintPath>
85-
<EmbedInteropTypes>True</EmbedInteropTypes>
86-
</Reference>
87-
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
88-
<HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
89-
</Reference>
90-
<Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.15.0.15.9.28307\lib\net45\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
92-
</Reference>
93-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Framework.15.9.28307\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
95-
</Reference>
96-
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
97-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6072\lib\net11\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
98-
</Reference>
99-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30320\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
101-
<EmbedInteropTypes>True</EmbedInteropTypes>
102-
</Reference>
103-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
104-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61031\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
105-
<EmbedInteropTypes>True</EmbedInteropTypes>
106-
</Reference>
107-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
108-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30111\lib\net20\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
109-
<EmbedInteropTypes>True</EmbedInteropTypes>
110-
</Reference>
111-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
112-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.14.3.26929\lib\net20\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.dll</HintPath>
113-
<EmbedInteropTypes>True</EmbedInteropTypes>
114-
</Reference>
115-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
116-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime.15.0.26929\lib\net20\Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime.dll</HintPath>
117-
<EmbedInteropTypes>True</EmbedInteropTypes>
118-
</Reference>
119-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
120-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime.15.6.27413\lib\net20\Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime.dll</HintPath>
121-
<EmbedInteropTypes>True</EmbedInteropTypes>
122-
</Reference>
123-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
125-
</Reference>
126-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30730\lib\net11\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
128-
</Reference>
129-
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130-
<HintPath>..\packages\Microsoft.VisualStudio.Text.Data.15.6.27740\lib\net46\Microsoft.VisualStudio.Text.Data.dll</HintPath>
131-
</Reference>
132-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
133-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6071\lib\net11\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
134-
</Reference>
135-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
136-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
137-
</Reference>
138-
<Reference Include="Microsoft.VisualStudio.Threading, Version=15.8.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
139-
<HintPath>..\packages\Microsoft.VisualStudio.Threading.15.8.168\lib\net46\Microsoft.VisualStudio.Threading.dll</HintPath>
140-
</Reference>
141-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142-
<HintPath>..\packages\Microsoft.VisualStudio.Utilities.15.9.28307\lib\net46\Microsoft.VisualStudio.Utilities.dll</HintPath>
143-
</Reference>
144-
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
145-
<HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.15\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
146-
</Reference>
147-
<Reference Include="Microsoft.VisualStudio.VCProject, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
148-
<EmbedInteropTypes>True</EmbedInteropTypes>
149-
</Reference>
150-
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
151-
<EmbedInteropTypes>True</EmbedInteropTypes>
152-
</Reference>
153-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
154-
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
155-
</Reference>
15669
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
15770
<EmbedInteropTypes>False</EmbedInteropTypes>
15871
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll</HintPath>
15972
<Private>True</Private>
16073
</Reference>
161-
<Reference Include="StreamJsonRpc, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
162-
<HintPath>..\packages\StreamJsonRpc.1.3.23\lib\net45\StreamJsonRpc.dll</HintPath>
163-
</Reference>
16474
<Reference Include="System" />
16575
<Reference Include="System.ComponentModel.Composition" />
16676
<Reference Include="System.Design" />
16777
<Reference Include="System.Drawing" />
16878
<Reference Include="System.Net.Http" />
169-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
170-
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
171-
</Reference>
17279
<Reference Include="System.Transactions" />
17380
<Reference Include="System.Windows.Forms" />
17481
<Reference Include="System.Xml" />
@@ -236,7 +143,6 @@
236143
<None Include="app.config">
237144
<SubType>Designer</SubType>
238145
</None>
239-
<None Include="packages.config" />
240146
<None Include="Properties\Settings.settings">
241147
<Generator>SettingsSingleFileGenerator</Generator>
242148
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -311,25 +217,39 @@
311217
</BootstrapperPackage>
312218
</ItemGroup>
313219
<ItemGroup>
314-
<Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.36\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
315-
<Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.168\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
220+
</ItemGroup>
221+
<ItemGroup>
222+
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers">
223+
<Version>16.10.10</Version>
224+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
225+
<PrivateAssets>all</PrivateAssets>
226+
</PackageReference>
227+
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0">
228+
<Version>17.3.32804.24</Version>
229+
</PackageReference>
230+
<PackageReference Include="Microsoft.VisualStudio.Threading">
231+
<Version>17.3.44</Version>
232+
</PackageReference>
233+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
234+
<Version>17.3.44</Version>
235+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
236+
<PrivateAssets>all</PrivateAssets>
237+
</PackageReference>
238+
<PackageReference Include="Microsoft.VisualStudio.VCProjectEngine">
239+
<Version>17.3.32803.143</Version>
240+
</PackageReference>
241+
<PackageReference Include="Newtonsoft.Json">
242+
<Version>13.0.1</Version>
243+
</PackageReference>
244+
<PackageReference Include="System.Threading.Tasks.Extensions">
245+
<Version>4.5.4</Version>
246+
</PackageReference>
316247
</ItemGroup>
317248
<PropertyGroup>
318249
<UseCodebase>true</UseCodebase>
319250
</PropertyGroup>
320251
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
321252
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
322-
<Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.168\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.168\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
323-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
324-
<PropertyGroup>
325-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
326-
</PropertyGroup>
327-
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.168\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.168\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
328-
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.36\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.36\build\Microsoft.VisualStudio.SDK.Analyzers.targets'))" />
329-
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
330-
</Target>
331-
<Import Project="..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.36\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.36\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
332-
<Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
333253
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
334254
Other similar extension points exist, see Microsoft.Common.targets.
335255
<Target Name="BeforeBuild">

‎CPPCheckPlugin/CPPCheckPluginPackage.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,9 @@ private async Task<ProjectItemType> getTypeOfProjectItemAsync(ProjectItem item)
581581
try
582582
{
583583
VCFile vcFile = item.Object as VCFile;
584-
VCProject vcProject = item.ContainingProject.Object as VCProject;
585-
VCFileConfiguration fileConfig = vcFile.FileConfigurations.Item(vcProject.ActiveConfiguration.Name);
584+
VCProject vcProject = item.ContainingProject.Object as VCProject;
585+
dynamic vcFileFileConfigurations = vcFile.FileConfigurations;
586+
VCFileConfiguration fileConfig = vcFileFileConfigurations.Item(vcProject.ActiveConfiguration.Name);
586587

587588
if (!fileConfig.ExcludedFromBuild)
588589
{
@@ -700,7 +701,8 @@ private static async Task<SourceFile> createSourceFileAsync(ProjectItem item)
700701
VCFile vcFile = item.Object as VCFile;
701702
VCProject vcProject = item.ContainingProject.Object as VCProject;
702703
VCConfiguration vcconfig = vcProject.ActiveConfiguration;
703-
VCFileConfiguration fileConfig = vcFile.FileConfigurations.Item(vcconfig.Name);
704+
dynamic vcFileFileConfigurations = vcFile.FileConfigurations;
705+
VCFileConfiguration fileConfig = vcFileFileConfigurations.Item(vcconfig.Name);
704706

705707
string toolSetName = ((dynamic)vcconfig).PlatformToolsetFriendlyName;
706708

@@ -724,8 +726,9 @@ private static async Task<SourceFile> createSourceFileAsync(ProjectItem item)
724726
recursiveAddToolDetails(sourceForAnalysis, vcconfig, vcTool, null, ref bInheritDefs, ref bInheritUndefs);
725727
}
726728

727-
// Now get the full include path
728-
VCCLCompilerTool projectTool = (VCCLCompilerTool)vcconfig.Tools.Item("VCCLCompilerTool");
729+
// Now get the full include path
730+
dynamic vcconfigTools = vcconfig.Tools;
731+
VCCLCompilerTool projectTool = (VCCLCompilerTool)vcconfigTools.Item("VCCLCompilerTool");
729732
if (projectTool != null && implementsInterface(projectTool, "Microsoft.VisualStudio.VCProjectEngine.VCCLCompilerTool"))
730733
{
731734
if (sourceForAnalysis == null)

‎CPPCheckPlugin/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CPPCheckPlugin/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)