Skip to content

Commit db94f71

Browse files
tmattmat
authored
Use Microsoft.VisualStudio.Sdk meta-package and clean up versions and package references (#71111)
Use Microsoft.VisualStudio.Sdk meta-package and switch to Central Package Management
1 parent 3cd939f commit db94f71

File tree

155 files changed

+1169
-1597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1169
-1597
lines changed

‎Directory.Packages.props

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<Import Project="eng\Directory.Packages.props" />
7+
</Project>

‎Roslyn.sln

-7
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Lang
363363
EndProject
364364
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Debugger", "src\Tools\ExternalAccess\Debugger\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj", "{655A5B07-39B8-48CD-8590-8AC0C2B708D8}"
365365
EndProject
366-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote", "src\Tools\ExternalAccess\Xamarin.Remote\Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj", "{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}"
367-
EndProject
368366
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roslyn.VisualStudio.Setup.ServiceHub.Desktop.Config", "src\Setup\DevDivVsix\ServiceHubConfig\Roslyn.VisualStudio.Setup.ServiceHub.Desktop.Config.csproj", "{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}"
369367
EndProject
370368
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests", "src\Tools\ExternalAccess\FSharpTest\Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests.csproj", "{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5}"
@@ -1096,10 +1094,6 @@ Global
10961094
{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
10971095
{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
10981096
{655A5B07-39B8-48CD-8590-8AC0C2B708D8}.Release|Any CPU.Build.0 = Release|Any CPU
1099-
{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1100-
{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
1101-
{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
1102-
{DE53934B-7FC1-48A0-85AB-C519FBBD02CF}.Release|Any CPU.Build.0 = Release|Any CPU
11031097
{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
11041098
{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Debug|Any CPU.Build.0 = Debug|Any CPU
11051099
{3D33BBFD-EC63-4E8C-A714-0A48A3809A87}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1516,7 +1510,6 @@ Global
15161510
{686BF57E-A6FF-467B-AAB3-44DE916A9772} = {D449D505-CC6A-4E0B-AF1B-976E2D0AE67A}
15171511
{1DDE89EE-5819-441F-A060-2FF4A986F372} = {D449D505-CC6A-4E0B-AF1B-976E2D0AE67A}
15181512
{655A5B07-39B8-48CD-8590-8AC0C2B708D8} = {8977A560-45C2-4EC2-A849-97335B382C74}
1519-
{DE53934B-7FC1-48A0-85AB-C519FBBD02CF} = {8977A560-45C2-4EC2-A849-97335B382C74}
15201513
{3D33BBFD-EC63-4E8C-A714-0A48A3809A87} = {BE25E872-1667-4649-9D19-96B83E75A44E}
15211514
{BFFB5CAE-33B5-447E-9218-BDEBFDA96CB5} = {8977A560-45C2-4EC2-A849-97335B382C74}
15221515
{FC32EF16-31B1-47B3-B625-A80933CB3F29} = {8977A560-45C2-4EC2-A849-97335B382C74}

‎eng/Directory.Packages.props

+306
Large diffs are not rendered by default.

‎eng/SourceBuildPrebuiltBaseline.xml

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323

2424
<!-- This is upgraded to latest version in full source-build and can be baselined for repo build -->
2525
<UsagePattern IdentityGlob="System.Composition*/7.0*" />
26+
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0*" />
27+
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0*" />
28+
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0*" />
2629
<UsagePattern IdentityGlob="Microsoft.Extensions.Configuration*/7.0*" />
2730
<UsagePattern IdentityGlob="Microsoft.Extensions.Logging*/7.0*" />
2831
<UsagePattern IdentityGlob="Microsoft.Extensions.Options.ConfigurationExtension*/7.0*" />

‎eng/Version.Details.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Sha>27e584661980ee6d82c419a2a471ae505b7d122e</Sha>
7171
<SourceBuild RepoName="symreader" ManagedOnly="true" />
7272
</Dependency>
73-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-5.22128.4">
73+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-1.24061.4">
7474
<Uri>https://github.com/dotnet/roslyn</Uri>
7575
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
7676
</Dependency>

‎eng/Versions.props

+13-280
Large diffs are not rendered by default.

‎eng/config/globalconfigs/Common.globalconfig

+3
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ dotnet_diagnostic.VSTHRD010.severity = none
124124
# VSTHRD110: Observe result of async calls
125125
dotnet_diagnostic.VSTHRD110.severity = none
126126

127+
# Workaround for old Microsoft.VisualStudio.Progression.* packages: https://github.com/dotnet/roslyn/issues/71404
128+
dotnet_diagnostic.VSIXCompatibility1001.severity = none
129+
127130
dotnet_diagnostic.HAA0101.severity = none
128131
dotnet_diagnostic.HAA0102.severity = none
129132
dotnet_diagnostic.HAA0201.severity = none

‎eng/generate-vssdk-versions.csx

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#r "System.Xml.Linq"
2+
3+
using System;
4+
using System.Collections.Generic;
5+
using System.IO;
6+
using System.Linq;
7+
using System.Runtime.CompilerServices;
8+
using System.Xml.Linq;
9+
10+
var nugetPackageDir = Environment.GetEnvironmentVariable("NUGET_PACKAGES");
11+
if (!Directory.Exists(nugetPackageDir))
12+
{
13+
nugetPackageDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".nuget", "packages");
14+
}
15+
16+
var versions = XDocument.Parse(File.ReadAllText(Path.Combine(GetScriptDirectory(), "Directory.Packages.props")));
17+
var vssdkVersion = versions.Descendants().First(n => n.Name.LocalName == "PackageVersion" && n.Attribute("Include").Value == "Microsoft.VisualStudio.SDK").Attribute("Version").Value;
18+
19+
var vssdkPackageSpecPath = Path.Combine(nugetPackageDir, "microsoft.visualstudio.sdk", vssdkVersion, "microsoft.visualstudio.sdk.nuspec");
20+
21+
Console.WriteLine($"NuGet package directory: '{nugetPackageDir}'");
22+
Console.WriteLine($"VSSDK version: '{vssdkVersion}'");
23+
Console.WriteLine();
24+
25+
if (!File.Exists(vssdkPackageSpecPath))
26+
{
27+
Console.Error.WriteLine($"File not found: {vssdkPackageSpecPath}. Please, restore packages.");
28+
return 1;
29+
}
30+
31+
var vssdkPackageSpec = XDocument.Parse(File.ReadAllText(vssdkPackageSpecPath));
32+
33+
var properties = new List<string>();
34+
35+
foreach (var node in vssdkPackageSpec.Descendants())
36+
{
37+
if (node.Name.LocalName == "dependency")
38+
{
39+
var id = node.Attribute("id")?.Value;
40+
var version = node.Attribute("version")?.Value;
41+
42+
if (id is null || version is null)
43+
continue;
44+
45+
if (!id.StartsWith("Microsoft.VisualStudio") &&
46+
!id.StartsWith("Microsoft.ServiceHub") &&
47+
id != "Newtonsoft.Json" &&
48+
id != "StreamJsonRpc")
49+
{
50+
continue;
51+
}
52+
53+
if (!versions.Descendants().Any(n => n.Name.LocalName == "PackageVersion" && n.Attribute("Include").Value == id))
54+
{
55+
continue;
56+
}
57+
58+
properties.Add($"<PackageVersion Include=\"{id}\" Version=\"{version}\" />");
59+
}
60+
}
61+
62+
properties.Sort();
63+
64+
foreach (var property in properties)
65+
{
66+
Console.WriteLine(property);
67+
}
68+
69+
return 0;
70+
71+
static string GetScriptDirectory([CallerFilePath] string path = null)
72+
=> Path.GetDirectoryName(path);

‎eng/targets/DiaSymReaderNative.targets

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@
1919
out. This logic is responsible for doing that.
2020
-->
2121
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
22-
<Content Include="$(NuGetPackageRoot)\microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.x86.dll">
22+
<Content Include="$(PkgMicrosoft_DiaSymReader_Native)\runtimes\win\native\Microsoft.DiaSymReader.Native.x86.dll">
2323
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2424
<Visible>false</Visible>
2525
<Pack>false</Pack>
2626
</Content>
27-
<Content Include="$(NuGetPackageRoot)\microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.amd64.dll">
27+
<Content Include="$(PkgMicrosoft_DiaSymReader_Native)\runtimes\win\native\Microsoft.DiaSymReader.Native.amd64.dll">
2828
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2929
<Visible>false</Visible>
3030
<Pack>false</Pack>
3131
</Content>
32-
<Content Include="$(NuGetPackageRoot)\microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.arm64.dll">
32+
<Content Include="$(PkgMicrosoft_DiaSymReader_Native)\runtimes\win\native\Microsoft.DiaSymReader.Native.arm64.dll">
3333
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3434
<Visible>false</Visible>
3535
<Pack>false</Pack>
3636
</Content>
3737

38-
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" ExcludeAssets="all"/>
38+
<PackageReference Include="Microsoft.DiaSymReader.Native" GeneratePathProperty="true" ExcludeAssets="all"/>
3939
</ItemGroup>
4040
</Project>

‎eng/targets/ILAsm.targets

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@
66
exe.
77
-->
88
<ItemGroup>
9-
<Content Include="$(NuGetPackageRoot)\runtime.win-x64.microsoft.netcore.ilasm\$(runtimeWinX64MicrosoftNETCoreILAsmPackageVersion)\runtimes\**\*.*">
9+
<Content Include="$(Pkgruntime_win-x64_Microsoft_NETCore_ILAsm)\runtimes\**\*.*">
1010
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1111
<LinkBase>runtimes</LinkBase>
1212
<Visible>false</Visible>
1313
<Pack>false</Pack>
1414
</Content>
15-
<Content Include="$(NuGetPackageRoot)\runtime.linux-x64.microsoft.netcore.ilasm\$(runtimeLinuxX64MicrosoftNETCoreILAsmPackageVersion)\runtimes\**\*.*">
15+
<Content Include="$(Pkgruntime_linux-x64_Microsoft_NETCore_ILAsm)\runtimes\**\*.*">
1616
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1717
<LinkBase>runtimes</LinkBase>
1818
<Visible>false</Visible>
1919
<Pack>false</Pack>
2020
</Content>
21-
<Content Include="$(NuGetPackageRoot)\runtime.osx-x64.microsoft.netcore.ilasm\$(runtimeOSXX64MicrosoftNETCoreILAsmPackageVersion)\runtimes\**\*.*">
21+
<Content Include="$(Pkgruntime_osx-x64_Microsoft_NETCore_ILAsm)\runtimes\**\*.*">
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
<LinkBase>runtimes</LinkBase>
2424
<Visible>false</Visible>
2525
<Pack>false</Pack>
2626
</Content>
2727

28-
<PackageReference Include="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="$(runtimeWinX64MicrosoftNETCoreILAsmPackageVersion)" ExcludeAssets="all" />
29-
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="$(runtimeLinuxX64MicrosoftNETCoreILAsmPackageVersion)" ExcludeAssets="all" />
30-
<PackageReference Include="runtime.osx-x64.Microsoft.NETCore.ILAsm" Version="$(runtimeOSXX64MicrosoftNETCoreILAsmPackageVersion)" ExcludeAssets="all" />
28+
<PackageReference Include="runtime.win-x64.Microsoft.NETCore.ILAsm" GeneratePathProperty="true" ExcludeAssets="all" />
29+
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.ILAsm" GeneratePathProperty="true" ExcludeAssets="all" />
30+
<PackageReference Include="runtime.osx-x64.Microsoft.NETCore.ILAsm" GeneratePathProperty="true" ExcludeAssets="all" />
3131
</ItemGroup>
3232
</Project>

‎eng/targets/ILDAsm.targets

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@
55
this target file. The build provenance tools need this to decompile IL for debugging purposes.
66
-->
77
<ItemGroup>
8-
<Content Include="$(NuGetPackageRoot)\runtime.win-x64.microsoft.netcore.ildasm\$(runtimeWinX64MicrosoftNETCoreILDAsmPackageVersion)\runtimes\**\*.*">
8+
<Content Include="$(Pkgruntime_win-x64_Microsoft_NETCore_ILDAsm)\runtimes\**\*.*">
99
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1010
<LinkBase>runtimes</LinkBase>
1111
<Visible>false</Visible>
1212
<Pack>false</Pack>
1313
</Content>
14-
<Content Include="$(NuGetPackageRoot)\runtime.linux-x64.microsoft.netcore.ildasm\$(runtimeLinuxX64MicrosoftNETCoreILDAsmPackageVersion)\runtimes\**\*.*">
14+
<Content Include="$(Pkgruntime_linux-x64_Microsoft_NETCore_ILDAsm)\runtimes\**\*.*">
1515
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1616
<LinkBase>runtimes</LinkBase>
1717
<Visible>false</Visible>
1818
<Pack>false</Pack>
1919
</Content>
20-
<Content Include="$(NuGetPackageRoot)\runtime.osx-x64.microsoft.netcore.ildasm\$(runtimeOSXX64MicrosoftNETCoreILDAsmPackageVersion)\runtimes\**\*.*">
20+
<Content Include="$(Pkgruntime_osx-x64_Microsoft_NETCore_ILDAsm)\runtimes\**\*.*">
2121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2222
<LinkBase>runtimes</LinkBase>
2323
<Visible>false</Visible>
2424
<Pack>false</Pack>
2525
</Content>
2626

27-
<PackageReference Include="runtime.win-x64.Microsoft.NETCore.ILDAsm" Version="$(runtimeWinX64MicrosoftNETCoreILDAsmPackageVersion)" ExcludeAssets="all" />
28-
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="$(runtimeLinuxX64MicrosoftNETCoreILDAsmPackageVersion)" ExcludeAssets="all" />
29-
<PackageReference Include="runtime.osx-x64.Microsoft.NETCore.ILDAsm" Version="$(runtimeOSXX64MicrosoftNETCoreILDAsmPackageVersion)" ExcludeAssets="all" />
27+
<PackageReference Include="runtime.win-x64.Microsoft.NETCore.ILDAsm" GeneratePathProperty="true" ExcludeAssets="all" />
28+
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.ILDAsm" GeneratePathProperty="true" ExcludeAssets="all" />
29+
<PackageReference Include="runtime.osx-x64.Microsoft.NETCore.ILDAsm" GeneratePathProperty="true" ExcludeAssets="all" />
3030
</ItemGroup>
3131
</Project>

‎eng/targets/Settings.props

+13-7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010

1111
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
1212

13+
<!-- Workaround for old Microsoft.VisualStudio.Progression.* packages -->
14+
<NoWarn>$(NoWarn);VSIXCompatibility1001</NoWarn>
15+
16+
<!-- TODO: https://github.com/dotnet/roslyn/issues/71667 -->
17+
<NoWarn>$(NoWarn);NU1507</NoWarn>
18+
1319
<CommonExtensionInstallationRoot>CommonExtensions</CommonExtensionInstallationRoot>
1420
<LanguageServicesExtensionInstallationFolder>Microsoft\VBCSharp\LanguageServices</LanguageServicesExtensionInstallationFolder>
1521

@@ -144,10 +150,10 @@
144150
Analyzers
145151
-->
146152
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
147-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" PrivateAssets="all" />
148-
<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="$(RoslynDiagnosticsAnalyzersVersion)" PrivateAssets="all" />
149-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="$(MicrosoftVisualStudioThreadingAnalyzersVersion)" PrivateAssets="all" />
150-
<PackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" Version="$(MicrosoftCodeAnalysisPerformanceSensitiveAnalyzersVersion)" PrivateAssets="all" />
153+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="all" />
154+
<PackageReference Include="Roslyn.Diagnostics.Analyzers" PrivateAssets="all" />
155+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all" />
156+
<PackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" PrivateAssets="all" />
151157
</ItemGroup>
152158

153159
<!-- Disable SDK supplied netanalyzers as we reference them from nugets instead -->
@@ -159,7 +165,7 @@
159165
Code indexing targets to help generating LSIF from indexing builds.
160166
-->
161167
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
162-
<PackageReference Include="RichCodeNav.EnvVarDump" Version="$(RichCodeNavEnvVarDumpVersion)" PrivateAssets="all" />
168+
<PackageReference Include="RichCodeNav.EnvVarDump" PrivateAssets="all" />
163169
</ItemGroup>
164170

165171
<!--
@@ -174,13 +180,13 @@
174180
<Choose>
175181
<When Condition="'$(Language)' == 'VB'">
176182
<ItemGroup Condition="'$(RoslynCheckCodeStyle)' == 'true'">
177-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="$(MicrosoftCodeAnalysisVisualBasicCodeStyleVersion)" PrivateAssets="all" />
183+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" PrivateAssets="all" />
178184
</ItemGroup>
179185
</When>
180186

181187
<When Condition="'$(Language)' == 'C#'">
182188
<ItemGroup Condition="'$(RoslynCheckCodeStyle)' == 'true'">
183-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisCSharpCodeStyleVersion)" PrivateAssets="all" />
189+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" PrivateAssets="all" />
184190
</ItemGroup>
185191
</When>
186192
</Choose>

‎eng/targets/VisualStudio.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<IncludeInVSIX>true</IncludeInVSIX>
137137
</Content>
138138

139-
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" ExcludeAssets="all"/>
139+
<PackageReference Include="Microsoft.DiaSymReader.Native" ExcludeAssets="all"/>
140140
</ItemGroup>
141141

142142
<Target Name="_CheckDeploymentTargetVisualStudioVersion"

‎eng/targets/XUnit.targets

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="XunitXml.TestLogger" Version="$(XunitXmlTestLoggerVersion)" />
10+
<PackageReference Include="XunitXml.TestLogger" />
11+
<PackageReference Include="xunit.extensibility.execution" />
12+
<PackageReference Include="xunit.runner.visualstudio" />
13+
<PackageReference Include="xunit.core" />
14+
<PackageReference Include="xunit.analyzers" />
1115
</ItemGroup>
1216

1317
<ItemGroup>

‎sourcebuild.binlog

2.77 MB
Binary file not shown.

‎src/CodeStyle/CSharp/Tests/Microsoft.CodeAnalysis.CSharp.CodeStyle.UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Compile Include="..\..\..\Features\CSharpTest\Diagnostics\AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest_NoEditor.cs" Link="AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest_NoEditor.cs" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion)" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
1818
</ItemGroup>
1919
<ItemGroup Label="Project References">
2020
<!-- Directly reference the Workspaces project so we always test against the latest Roslyn bits -->

‎src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<IsSymbolPublishingPackage>true</IsSymbolPublishingPackage>
1414
</PropertyGroup>
1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
17-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" />
17+
<PackageReference Include="System.Threading.Tasks.Extensions" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />

‎src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTestUtilities.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
<ProjectReference Include="..\..\..\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" />
3737
</ItemGroup>
3838
<ItemGroup>
39-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion)" />
40-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisCSharpCodeRefactoringTestingXUnitVersion)" />
41-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisVisualBasicCodeFixTestingXUnitVersion)" />
42-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisVisualBasicCodeRefactoringTestingXUnitVersion)" />
39+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
40+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" />
41+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" />
42+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" />
4343
</ItemGroup>
4444
<ItemGroup Label="Project References">
4545
<!-- TODO: Remove the below project references to test utility projects once all analyzer/code fix tests are switched to Microsoft.CodeAnalysis.Testing -->

‎src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Compile Include="..\..\..\Features\VisualBasicTest\Utils.vb" Link="Utils.vb" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisVisualBasicCodeFixTestingXUnitVersion)" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" />
1919
</ItemGroup>
2020
<ItemGroup Label="Project References">
2121
<!-- Directly reference the Workspaces project so we always test against the latest Roslyn bits -->

0 commit comments

Comments
 (0)