Skip to content

Commit 8471828

Browse files
author
Oren Novotny
authored
Merge pull request #743 from dotnet/ix-refs2
Ix Providers refs
2 parents 89cde7a + df41e6d commit 8471828

File tree

17 files changed

+95
-95
lines changed

17 files changed

+95
-95
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ local.properties
1616
.settings/
1717
.loadpath
1818

19+
*.binlog
20+
1921
# External tool builders
2022
.externalToolBuilders/
2123

‎Ix.NET/Source/Directory.build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<Project>
1+
<Project>
22

33
<PropertyGroup>
4-
<Product>$(AssemblyName) ($(TargetFramework))</Product>
54
<Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
65
<MinClientVersion>2.12</MinClientVersion>
76
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎Ix.NET/Source/Directory.build.targets‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,45 @@
1-
<Project>
1+
<Project>
22
<!-- This has to be set in targets as the default props will overwrite -->
33
<PropertyGroup>
44
<DebugType Condition="'$(IsTestProject)' != 'true'">embedded</DebugType>
55
</PropertyGroup>
66

77
<!-- This props all need to be set in targets as they depend on the values set earlier -->
88
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
9-
<DefineConstants>$(DefineConstants);NO_ARRAY_EMPTY;NO_CODE_COVERAGE_ATTRIBUTE;CRIPPLED_REFLECTION;PLIB;SIGNED</DefineConstants>
9+
<DefineConstants>$(DefineConstants);NO_ARRAY_EMPTY;NO_CODE_COVERAGE_ATTRIBUTE;CRIPPLED_REFLECTION</DefineConstants>
1010
</PropertyGroup>
1111
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
12-
<DefineConstants>$(DefineConstants);NO_CODE_COVERAGE_ATTRIBUTE;CRIPPLED_REFLECTION;PLIB;SIGNED</DefineConstants>
13-
</PropertyGroup>
14-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
15-
<DefineConstants>$(DefineConstants);PLIB;SIGNED</DefineConstants>
12+
<DefineConstants>$(DefineConstants);NO_CODE_COVERAGE_ATTRIBUTE;CRIPPLED_REFLECTION</DefineConstants>
1613
</PropertyGroup>
1714
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
18-
<DefineConstants>$(DefineConstants);HAS_APTCA;NO_ARRAY_EMPTY;DESKTOPCLR;DESKTOPCLR45;SIGNED</DefineConstants>
15+
<DefineConstants>$(DefineConstants);NO_ARRAY_EMPTY</DefineConstants>
1916
</PropertyGroup>
20-
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
21-
<DefineConstants>$(DefineConstants);HAS_APTCA;DESKTOPCLR;DESKTOPCLR46;SIGNED</DefineConstants>
17+
18+
<PropertyGroup>
19+
<Product>$(AssemblyName) ($(TargetFramework))</Product>
2220
</PropertyGroup>
23-
21+
22+
<Target Name="GetRefsForPackage" BeforeTargets="_GetPackageFiles"
23+
Condition=" Exists('$(MSBuildThisFileDirectory)refs\$(MSBuildProjectName)\$(MSBuildProjectName).csproj') ">
24+
25+
<MSBuild Projects="$(MSBuildThisFileDirectory)refs\$(MSBuildProjectName)\$(MSBuildProjectName).csproj"
26+
Targets="_GetTargetFrameworksOutput">
27+
28+
<Output TaskParameter="TargetOutputs"
29+
ItemName="_RefTargetFrameworks" />
30+
</MSBuild>
31+
32+
<MSBuild Projects="$(MSBuildThisFileDirectory)refs\$(MSBuildProjectName)\$(MSBuildProjectName).csproj"
33+
Targets="_GetReferenceAssemblies"
34+
Properties="TargetFramework=%(_RefTargetFrameworks.Identity)">
35+
36+
<Output TaskParameter="TargetOutputs"
37+
ItemName="_refAssms" />
38+
</MSBuild>
39+
40+
<ItemGroup>
41+
<None Include="@(_refAssms)" PackagePath="ref/%(_refAssms.TargetFramework)" Pack="true" />
42+
</ItemGroup>
43+
44+
</Target>
2445
</Project>

‎Ix.NET/Source/Ix.NET.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@ EndProject
2929
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Interactive.Async.Tests", "System.Interactive.Async.Tests\System.Interactive.Async.Tests.csproj", "{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}"
3030
EndProject
3131
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Refs", "Refs", "{A3D72E6E-4ADA-42E0-8B2A-055B1F244281}"
32+
ProjectSection(SolutionItems) = preProject
33+
refs\Directory.build.props = refs\Directory.build.props
34+
EndProjectSection
3235
EndProject
3336
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Interactive", "refs\System.Interactive\System.Interactive.csproj", "{2EC0C302-B029-4DDB-AC91-000BF11006AD}"
3437
EndProject
38+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Interactive.Providers", "refs\System.Interactive.Providers\System.Interactive.Providers.csproj", "{5DF341BE-B369-4250-AFD4-604DE8C95E45}"
39+
EndProject
3540
Global
3641
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3742
Debug|Any CPU = Debug|Any CPU
@@ -66,6 +71,10 @@ Global
6671
{2EC0C302-B029-4DDB-AC91-000BF11006AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
6772
{2EC0C302-B029-4DDB-AC91-000BF11006AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
6873
{2EC0C302-B029-4DDB-AC91-000BF11006AD}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{5DF341BE-B369-4250-AFD4-604DE8C95E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{5DF341BE-B369-4250-AFD4-604DE8C95E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{5DF341BE-B369-4250-AFD4-604DE8C95E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{5DF341BE-B369-4250-AFD4-604DE8C95E45}.Release|Any CPU.Build.0 = Release|Any CPU
6978
EndGlobalSection
7079
GlobalSection(SolutionProperties) = preSolution
7180
HideSolutionNode = FALSE
@@ -74,6 +83,7 @@ Global
7483
{AFD2E6EC-C5B0-4276-A14A-467D786D0DDA} = {87534290-A7A6-47A4-9A3A-D0D21A9AD1D4}
7584
{172BD8C4-5C3E-4928-9D3F-746CF336FFEC} = {87534290-A7A6-47A4-9A3A-D0D21A9AD1D4}
7685
{2EC0C302-B029-4DDB-AC91-000BF11006AD} = {A3D72E6E-4ADA-42E0-8B2A-055B1F244281}
86+
{5DF341BE-B369-4250-AFD4-604DE8C95E45} = {A3D72E6E-4ADA-42E0-8B2A-055B1F244281}
7787
EndGlobalSection
7888
GlobalSection(ExtensibilityGlobals) = postSolution
7989
SolutionGuid = {9B5F6126-CBBA-4C3A-A3BB-26AFE56DABEC}

‎Ix.NET/Source/System.Interactive.Async.Providers/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,5 @@
44

55
[assembly: NeutralResourcesLanguage("en-US")]
66

7-
#if !PLIB
87
[assembly: ComVisible(false)]
9-
#endif
10-
118
[assembly: CLSCompliant(true)]
12-
13-
#if HAS_APTCA && NO_CODECOVERAGE
14-
[assembly: AllowPartiallyTrustedCallers]
15-
#endif

‎Ix.NET/Source/System.Interactive.Async/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,5 @@
44

55
[assembly: NeutralResourcesLanguage("en-US")]
66

7-
#if !PLIB
87
[assembly: ComVisible(false)]
9-
#endif
10-
118
[assembly: CLSCompliant(true)]
12-
13-
#if HAS_APTCA && NO_CODECOVERAGE
14-
[assembly: AllowPartiallyTrustedCallers]
15-
#endif
16-

‎Ix.NET/Source/System.Interactive.Providers/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
using System.Resources;
33
using System.Runtime.InteropServices;
44

5-
65
[assembly: NeutralResourcesLanguage("en-US")]
76

8-
#if !PLIB
97
[assembly: ComVisible(false)]
10-
#endif
11-
128
[assembly: CLSCompliant(true)]
13-
14-
#if HAS_APTCA && NO_CODECOVERAGE
15-
[assembly: AllowPartiallyTrustedCallers]
16-
#endif

‎Ix.NET/Source/System.Interactive.Providers/QueryableEx.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2425,6 +2425,7 @@ public static IEnumerable<TSource> Scan<TSource>(IEnumerable<TSource> source, Fu
24252425
}
24262426
#pragma warning restore 1591
24272427

2428+
#if !(REF_ASSM && (NETCOREAPP2_0 || NETSTANDARD2_1))
24282429
/// <summary>
24292430
/// Returns a specified number of contiguous elements from the end of the sequence.
24302431
/// </summary>
@@ -2497,6 +2498,8 @@ public static IEnumerable<TSource> SkipLast<TSource>(IEnumerable<TSource> source
24972498
}
24982499
#pragma warning restore 1591
24992500

2501+
#endif
2502+
25002503
/// <summary>
25012504
/// Repeats and concatenates the source sequence infinitely.
25022505
/// </summary>

‎Ix.NET/Source/System.Interactive.Providers/System.Interactive.Providers.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,4 @@
1919
<PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
2020
</ItemGroup>
2121

22-
2322
</Project>

‎Ix.NET/Source/System.Interactive.Providers/System.Interactive.Providers.v3.ncrunchproject‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)