Skip to content

Commit 754a554

Browse files
akoeplingerakoeplinger
authored
Set FlagNetStandard1XDependencies=true and fix issues (#96795)
The only product change is upgrading Microsoft.DiaSymReader from 1.4.0 to 2.0.0 in ILCompiler.TypeSystem.csproj, the rest are test changes.
1 parent f86af94 commit 754a554

29 files changed

Lines changed: 73 additions & 467 deletions

File tree

‎eng/Versions.props‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<!-- Opt-in/out repo features -->
2424
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
2525
<UsingToolXliff>false</UsingToolXliff>
26+
<FlagNetStandard1XDependencies Condition="'$(FlagNetStandard1XDependencies)' == ''">true</FlagNetStandard1XDependencies>
2627
<!-- Use SDK compilers in full source-build. -->
2728
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildFromSourceFlavor)' != 'Product'">true</UsingToolMicrosoftNetCompilers>
2829
</PropertyGroup>
@@ -129,6 +130,7 @@
129130
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
130131
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
131132
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
133+
<SystemReflectionMetadataLoadContextVersion>7.0.0</SystemReflectionMetadataLoadContextVersion>
132134
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
133135
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
134136
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
@@ -163,6 +165,7 @@
163165
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.24071.2</optimizationlinuxarm64MIBCRuntimeVersion>
164166
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.24071.2</optimizationPGOCoreCLRVersion>
165167
<!-- Not auto-updated. -->
168+
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
166169
<MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
167170
<SystemCommandLineVersion>2.0.0-beta4.23407.1</SystemCommandLineVersion>
168171
<TraceEventVersion>3.1.7</TraceEventVersion>
@@ -186,14 +189,15 @@
186189
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24066.3</MicrosoftDotNetXHarnessCLIVersion>
187190
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24065.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
188191
<NUnitVersion>3.12.0</NUnitVersion>
189-
<NUnitTestAdapterVersion>4.1.0</NUnitTestAdapterVersion>
192+
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
190193
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
191194
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
192195
<NewtonsoftJsonBsonVersion>1.0.2</NewtonsoftJsonBsonVersion>
193196
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
194197
<MoqVersion>4.18.4</MoqVersion>
195198
<FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
196199
<FsCheckVersion>2.14.3</FsCheckVersion>
200+
<CommandLineParserVersion>2.9.1</CommandLineParserVersion>
197201
<!-- Android gRPC client tests -->
198202
<GoogleProtobufVersion>3.19.4</GoogleProtobufVersion>
199203
<GrpcAspNetCoreVersion>2.46.0</GrpcAspNetCoreVersion>
@@ -203,6 +207,9 @@
203207
<GrpcDotnetClientVersion>2.45.0</GrpcDotnetClientVersion>
204208
<GrpcToolsVersion>2.45.0</GrpcToolsVersion>
205209
<CompilerPlatformTestingVersion>1.1.2-beta1.23323.1</CompilerPlatformTestingVersion>
210+
<CompilerPlatformTestingDiffPlexVersion>1.7.2</CompilerPlatformTestingDiffPlexVersion>
211+
<CompilerPlatformTestingMicrosoftVisualBasicVersion>10.2.0</CompilerPlatformTestingMicrosoftVisualBasicVersion>
212+
<CompilerPlatformTestingMicrosoftVisualStudioCompositionVersion>17.0.46</CompilerPlatformTestingMicrosoftVisualStudioCompositionVersion>
206213
<!-- Docs -->
207214
<MicrosoftPrivateIntellisenseVersion>8.0.0-preview-20230918.1</MicrosoftPrivateIntellisenseVersion>
208215
<!-- Mono Cecil -->

‎eng/testing/xunit/xunit.targets‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
<Project>
2-
<ItemGroup>
3-
<!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
4-
<PackageReference Include="NETStandard.Library"
5-
Version="$(NetStandardLibraryVersion)"
6-
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
7-
</ItemGroup>
8-
92
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
103
<AutoGenerateBindingRedirects Condition="'$(AutoGenerateBindingRedirects)' == ''">true</AutoGenerateBindingRedirects>
114
<GenerateBindingRedirectsOutputType Condition="'$(GenerateBindingRedirectsOutputType)' == ''">true</GenerateBindingRedirectsOutputType>

‎src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
28-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
28+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

‎src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="FluentAssertions" Version="6.0.0-alpha0002" />
18+
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
19+
1920
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
2021
<PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
21-
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="5.0.1" />
22+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />
2223

2324
<ProjectReference Include="$(ToolsProjectRoot)illink/test/Mono.Linker.Tests.Cases/**/*.csproj" />
2425
<ProjectReference Include="$(ToolsProjectRoot)illink/test/Mono.Linker.Tests.Cases.Expectations/Mono.Linker.Tests.Cases.Expectations.csproj" />

‎src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Condition="'$(EnableDiaSymReaderUse)' == 'true'" Include="Microsoft.DiaSymReader">
32-
<Version>1.4.0</Version>
33-
</PackageReference>
31+
<PackageReference Condition="'$(EnableDiaSymReaderUse)' == 'true'" Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
3432
</ItemGroup>
3533

3634
<ItemGroup>

‎src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@
1515
<ProjectReference Include="..\..\managed\Microsoft.NET.HostModel\Microsoft.NET.HostModel.csproj" />
1616
</ItemGroup>
1717

18-
<ItemGroup>
19-
<PackageReference Include="Microsoft.Win32.Registry" Version="4.3.0" />
20-
</ItemGroup>
21-
2218
</Project>

‎src/libraries/Common/tests/TestUtilities/TestUtilities.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@
108108
<PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" />
109109
</ItemGroup>
110110
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
111-
<!-- Upgrade the NetStandard.Library transitive xunit dependency to avoid 1.x NS dependencies. -->
112-
<PackageReference Include="NETStandard.Library" Version="$(NetStandardLibraryVersion)" />
113111
<!-- Use the arcade fork of xunit.assert for AOT-compat -->
114112
<PackageReference Include="Microsoft.DotNet.XUnitAssert" Version="$(MicrosoftDotNetXUnitAssertVersion)" />
115113
</ItemGroup>

‎src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" />
2222
<PackageReference Include="xunit.assert" Version="$(XUnitVersion)" />
2323
<PackageReference Include="xunit.extensibility.core" Version="$(XUnitVersion)" />
24-
25-
<!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
26-
<PackageReference Include="NETStandard.Library"
27-
Version="$(NetStandardLibraryVersion)"
28-
PrivateAssets="all"
29-
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
3024
</ItemGroup>
3125

3226
</Project>

‎src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
55
<EnableDefaultItems>true</EnableDefaultItems>
66
<NoWarn>$(NoWarn);CS8002</NoWarn>
7+
8+
<!-- third party DI containers bring in NS1.x dependencies -->
9+
<FlagNetStandard1XDependencies>false</FlagNetStandard1XDependencies>
710
</PropertyGroup>
811

912
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->

0 commit comments

Comments
 (0)