Skip to content

Commit ef303cf

Browse files
committed
Revert to a single roslyn version property
1 parent ef3b3b9 commit ef303cf

File tree

3 files changed

+7
-38
lines changed

3 files changed

+7
-38
lines changed

Directory.Packages.props

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
1212
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
1313
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalzerTestingVersion)" />
14-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesVersion)" />
15-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
16-
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftCodeAnalysisFeaturesVersion)" />
17-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftCodeAnalysisVisualBasicFeaturesVersion)" />
18-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVisualBasicWorkspacesVersion)" />
19-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVisualBasicVersion)" />
20-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildVersion)" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
16+
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
17+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
18+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
19+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVersion)" />
20+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
2121
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
2222
<PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
2323
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />

eng/Version.Details.xml

-24
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-1.23226.15">
5-
<Uri>https://github.com/dotnet/roslyn</Uri>
6-
<Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
7-
</Dependency>
8-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-1.23226.15">
9-
<Uri>https://github.com/dotnet/roslyn</Uri>
10-
<Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
11-
</Dependency>
12-
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.7.0-1.23226.15">
13-
<Uri>https://github.com/dotnet/roslyn</Uri>
14-
<Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
15-
</Dependency>
16-
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.7.0-1.23226.15">
17-
<Uri>https://github.com/dotnet/roslyn</Uri>
18-
<Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
19-
</Dependency>
20-
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic" Version="4.7.0-1.23226.15">
21-
<Uri>https://github.com/dotnet/roslyn</Uri>
22-
<Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
23-
</Dependency>
24-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-1.23226.15">
25-
<Uri>https://github.com/dotnet/roslyn</Uri>
26-
<Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
27-
</Dependency>
284
<Dependency Name="Microsoft.CodeAnalysis" Version="4.7.0-1.23226.15">
295
<Uri>https://github.com/dotnet/roslyn</Uri>
306
<Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>

eng/Versions.props

-7
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@
2929
<!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
3030
<NuGetVersion>6.6.0-preview.3.61</NuGetVersion>
3131
<!-- roslyn -->
32-
<MicrosoftCodeAnalysisCSharpFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisCSharpFeaturesVersion>
33-
<MicrosoftCodeAnalysisCSharpVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisCSharpVersion>
34-
<MicrosoftCodeAnalysisFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisFeaturesVersion>
35-
<MicrosoftCodeAnalysisVisualBasicFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicFeaturesVersion>
36-
<MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>
37-
<MicrosoftCodeAnalysisVisualBasicVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicVersion>
38-
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
3932
<MicrosoftCodeAnalysisVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVersion>
4033
<!-- roslyn-sdk -->
4134
<MicrosoftCodeAnalysisAnalzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalzerTestingVersion>

0 commit comments

Comments
 (0)