Skip to content

Commit 2f6cdcf

Browse files
author
John Luo
committed
More merge fixes
1 parent 793857f commit 2f6cdcf

File tree

10 files changed

+45
-34
lines changed

10 files changed

+45
-34
lines changed

‎src/Configuration.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.Extensions.Configuration.KeyPerFile.netstandard2.0.cs" />
8-
<Reference Include="Microsoft.Extensions.Configuration" />
9-
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
9+
<Reference Include="Microsoft.Extensions.Configuration" />
10+
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
1011
</ItemGroup>
1112
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1213
<Compile Include="Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp.cs" />
13-
<Reference Include="Microsoft.Extensions.Configuration" />
14-
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
14+
<Reference Include="Microsoft.Extensions.Configuration" />
15+
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
1516
</ItemGroup>
1617
</Project>

‎src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.Extensions.FileProviders.Embedded.netstandard2.0.cs" />
8-
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
9+
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
10+
<InternalsVisibleTo Include="Microsoft.Extensions.FileProviders.Embedded.Tests" Key="" />
911
</ItemGroup>
1012
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1113
<Compile Include="Microsoft.Extensions.FileProviders.Embedded.netcoreapp.cs" />
12-
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
14+
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
15+
<InternalsVisibleTo Include="Microsoft.Extensions.FileProviders.Embedded.Tests" Key="" />
1316
</ItemGroup>
1417
</Project>

‎src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netstandard2.0.cs" />
8-
99
</ItemGroup>
1010
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1111
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp.cs" />
12-
1312
</ItemGroup>
1413
</Project>

‎src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.netstandard2.0.cs" />
8-
<Reference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
9-
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
10-
<Reference Include="Microsoft.Extensions.Options" />
9+
<Reference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
10+
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
11+
<Reference Include="Microsoft.Extensions.Options" />
12+
<InternalsVisibleTo Include="Microsoft.Extensions.Diagnostics.HealthChecks.Tests" Key="" />
1113
</ItemGroup>
1214
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1315
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp.cs" />
14-
<Reference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
15-
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
16-
<Reference Include="Microsoft.Extensions.Options" />
16+
<Reference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
17+
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
18+
<Reference Include="Microsoft.Extensions.Options" />
19+
<InternalsVisibleTo Include="Microsoft.Extensions.Diagnostics.HealthChecks.Tests" Key="" />
1720
</ItemGroup>
1821
</Project>

‎src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.JSInterop.netstandard2.0.cs" />
8-
<Reference Include="System.Text.Json" />
9+
<Reference Include="System.Text.Json" />
10+
<InternalsVisibleTo Include="Microsoft.JSInterop.Tests" Key="" />
911
</ItemGroup>
1012
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1113
<Compile Include="Microsoft.JSInterop.netcoreapp.cs" />
12-
14+
<InternalsVisibleTo Include="Microsoft.JSInterop.Tests" Key="" />
1315
</ItemGroup>
1416
</Project>

‎src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.Extensions.Localization.Abstractions.netstandard2.0.cs" />
8-
99
</ItemGroup>
1010
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1111
<Compile Include="Microsoft.Extensions.Localization.Abstractions.netcoreapp.cs" />
12-
1312
</ItemGroup>
1413
</Project>

‎src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.Extensions.Localization.netstandard2.0.cs" />
8-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
9-
<Reference Include="Microsoft.Extensions.Options" />
10-
<Reference Include="Microsoft.Extensions.Localization.Abstractions" />
11-
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
9+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
10+
<Reference Include="Microsoft.Extensions.Options" />
11+
<Reference Include="Microsoft.Extensions.Localization.Abstractions" />
12+
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
13+
<InternalsVisibleTo Include="Microsoft.Extensions.Localization.Tests" Key="" />
1214
</ItemGroup>
1315
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1416
<Compile Include="Microsoft.Extensions.Localization.netcoreapp.cs" />
15-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
16-
<Reference Include="Microsoft.Extensions.Options" />
17-
<Reference Include="Microsoft.Extensions.Localization.Abstractions" />
18-
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
17+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
18+
<Reference Include="Microsoft.Extensions.Options" />
19+
<Reference Include="Microsoft.Extensions.Localization.Abstractions" />
20+
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
21+
<InternalsVisibleTo Include="Microsoft.Extensions.Localization.Tests" Key="" />
1922
</ItemGroup>
2023
</Project>

‎src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.Extensions.ObjectPool.netstandard2.0.cs" />
8-
9+
<InternalsVisibleTo Include="Microsoft.Extensions.ObjectPool.Tests" Key="" />
910
</ItemGroup>
1011
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1112
<Compile Include="Microsoft.Extensions.ObjectPool.netcoreapp.cs" />
12-
13+
<InternalsVisibleTo Include="Microsoft.Extensions.ObjectPool.Tests" Key="" />
1314
</ItemGroup>
1415
</Project>

‎src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" Link="Shared\CommandLineUtils\%(Filename)%(Extension)"/>
1313
<Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\*.cs" Link="Shared\ClosedGenericMatcher\%(Filename)%(Extension)"/>
1414
<Compile Include="$(SharedSourceRoot)CopyOnWriteDictionary\*.cs" Link="Shared\CopyOnWriteDictionary\%(Filename)%(Extension)"/>
15-
<Compile Include="$(SharedSourceRoot)runtime\**\*.cs" Link="Shared\runtime\%(Filename)%(Extension)"/>
1615
<Compile Include="$(SharedSourceRoot)HashCodeCombiner\**\*.cs" Link="Shared\HashCodeCombiner\%(Filename)%(Extension)"/>
1716
<Compile Include="$(SharedSourceRoot)HostFactoryResolver\**\*.cs" Link="Shared\HostFactoryResolver\%(Filename)%(Extension)"/>
1817
<Compile Include="$(SharedSourceRoot)runtime\*.cs" Link="Shared\runtime\%(Filename)%(Extension)"/>

‎src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
56
</PropertyGroup>
67
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
78
<Compile Include="Microsoft.Extensions.WebEncoders.netstandard2.0.cs" />
8-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
9-
<Reference Include="Microsoft.Extensions.Options" />
10-
<Reference Include="System.Text.Encodings.Web" />
9+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
10+
<Reference Include="Microsoft.Extensions.Options" />
11+
<Reference Include="System.Text.Encodings.Web" />
1112
</ItemGroup>
1213
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
1314
<Compile Include="Microsoft.Extensions.WebEncoders.netcoreapp.cs" />
14-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
15-
<Reference Include="Microsoft.Extensions.Options" />
15+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
16+
<Reference Include="Microsoft.Extensions.Options" />
1617
</ItemGroup>
1718
</Project>

0 commit comments

Comments
 (0)