Skip to content

Commit 405da67

Browse files
tannergoodingtannergooding
authored
Add a System.Runtime.Experimental package so users can still use the generic math preview (#55678)
* Add a System.Runtime.Experimental package so users can still use the generic math preview This reverts commit f6eb259. * Simplify S.R.Experimental so it only produces a ref and its build version is 100 higher * Ensure a nuget package is being produced and resolve PR feedback * Update src/libraries/System.Runtime.Experimental/Directory.Build.props * Add a reference to System.Runtime.Experimental so mono can build * Disable System.Runtime.Experimental.Tests on WASM AOT
1 parent e983168 commit 405da67

File tree

11 files changed

+211
-12
lines changed

11 files changed

+211
-12
lines changed

‎src/coreclr/clr.featuredefines.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<FeaturePerfTracing>true</FeaturePerfTracing>
1010
<FeatureTypeEquivalence>true</FeatureTypeEquivalence>
1111
<FeatureBasicFreeze>true</FeatureBasicFreeze>
12-
<FeatureGenericMath>false</FeatureGenericMath>
12+
<FeatureGenericMath>true</FeatureGenericMath>
1313
<ProfilingSupportedBuild>true</ProfilingSupportedBuild>
1414
</PropertyGroup>
1515

‎src/libraries/Directory.Build.targets‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<NativeBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrentBuildSettings)'))</NativeBinDir>
2525
<NetCoreAppCurrentTestHostPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)'))</NetCoreAppCurrentTestHostPath>
2626
<NetCoreAppCurrentTestHostSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)'))</NetCoreAppCurrentTestHostSharedFrameworkPath>
27-
27+
2828
<SymbolPackageOutputPath>$(PackageOutputPath)</SymbolPackageOutputPath>
2929

3030
<NoWarn Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0')))">$(NoWarn);nullable</NoWarn>
@@ -282,10 +282,14 @@
282282
</Choose>
283283

284284
<Target Name="LibIntellisenseDocs" Condition="'$(IncludeBuildOutput)' == 'true'">
285+
<PropertyGroup>
286+
<_intellisenseRootFolder>$(BuildOutputTargetFolder)</_intellisenseRootFolder>
287+
<_intellisenseRootFolder Condition="'$(_intellisenseRootFolder)' == ''">lib</_intellisenseRootFolder>
288+
</PropertyGroup>
285289
<ItemGroup>
286290
<TfmSpecificPackageFile Include="$(XmlDocFileRoot)1033\$(TargetName).xml"
287291
Condition="Exists('$(XmlDocFileRoot)1033\$(TargetName).xml')"
288-
PackagePath="lib/$(TargetFramework)" />
292+
PackagePath="$(_intellisenseRootFolder)/$(TargetFramework)" />
289293
</ItemGroup>
290294
</Target>
291295

@@ -294,8 +298,8 @@
294298
</PropertyGroup>
295299

296300
<ItemGroup>
297-
<!-- Ensure AnalyzerReference items are restored and built
298-
The target framework of Analyzers has no relationship to that of the refrencing project,
301+
<!-- Ensure AnalyzerReference items are restored and built
302+
The target framework of Analyzers has no relationship to that of the refrencing project,
299303
so we don't apply TargetFramework filters nor do we pass in TargetFramework.
300304
When BuildProjectReferences=false we make sure to set BuildReference=false to make
301305
sure not to try to call GetTargetPath in the outerbuild of the analyzer project. -->
@@ -313,9 +317,9 @@
313317

314318
<ItemGroup>
315319
<Content Include="@(_AnalyzerFile)" Pack="True" Condition="!%(_AnalyzerFile.IsSymbol)" />
316-
<!-- Symbols don't honor PackagePath. By default they are placed in lib/%(TargetFramework).
320+
<!-- Symbols don't honor PackagePath. By default they are placed in lib/%(TargetFramework).
317321
Pack does honor TargetPath and does Path.Combine("lib/%(TargetFramework)", "%(TargetPath)"),
318-
so a rooted path value for TargetPath will override lib.
322+
so a rooted path value for TargetPath will override lib.
319323
https://github.com/NuGet/Home/issues/10860 -->
320324
<_TargetPathsToSymbols Include="@(_AnalyzerFile)" TargetPath="/%(_AnalyzerFile.PackagePath)" Condition="%(_AnalyzerFile.IsSymbol)" />
321325
</ItemGroup>
@@ -331,7 +335,7 @@
331335
<_AnalyzerPackFile Include="@(_TargetPathsToSymbols)" IsSymbol="true" />
332336
<_AnalyzerPackFile PackagePath="$(_analyzerPath)/%(TargetPath)" />
333337
</ItemGroup>
334-
<Error Condition="'%(_AnalyzerPackFile.TargetFramework)' != 'netstandard2.0'"
338+
<Error Condition="'%(_AnalyzerPackFile.TargetFramework)' != 'netstandard2.0'"
335339
Text="Analyzers must only target netstandard2.0 since they run in the compiler which targets netstandard2.0. The following files were found to target '%(_AnalyzerPackFile.TargetFramework)': @(_AnalyzerPackFile)" />
336340
</Target>
337341

‎src/libraries/System.Runtime.Experimental/Directory.Build.props‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<Import Project="..\Directory.Build.props" />
3+
<PropertyGroup>
4+
<!-- Disable all binplacing since this assembly will clash with the real System.Runtime -->
5+
<EnableBinPlacing>false</EnableBinPlacing>
6+
<StrongNameKeyId>Microsoft</StrongNameKeyId>
7+
</PropertyGroup>
8+
</Project>

‎src/libraries/System.Runtime.Experimental/NuGet.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<configuration>
2+
<!-- This disables restore in VS for projects that target platform specific target frameworks older than net5.0. -->
3+
<packageRestore>
4+
<!-- The 'automatic' key is set to True when the "Automatically check for missing packages during
5+
build in Visual Studio" checkbox is set. Clearing the box sets this to False and disables
6+
automatic restore. -->
7+
<add key="automatic" value="False" />
8+
<!-- The 'enabled' key is True when the "Allow NuGet to download missing packages" checkbox is set.
9+
Clearing the box sets this to False, disabling command-line, automatic, and MSBuild-integrated restore. -->
10+
<add key="enabled" value="False" />
11+
</packageRestore>
12+
</configuration>

‎src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}"
3+
EndProject
4+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental", "ref\System.Runtime.Experimental.csproj", "{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}"
5+
EndProject
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental.Tests", "tests\System.Runtime.Experimental.Tests.csproj", "{4EE36055-AD7C-4779-B3F6-08687960DCC3}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BDCC9986-D51F-48D9-9650-388E172CD91E}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4F10B6C-21C0-4C9D-8909-76FC52145120}"
11+
EndProject
12+
Global
13+
GlobalSection(NestedProjects) = preSolution
14+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
15+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
16+
{4EE36055-AD7C-4779-B3F6-08687960DCC3} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
17+
EndGlobalSection
18+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
19+
Debug|Any CPU = Debug|Any CPU
20+
Debug|x64 = Debug|x64
21+
Debug|x86 = Debug|x86
22+
Release|Any CPU = Release|Any CPU
23+
Release|x64 = Release|x64
24+
Release|x86 = Release|x86
25+
Checked|Any CPU = Checked|Any CPU
26+
Checked|x64 = Checked|x64
27+
Checked|x86 = Checked|x86
28+
EndGlobalSection
29+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|Any CPU.ActiveCfg = Debug|x64
31+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|Any CPU.Build.0 = Debug|x64
32+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x64.ActiveCfg = Debug|x64
33+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x64.Build.0 = Debug|x64
34+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x86.ActiveCfg = Debug|x86
35+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x86.Build.0 = Debug|x86
36+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|Any CPU.ActiveCfg = Release|x64
37+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|Any CPU.Build.0 = Release|x64
38+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x64.ActiveCfg = Release|x64
39+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x64.Build.0 = Release|x64
40+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x86.ActiveCfg = Release|x86
41+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x86.Build.0 = Release|x86
42+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|Any CPU.ActiveCfg = Checked|x64
43+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|Any CPU.Build.0 = Checked|x64
44+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x64.ActiveCfg = Checked|x64
45+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x64.Build.0 = Checked|x64
46+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x86.ActiveCfg = Checked|x86
47+
{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x86.Build.0 = Checked|x86
48+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x64.ActiveCfg = Debug|Any CPU
51+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x64.Build.0 = Debug|Any CPU
52+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x86.ActiveCfg = Debug|Any CPU
53+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x86.Build.0 = Debug|Any CPU
54+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|Any CPU.Build.0 = Release|Any CPU
56+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x64.ActiveCfg = Release|Any CPU
57+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x64.Build.0 = Release|Any CPU
58+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x86.ActiveCfg = Release|Any CPU
59+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x86.Build.0 = Release|Any CPU
60+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
61+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|x64.ActiveCfg = Debug|Any CPU
62+
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|x86.ActiveCfg = Debug|Any CPU
63+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
65+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x64.ActiveCfg = Debug|Any CPU
66+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x64.Build.0 = Debug|Any CPU
67+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x86.ActiveCfg = Debug|Any CPU
68+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x86.Build.0 = Debug|Any CPU
69+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
70+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|Any CPU.Build.0 = Release|Any CPU
71+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x64.ActiveCfg = Release|Any CPU
72+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x64.Build.0 = Release|Any CPU
73+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x86.ActiveCfg = Release|Any CPU
74+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x86.Build.0 = Release|Any CPU
75+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
76+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|x64.ActiveCfg = Debug|Any CPU
77+
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|x86.ActiveCfg = Debug|Any CPU
78+
EndGlobalSection
79+
GlobalSection(SolutionProperties) = preSolution
80+
HideSolutionNode = FALSE
81+
EndGlobalSection
82+
GlobalSection(ExtensibilityGlobals) = postSolution
83+
SolutionGuid = {19706846-1F47-42ED-B649-B0982EE96E6B}
84+
EndGlobalSection
85+
EndGlobal

‎src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<AssemblyName>System.Runtime</AssemblyName>
4+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5+
<FeatureGenericMath>true</FeatureGenericMath>
6+
<!-- It is a core assembly because it defines System.Object so we need to pass RuntimeMetadataVersion to the compiler -->
7+
<RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion>
8+
<!-- disable warnings about obsolete APIs,
9+
Remove warning disable when nullable attributes are respected,
10+
Type has no accessible constructors which use only CLS-compliant types -->
11+
<NoWarn>$(NoWarn);0809;0618;CS8614;CS3015;NU5131</NoWarn>
12+
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
13+
<Nullable>enable</Nullable>
14+
</PropertyGroup>
15+
<PropertyGroup Condition="'$(FeatureGenericMath)' == 'true'">
16+
<!-- Place this assembly in the nuget ref folder -->
17+
<BuildOutputTargetFolder>ref</BuildOutputTargetFolder>
18+
<DefineConstants>$(DefineConstants);FEATURE_GENERIC_MATH</DefineConstants>
19+
<IsPackable>true</IsPackable>
20+
<PackageDescription>Exposes new experimental APIs from System.Runtime</PackageDescription>
21+
<PackageId>$(MSBuildProjectName)</PackageId>
22+
</PropertyGroup>
23+
<ItemGroup>
24+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.cs" />
25+
</ItemGroup>
26+
<Target Name="_ExperimentalUpdateFileVersion"
27+
AfterTargets="_InitializeAssemblyVersion">
28+
<PropertyGroup>
29+
<_FileVersionMaj>$(FileVersion.Split('.')[0])</_FileVersionMaj>
30+
<_FileVersionMin>$(FileVersion.Split('.')[1])</_FileVersionMin>
31+
<_FileVersionBld>$(FileVersion.Split('.')[2])</_FileVersionBld>
32+
<_FileVersionRev>$(FileVersion.Split('.')[3])</_FileVersionRev>
33+
<FileVersion>$(_FileVersionMaj).$(_FileVersionMin).$([MSBuild]::Add($(_FileVersionBld), 100)).$(_FileVersionRev)</FileVersion>
34+
</PropertyGroup>
35+
</Target>
36+
</Project>

‎src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
4+
<FeatureGenericMath>true</FeatureGenericMath>
5+
<NoWarn>$(NoWarn),1718,SYSLIB0013</NoWarn>
6+
<TestRuntime>true</TestRuntime>
7+
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
8+
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
9+
<Nullable>disable</Nullable>
10+
<!-- Disable nullability public only feature for NullabilityInfoContextTests -->
11+
<Features>$(Features.Replace('nullablePublicOnly', '')</Features>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<DefineConstants Condition="'$(FeatureGenericMath)' == 'true'">$(DefineConstants);FEATURE_GENERIC_MATH</DefineConstants>
15+
</PropertyGroup>
16+
<ItemGroup>
17+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\ByteTests.cs" />
18+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\CharTests.cs" />
19+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\Int16Tests.cs" />
20+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\Int32Tests.cs" />
21+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\Int64Tests.cs" />
22+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\IntPtrTests.cs" />
23+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\SByteTests.cs" />
24+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\UInt16Tests.cs" />
25+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\UInt32Tests.cs" />
26+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\UInt64Tests.cs" />
27+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\UIntPtrTests.cs" />
28+
</ItemGroup>
29+
<ItemGroup Condition="'$(FeatureGenericMath)' == 'true'">
30+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\ByteTests.GenericMath.cs" />
31+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\CharTests.GenericMath.cs" />
32+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\GenericMathHelpers.cs" />
33+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\Int16Tests.GenericMath.cs" />
34+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\Int32Tests.GenericMath.cs" />
35+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\Int64Tests.GenericMath.cs" />
36+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\IntPtrTests.GenericMath.cs" />
37+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\SByteTests.GenericMath.cs" />
38+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\UInt16Tests.GenericMath.cs" />
39+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\UInt32Tests.GenericMath.cs" />
40+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\UInt64Tests.GenericMath.cs" />
41+
<Compile Include="$(LibrariesProjectRoot)System.Runtime\tests\System\UIntPtrTests.GenericMath.cs" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Experimental\ref\System.Runtime.Experimental.csproj" />
45+
<ProjectReference Include="$(CommonTestPath)TestUtilities.Unicode\TestUtilities.Unicode.csproj" />
46+
</ItemGroup>
47+
</Project>

‎src/libraries/System.Runtime/src/System.Runtime.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3+
<!-- Pull type forwards from the experimental ref assembly so we only need to maintain a single src project -->
4+
<ContractProject>$(LibrariesProjectRoot)System.Runtime.Experimental\ref\System.Runtime.Experimental.csproj</ContractProject>
35
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
46
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
57
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
8-
<!-- Compiler throws error if you try to use System.Void and instructs you to use void keyword instead. So we have manually added a typeforward for this type. -->
10+
<!-- Compiler throws error if you try to use System.Void and instructs you to use void keyword instead. So we have manually added a typeforward for this type. -->
911
<GenFacadesOmitType Include="System.Void" />
1012
</ItemGroup>
1113
<ItemGroup>

‎src/libraries/libraries-packages.proj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<ItemGroup>
44
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
55

6+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime.Experimental\ref\System.Runtime.Experimental.csproj"
7+
Condition="'$(BuildAllConfigurations)' == 'true'" />
68
<ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" />
79
<ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.*proj"
810
Condition="'$(BuildAllConfigurations)' == 'true'"

‎src/libraries/tests.proj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj" />
206206
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj" />
207207
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj" />
208-
208+
209209
<!-- App Crash https://github.com/dotnet/runtime/issues/53624 -->
210210
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj" />
211211
</ItemGroup>
@@ -228,7 +228,7 @@
228228
<!-- Crashes on CI but passes locally https://github.com/dotnet/runtime/issues/52615 -->
229229
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\Interpreter\iOS.Simulator.Interpreter.Test.csproj" />
230230
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\InvariantCultureOnlyMode\iOS.Simulator.InvariantCultureOnlyMode.Test.csproj" />
231-
231+
232232
<!-- No current support for AOT+LLVM on catalyst, so skip functional test -->
233233
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\AOT-LLVM\**\*.Test.csproj" />
234234
</ItemGroup>
@@ -278,6 +278,9 @@
278278

279279
<!-- https://github.com/dotnet/runtime/issues/38433 -->
280280
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj" />
281+
282+
<!-- Issue: https://github.com/dotnet/runtime/issues/55767 -->
283+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Experimental\tests\System.Runtime.Experimental.Tests.csproj" />
281284
</ItemGroup>
282285

283286
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true'">

0 commit comments

Comments
 (0)