Skip to content

Commit 855cb1d

Browse files
T-GroT-Gro
authored
Merge pull request #19018 from dotnet/backport/pr-18957-to-release/dev18.0
[release/dev18.0] Automate Roslyn Dependency Management with Darc & Prune Direct References
2 parents a89c75c + 47eab8b commit 855cb1d

File tree

22 files changed

+154
-223
lines changed

22 files changed

+154
-223
lines changed

‎FSharp.sln‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.1.32113.165
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11104.47 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core", "src\FSharp.Core\FSharp.Core.fsproj", "{DED3BBD7-53F4-428A-8C9F-27968E768605}"
77
EndProject
@@ -166,6 +166,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".VisualStudio", ".VisualStu
166166
docs\release-notes\.VisualStudio\17.9.md = docs\release-notes\.VisualStudio\17.9.md
167167
EndProjectSection
168168
EndProject
169+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{79E058E4-79E9-4178-AFA4-A87C45373379}"
170+
ProjectSection(SolutionItems) = preProject
171+
eng\Version.Details.props = eng\Version.Details.props
172+
eng\Version.Details.xml = eng\Version.Details.xml
173+
eng\Versions.props = eng\Versions.props
174+
EndProjectSection
175+
EndProject
169176
Global
170177
GlobalSection(SolutionConfigurationPlatforms) = preSolution
171178
Debug|Any CPU = Debug|Any CPU

‎eng/Version.Details.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,38 @@
4242
<Uri>https://github.com/dotnet/runtime</Uri>
4343
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
4444
</Dependency>
45+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25480.7">
46+
<Uri>https://github.com/dotnet/roslyn</Uri>
47+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
48+
</Dependency>
49+
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.0.0-2.25480.7">
50+
<Uri>https://github.com/dotnet/roslyn</Uri>
51+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
52+
</Dependency>
53+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.25480.7">
54+
<Uri>https://github.com/dotnet/roslyn</Uri>
55+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
56+
</Dependency>
57+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.25480.7">
58+
<Uri>https://github.com/dotnet/roslyn</Uri>
59+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
60+
</Dependency>
61+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.25480.7">
62+
<Uri>https://github.com/dotnet/roslyn</Uri>
63+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
64+
</Dependency>
65+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25480.7">
66+
<Uri>https://github.com/dotnet/roslyn</Uri>
67+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
68+
</Dependency>
69+
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.0.0-2.25480.7">
70+
<Uri>https://github.com/dotnet/roslyn</Uri>
71+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
72+
</Dependency>
73+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.25480.7">
74+
<Uri>https://github.com/dotnet/roslyn</Uri>
75+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
76+
</Dependency>
4577
</ProductDependencies>
4678
<ToolsetDependencies>
4779
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25513.2">

‎eng/Versions.props‎

Lines changed: 24 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -94,105 +94,77 @@
9494
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
9595
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
9696
<!-- Versions for package groups -->
97-
<RoslynVersion>5.0.0-1.25276.102</RoslynVersion>
98-
<VisualStudioEditorPackagesVersion>17.14.188</VisualStudioEditorPackagesVersion>
99-
<MicrosoftVisualStudioShellPackagesVersion>17.14.40268</MicrosoftVisualStudioShellPackagesVersion>
100-
<VisualStudioProjectSystemPackagesVersion>17.14.79</VisualStudioProjectSystemPackagesVersion>
101-
<VisualStudioShellProjectsPackages>17.14.40254</VisualStudioShellProjectsPackages>
102-
<MicrosoftVisualStudioThreadingPackagesVersion>17.14.15</MicrosoftVisualStudioThreadingPackagesVersion>
97+
<VisualStudioEditorPackagesVersion>18.0.332-preview</VisualStudioEditorPackagesVersion>
98+
<MicrosoftVisualStudioShellPackagesVersion>18.0.2101-preview.1</MicrosoftVisualStudioShellPackagesVersion>
99+
<VisualStudioProjectSystemPackagesVersion>18.0.1237-pre</VisualStudioProjectSystemPackagesVersion>
100+
<VisualStudioShellProjectsPackages>18.0.2077-preview.1</VisualStudioShellProjectsPackages>
101+
<MicrosoftVisualStudioThreadingPackagesVersion>18.0.5</MicrosoftVisualStudioThreadingPackagesVersion>
102+
103103
<!-- Roslyn packages -->
104-
<MicrosoftCodeAnalysisFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisFeaturesVersion>
105-
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
106-
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
107-
<MicrosoftCodeAnalysisEditorFeaturesWpfVersion>5.0.0-1.25275.2</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
108-
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
109-
<MicrosoftCodeAnalysisVersion>$(RoslynVersion)</MicrosoftCodeAnalysisVersion>
110-
<MicrosoftCodeAnalysisCSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion>
111-
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
104+
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
105+
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
106+
<MicrosoftCodeAnalysisVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisVersion>
107+
<MicrosoftCodeAnalysisCSharpVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCSharpVersion>
108+
<MicrosoftVisualStudioLanguageServicesVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesVersion>
112109
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
113-
<MicrosoftCodeAnalysisCompilersVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCompilersVersion>
110+
<!-- Roslyn for when we need to compile C# in tests. .dll hell caused by vstest makes newer version fail at runtime -->
111+
<RoslynForTestingButNotForVSLayer>4.14.0</RoslynForTestingButNotForVSLayer>
114112
<!-- -->
115113
<!-- Visual Studio Shell packages -->
116114
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
117-
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
118115
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
119-
<MicrosoftVisualStudioImageCatalogVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImageCatalogVersion>
120116
<MicrosoftVisualStudioShellInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInteropVersion>
121117
<MicrosoftVisualStudioTextManagerInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioTextManagerInteropVersion>
122118
<MicrosoftVisualStudioOLEInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioOLEInteropVersion>
123-
<MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
124119
<MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
125-
<MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
126120
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
127121
<MicrosoftVisualStudioPackageLanguageService150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioPackageLanguageService150Version>
128122
<MicrosoftVisualStudioManagedInterfacesVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioManagedInterfacesVersion>
129-
<MicrosoftVisualStudioProjectAggregatorVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioProjectAggregatorVersion>
130-
<MicrosoftVisualStudioGraphModelVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioGraphModelVersion>
131-
<MicrosoftVisualStudioImagingVersion>17.14.40270</MicrosoftVisualStudioImagingVersion>
132123
<MicrosoftVisualStudioDesignerInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioDesignerInterfacesVersion>
133-
<MicrosoftVisualStudioUtilitiesVersion>17.14.40270</MicrosoftVisualStudioUtilitiesVersion>
134124
<MicrosoftVisualStudioShellImmutable100Version>10.0.30319</MicrosoftVisualStudioShellImmutable100Version>
135125
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
136126
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
127+
137128
<!-- -->
138129
<!-- Visual Studio Editor packages -->
139-
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
140130
<MicrosoftVisualStudioEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
141131
<MicrosoftVisualStudioLanguageStandardClassificationVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageStandardClassificationVersion>
142-
<MicrosoftVisualStudioLanguageVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageVersion>
143132
<MicrosoftVisualStudioLanguageIntellisenseVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageIntellisenseVersion>
144133
<MicrosoftVisualStudioPlatformVSEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioPlatformVSEditorVersion>
145-
<MicrosoftVisualStudioTextUIVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIVersion>
146134
<MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
147-
<MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
148-
<MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
149-
<MicrosoftVisualStudioComponentModelHostVersion>17.14.106</MicrosoftVisualStudioComponentModelHostVersion>
150135
<NuGetSolutionRestoreManagerInteropVersion>5.6.0</NuGetSolutionRestoreManagerInteropVersion>
151-
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.169-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
136+
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
152137
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
153-
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
154-
<!-- -->
155-
<!-- Visual Studio Threading packags -->
138+
139+
<!-- Visual Studio Threading packages -->
156140
<MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingPackagesVersion)</MicrosoftVisualStudioThreadingVersion>
157-
<!-- -->
141+
158142
<!-- Visual Studio Project System packages-->
159143
<MicrosoftVisualStudioProjectSystemVersion>$(VisualStudioProjectSystemPackagesVersion)</MicrosoftVisualStudioProjectSystemVersion>
160144
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
161-
<!-- -->
145+
162146
<!-- Misc. Visual Studio packages -->
163-
<MicrosoftVSSDKBuildToolsVersion>17.10.2179</MicrosoftVSSDKBuildToolsVersion>
164-
<MicrosoftVisualStudioRpcContractsVersion>17.14.20</MicrosoftVisualStudioRpcContractsVersion>
147+
<MicrosoftVSSDKBuildToolsVersion>17.14.2120</MicrosoftVSSDKBuildToolsVersion>
165148
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>17.0.0</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
166-
<MicrosoftVisualStudioValidationVersion>17.8.8</MicrosoftVisualStudioValidationVersion>
167-
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
168-
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
169-
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>
170-
<VSSDKVSLangProj11Version>11.0.4</VSSDKVSLangProj11Version>
171-
<VSSDKVSHelpVersion>7.0.4</VSSDKVSHelpVersion>
172149
<!-- -->
173150
<!-- setup packages -->
174151
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
175152
<MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
176-
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
153+
<MicroBuildPluginsSwixBuildVersion>1.1.87</MicroBuildPluginsSwixBuildVersion>
177154
<!-- -->
178155
<!-- other packages -->
179156
<BenchmarkDotNetVersion>0.13.10</BenchmarkDotNetVersion>
180157
<FsCheckVersion>2.16.5</FsCheckVersion>
181-
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
182158
<MicrosoftCompositionVersion>1.0.31</MicrosoftCompositionVersion>
183159
<MicrosoftNetCompilersVersion>4.3.0-1.22220.8</MicrosoftNetCompilersVersion>
184-
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
160+
<!-- Making diff way too large, update separately later. e.g. to 6.0.0-rtm.21518.12 and 9.0.0-rc.2.24462.10 or via darc -->
185161
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
186162
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
187-
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
163+
<MicrosoftNETTestSdkVersion>17.14.1</MicrosoftNETTestSdkVersion>
188164
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
189-
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
190-
<StreamJsonRpcVersion>2.22.11</StreamJsonRpcVersion>
191-
<NerdbankStreamsVersion>2.12.87</NerdbankStreamsVersion>
192165
<XUnitVersion>2.9.0</XUnitVersion>
193-
<XUnitRunnerVersion>2.8.2</XUnitRunnerVersion>
166+
<XUnitRunnerVersion>3.1.4</XUnitRunnerVersion>
194167
<XunitXmlTestLoggerVersion>3.1.17</XunitXmlTestLoggerVersion>
195-
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
196168
<!-- -->
197169
</PropertyGroup>
198170
</Project>

‎tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">$(FSharpNetCoreProductTargetFramework)</TargetFrameworks>
66
<RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
77
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
8-
<ReferenceVsAssemblies>true</ReferenceVsAssemblies>
98
<OutputType>Library</OutputType>
109
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1110
<UnitTestType>xunit</UnitTestType>
@@ -69,8 +68,22 @@
6968

7069
<!-- Runtime dependencies. Beware. -->
7170
<ItemGroup>
72-
<PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(MicrosoftNETCoreILDAsmVersion)" />
73-
<PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(MicrosoftNETCoreILAsmVersion)" />
71+
<PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(MicrosoftNETCoreILDAsmVersion)">
72+
<IncludeAssets>runtime; native</IncludeAssets>
73+
<PrivateAssets>all</PrivateAssets>
74+
</PackageReference>
75+
<PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(MicrosoftNETCoreILAsmVersion)">
76+
<IncludeAssets>runtime; native</IncludeAssets>
77+
<PrivateAssets>all</PrivateAssets>
78+
</PackageReference>
79+
<PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)">
80+
<IncludeAssets>runtime; native</IncludeAssets>
81+
<PrivateAssets>all</PrivateAssets>
82+
</PackageReference>
83+
<PackageReference Include="Microsoft.DiaSymReader.PortablePdb" Version="$(MicrosoftDiaSymReaderPortablePdbVersion)">
84+
<PrivateAssets>all</PrivateAssets>
85+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
86+
</PackageReference>
7487
</ItemGroup>
7588

7689
<ItemGroup>
@@ -83,26 +96,17 @@
8396
</ItemGroup>
8497

8598
<ItemGroup Condition="'$(TargetFramework)' != '$(FSharpNetCoreProductTargetFramework)'">
86-
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
87-
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
8899
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
89100
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
90101
</ItemGroup>
91102
<PropertyGroup>
92103
<NoWarn>$(NoWarn);NU1510</NoWarn> <!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path. Also, local NoWarn does not help - This is just me trying to enforce it -->
93104
</PropertyGroup>
94105
<ItemGroup>
95-
<!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path -->
96-
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true" NoWarn="NU1510" />
97-
<PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" />
98-
<PackageReference Include="Microsoft.DiaSymReader.PortablePdb" Version="$(MicrosoftDiaSymReaderPortablePdbVersion)">
99-
<PrivateAssets>all</PrivateAssets>
100-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
101-
</PackageReference>
102-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
103-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
106+
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true" />
107+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynForTestingButNotForVSLayer)" />
108+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynForTestingButNotForVSLayer)" />
104109
<PackageReference Include="Microsoft.CodeAnalysis.Test.Resources.Proprietary" Version="$(MicrosoftCodeAnalysisTestResourcesProprietaryVersion)" />
105-
<PackageReference Include="Microsoft.NETCore.App.Ref" Version="6.0.0" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
106110
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
107111
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
108112
</ItemGroup>

0 commit comments

Comments
 (0)