Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit f48d483

Browse files
committed
Make DiagnosticsSource ref assembly consistent
The DiagnosticsSource ref didn't have all the same target frameworks as the implementation so that was fixed. It should be noted that the ref assemblies aren't currently included in the package only the libs are but it is good to keep them consistent as our testing does use them.
1 parent ed06384 commit f48d483

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

src/System.Diagnostics.DiagnosticSource/ref/Configurations.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<PackageConfigurations>
5-
netstandard1.0;
5+
netstandard1.1;
6+
netstandard1.3;
67
net45;
78
</PackageConfigurations>
89
<BuildConfigurations>

src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@
1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
1414
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
1515
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
16-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.0-Debug|AnyCPU'" />
17-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.0-Release|AnyCPU'" />
16+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Debug|AnyCPU'" />
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Release|AnyCPU'" />
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" />
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" />
1820
<ItemGroup>
1921
<Compile Include="System.Diagnostics.DiagnosticSource.cs" />
2022
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetGroup)' != 'netstandard1.0'">
23+
<ItemGroup Condition="'$(TargetGroup)' != 'netstandard1.1'">
2224
<Compile Include="System.Diagnostics.DiagnosticSourceActivity.cs" />
2325
</ItemGroup>
2426
<ItemGroup Condition="'$(TargetGroup)' == 'net45' OR '$(TargetGroup)' == 'netfx'">
2527
<Reference Include="mscorlib" />
2628
</ItemGroup>
27-
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.0'">
29+
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.1' or '$(TargetGroup)' == 'netstandard1.3'">
2830
<Reference Include="System.Runtime" />
2931
</ItemGroup>
3032
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

src/System.Diagnostics.DiagnosticSource/src/MatchingRefApiCompatBaseline.netstandard1.3.txt

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

0 commit comments

Comments
 (0)