Skip to content

Commit 3af00ad

Browse files
tmeschtertmeschter
committed
Sort PackageReferences
Sort the `PackageReference` items in our shared .props and .targets files. So long as we keep these sorted as we add new ones it will reduce the possibility of merge conflicts.
1 parent f50e2b4 commit 3af00ad

File tree

4 files changed

+37
-36
lines changed

4 files changed

+37
-36
lines changed

‎eng/imports/HostAgnostic.props‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,48 @@
1717
<Reference Include="WindowsBase" />
1818

1919
<!-- Infrastructure -->
20+
<!-- Path Property: PkgCodecov -->
21+
<PackageReference Include="Codecov" ExcludeAssets="all" GeneratePathProperty="true" />
2022
<PackageReference Include="MicroBuild.Core.Sentinel" PrivateAssets="all" />
23+
<!-- Path Property: PkgMicrosoft_DiaSymReader_Pdb2Pdb -->
24+
<PackageReference Include="Microsoft.DiaSymReader.Pdb2Pdb" ExcludeAssets="all" GeneratePathProperty="true" />
25+
<PackageReference Include="Microsoft.DotNet.XliffTasks" PrivateAssets="all" />
26+
<PackageReference Include="Microsoft.Net.Compilers.Toolset" />
27+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
2128
<!-- Path Property: PkgMicrosoft_VisualStudioEng_MicroBuild_Core -->
2229
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" PrivateAssets="all" GeneratePathProperty="true" />
2330
<!-- SwixBuild does not have the assets accessed via PackageReference. Instead, they are accessed directly from the NuGet cache on disk via property: PkgMicrosoft_VisualStudioEng_MicroBuild_Plugins_SwixBuild. -->
2431
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" ExcludeAssets="all" GeneratePathProperty="true" />
25-
<PackageReference Include="Nerdbank.Streams" ExcludeAssets="all" />
2632
<!-- Note: We require Nerdbank.GitVersioning beyond simply generating version numbers. It also produces some assembly information such as AssemblyName and PublicKeyToken into a *.ThisAssembly.cs file. -->
2733
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
34+
<PackageReference Include="Nerdbank.Streams" ExcludeAssets="all" />
2835
<PackageReference Include="System.IO.Pipelines" ExcludeAssets="all" />
29-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" />
30-
<PackageReference Include="Microsoft.DotNet.XliffTasks" PrivateAssets="all" />
31-
<!-- Path Property: PkgMicrosoft_DiaSymReader_Pdb2Pdb -->
32-
<PackageReference Include="Microsoft.DiaSymReader.Pdb2Pdb" ExcludeAssets="all" GeneratePathProperty="true" />
33-
<!-- Path Property: PkgCodecov -->
34-
<PackageReference Include="Codecov" ExcludeAssets="all" GeneratePathProperty="true" />
35-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
3636

3737
<!-- CPS -->
38-
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.SDK" />
3938
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Query" />
40-
<PackageReference Include="Microsoft.VisualStudio.Validation" />
41-
<PackageReference Include="Microsoft.VisualStudio.Threading" />
39+
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.SDK" />
4240
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.SDK.Tools" />
41+
<PackageReference Include="Microsoft.VisualStudio.Threading" />
42+
<PackageReference Include="Microsoft.VisualStudio.Validation" />
4343
<PackageReference Include="System.Threading.Tasks.Dataflow" />
4444

4545
<!-- VS MEF -->
4646
<PackageReference Include="Microsoft.VisualStudio.Composition" />
4747

4848
<!-- Roslyn -->
49-
<PackageReference Include="Microsoft.CodeAnalysis" />
5049
<PackageReference Include="Microsoft.CSharp" />
50+
<PackageReference Include="Microsoft.CodeAnalysis" />
5151

5252
<!-- Needed to tie-break a potentially misspecified dependency somewhere -->
5353
<PackageReference Include="Microsoft.ServiceHub.Framework" />
5454

5555
<!-- Analyzers-->
5656
<!-- Set PrivateAssets="all" to prevent consumers of our packages from picking up these analyzers transitively. -->
5757
<PackageReference Include="CSharpIsNullAnalyzer" PrivateAssets="all" />
58-
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Analyzers" PrivateAssets="all" />
5958
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
6059
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" PrivateAssets="all" />
6160
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" PrivateAssets="all" />
61+
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Analyzers" PrivateAssets="all" />
6262
<PackageReference Include="Roslyn.Diagnostics.Analyzers" PrivateAssets="all" Condition="'$(IsTestProject)' != 'true'" />
6363

6464
<!-- Framework packages -->
@@ -68,8 +68,8 @@
6868
<PackageReference Include="Newtonsoft.Json" />
6969

7070
<!-- Host-Agnostic Visual Studio -->
71-
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" />
7271
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" />
72+
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" />
7373
</ItemGroup>
7474

7575
<ItemGroup Condition="'$(IsUnitTestProject)' == 'true'">
@@ -82,6 +82,7 @@
8282
<PackageReference Include="xunit.extensibility.execution" />
8383
<PackageReference Include="xunit.runner.console" GeneratePathProperty="true" />
8484
<PackageReference Include="xunit.runner.visualstudio" GeneratePathProperty="true" />
85+
8586
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
8687
</ItemGroup>
8788

‎eng/imports/Packages.targets‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,29 @@
33

44
<ItemGroup>
55
<!-- Infrastructure -->
6+
<!-- This package is deprecated. CodecovUploader is now the recommended package. -->
7+
<PackageReference Update="Codecov" Version="1.13.0" />
68
<PackageReference Update="MicroBuild.Core.Sentinel" Version="1.0.0" />
7-
<PackageReference Update="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
8-
<PackageReference Update="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="1.1.286" />
9-
<PackageReference Update="Nerdbank.Streams" Version="2.9.112" />
10-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.107" />
11-
<PackageReference Update="System.IO.Pipelines" Version="6.0.3" />
12-
<PackageReference Update="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23073.2" />
139
<!-- This is used for publishing PDBs to the legacy symbol server. It converts portable PDBs to Windows PDBs (embedded). -->
1410
<!-- https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/672/Archive-Symbols-with-Symweb?anchor=portable-pdbs -->
1511
<PackageReference Update="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-22320-02" />
16-
<!-- This package is deprecated. CodecovUploader is now the recommended package. -->
17-
<PackageReference Update="Codecov" Version="1.13.0" />
12+
<PackageReference Update="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23073.2" />
1813
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
14+
<PackageReference Update="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
15+
<PackageReference Update="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="1.1.286" />
16+
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.107" />
17+
<PackageReference Update="Nerdbank.Streams" Version="2.9.112" />
18+
<PackageReference Update="System.IO.Pipelines" Version="6.0.3" />
1919

2020
<!-- VS SDK -->
2121
<PackageReference Update="EnvDTE" Version="17.3.32804.24" />
2222
<PackageReference Update="Microsoft.Internal.VisualStudio.Interop" Version="17.3.32804.24" />
2323
<PackageReference Update="Microsoft.ServiceHub.Framework" Version="4.1.2060-alpha" />
24-
<PackageReference Update="Microsoft.VSSDK.BuildTools" Version="17.5.18-preview1" />
2524
<PackageReference Update="Microsoft.VisualStudio.ComponentModelHost" Version="17.3.198" />
2625
<PackageReference Update="Microsoft.VisualStudio.Composition" Version="17.4.1-alpha" />
2726
<PackageReference Update="Microsoft.VisualStudio.Data.Core" Version="17.0.0-preview-2-31223-026" />
28-
<PackageReference Update="Microsoft.VisualStudio.DataDesign.Common" Version="17.0.0-preview-2-31223-026" />
2927
<PackageReference Update="Microsoft.VisualStudio.Data.Services" Version="17.0.0-preview-2-31223-026" />
28+
<PackageReference Update="Microsoft.VisualStudio.DataDesign.Common" Version="17.0.0-preview-2-31223-026" />
3029
<PackageReference Update="Microsoft.VisualStudio.DataTools.Interop" Version="17.0.0-preview-2-31223-026" />
3130
<PackageReference Update="Microsoft.VisualStudio.Debugger.Contracts" Version="17.4.0-beta.22470.1" />
3231
<PackageReference Update="Microsoft.VisualStudio.Debugger.UI.Interfaces" Version="17.4.0-beta.22470.1" />
@@ -35,9 +34,9 @@
3534
<PackageReference Update="Microsoft.VisualStudio.Interop" Version="17.4.0-preview-2-32826-307" />
3635
<PackageReference Update="Microsoft.VisualStudio.ManagedInterfaces" Version="8.0.50728" />
3736
<PackageReference Update="Microsoft.VisualStudio.RpcContracts" Version="17.4.7-alpha" />
37+
<PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" />
3838
<PackageReference Update="Microsoft.VisualStudio.Settings.15.0" Version="17.3.32804.24" />
3939
<PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.0.4492" />
40-
<PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" />
4140
<PackageReference Update="Microsoft.VisualStudio.Shell.15.0" Version="17.3.32804.24" />
4241
<PackageReference Update="Microsoft.VisualStudio.Shell.Design" Version="17.3.32804.24" />
4342
<PackageReference Update="Microsoft.VisualStudio.Shell.Framework" Version="17.3.32804.24" />
@@ -48,6 +47,7 @@
4847
<PackageReference Update="Microsoft.VisualStudio.Utilities" Version="17.4.0-preview-3-32908-042" />
4948
<PackageReference Update="Microsoft.VisualStudio.Validation" Version="17.6.4-alpha" />
5049
<PackageReference Update="Microsoft.VisualStudio.XmlEditor" Version="17.3.32804.24" />
50+
<PackageReference Update="Microsoft.VSSDK.BuildTools" Version="17.5.18-preview1" />
5151
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
5252
<PackageReference Update="Microsoft.VSDesigner" Version="17.0.0-preview-2-31223-026" />
5353
<PackageReference Update="VsWebSite.Interop" Version="16.8.30523.219" />
@@ -57,17 +57,17 @@
5757

5858
<!-- CPS -->
5959
<!-- Find versions at https://dev.azure.com/azure-public/vside/_artifacts/feed/vs-impl -->
60-
<PackageReference Update="Microsoft.VisualStudio.ProjectSystem.SDK" Version="17.5.396-pre" />
6160
<PackageReference Update="Microsoft.VisualStudio.ProjectSystem.Analyzers" Version="17.5.396-pre" />
6261
<PackageReference Update="Microsoft.VisualStudio.ProjectSystem.Query" Version="17.5.396-pre" />
62+
<PackageReference Update="Microsoft.VisualStudio.ProjectSystem.SDK" Version="17.5.396-pre" />
6363
<PackageReference Update="Microsoft.VisualStudio.ProjectSystem.SDK.Tools" Version="17.5.396-pre" />
6464

6565
<!-- Roslyn -->
66+
<PackageReference Update="Microsoft.CodeAnalysis" Version="4.5.0-2.22528.3" />
67+
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
6668
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="4.4.0" />
6769
<PackageReference Update="Microsoft.VisualStudio.LanguageServices" Version="4.5.0-2.22528.3" />
68-
<PackageReference Update="Microsoft.CodeAnalysis" Version="4.5.0-2.22528.3" />
6970
<PackageReference Update="Microsoft.VisualStudio.IntegrationTest.Utilities" Version="2.6.0-beta1-62113-02" />
70-
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
7171

7272
<!-- Analyzers -->
7373
<PackageReference Update="CSharpIsNullAnalyzer" Version="0.1.329" />
@@ -92,21 +92,21 @@
9292
<PackageReference Update="Moq" Version="4.16.1" />
9393
<PackageReference Update="Verify.Xunit" Version="14.2.0" />
9494
<PackageReference Update="xunit" Version="2.4.2-pre.13" />
95+
<PackageReference Update="xunit.analyzers" Version="0.12.0-pre.19"/>
9596
<PackageReference Update="xunit.assert" Version="2.4.2-pre.13" />
9697
<PackageReference Update="xunit.combinatorial" Version="1.4.1" />
9798
<PackageReference Update="xunit.extensibility.core" Version="2.4.2-pre.13" />
9899
<PackageReference Update="xunit.extensibility.execution" Version="2.4.2-pre.13" NoWarn="NU1608" />
99-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
100100
<PackageReference Update="xunit.runner.console" Version="2.4.1" />
101-
<PackageReference Update="xunit.analyzers" Version="0.12.0-pre.19"/>
101+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
102102

103103
<!-- Integration Tests -->
104-
<PackageReference Update="MSTest.TestFramework" Version="2.1.2" />
105-
<PackageReference Update="MSTest.TestAdapter" Version="2.1.2" />
104+
<PackageReference Update="Microsoft.DotNet.Common.ProjectTemplates.1.x" Version="1.0.0-beta2-20170629-269" />
105+
<PackageReference Update="Microsoft.DotNet.Test.ProjectTemplates.1.x" Version="1.0.0-beta2-20170629-269" />
106106
<PackageReference Update="Microsoft.Test.Apex.VisualStudio" Version="17.0.0-preview-2-31221-277" />
107107
<PackageReference Update="Microsoft.TestPlatform" Version="16.2.0" />
108-
<PackageReference Update="Microsoft.DotNet.Test.ProjectTemplates.1.x" Version="1.0.0-beta2-20170629-269" />
109-
<PackageReference Update="Microsoft.DotNet.Common.ProjectTemplates.1.x" Version="1.0.0-beta2-20170629-269" />
108+
<PackageReference Update="MSTest.TestAdapter" Version="2.1.2" />
109+
<PackageReference Update="MSTest.TestFramework" Version="2.1.2" />
110110
</ItemGroup>
111111

112112
</Project>

‎eng/imports/VisualStudioDesigner.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.VisualStudio.Data.Core" />
1212
<PackageReference Include="Microsoft.VisualStudio.Data.Services" />
13-
<PackageReference Include="Microsoft.VisualStudio.DataTools.Interop" />
1413
<PackageReference Include="Microsoft.VisualStudio.DataDesign.Common" />
14+
<PackageReference Include="Microsoft.VisualStudio.DataTools.Interop" />
1515
<PackageReference Include="Microsoft.VisualStudio.TemplateWizardInterface" />
1616
<PackageReference Include="Microsoft.VisualStudio.XmlEditor" />
1717
<PackageReference Include="Microsoft.VSDesigner" />

‎eng/imports/VisualStudioIntegration.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Test.Apex.VisualStudio" />
12-
<PackageReference Include="MSTest.TestFramework" />
1312
<PackageReference Include="MSTest.TestAdapter" />
13+
<PackageReference Include="MSTest.TestFramework" />
1414

1515
<!-- Provides vstest.console.exe -->
1616
<PackageReference Include="Microsoft.TestPlatform" GeneratePathProperty="true" ExcludeAssets="all" />

0 commit comments

Comments
 (0)