Skip to content

Compile using ref assemblies #2483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 11, 2019
Merged

Compile using ref assemblies #2483

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd603b4
Compile using ref assemblies
Oct 10, 2019
dad21fa
Use updated target from AspNetCore
Oct 10, 2019
4ff68a5
Generate ref assemblies for .NET framework
Oct 10, 2019
e4d3f99
Feedback
Oct 10, 2019
82bd03d
add comments
Oct 10, 2019
fd8dcd6
Remove dummy package
Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/ProjectReferences.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<ProjectReferenceProvider Include="Microsoft.Extensions.Logging.Analyzers" ProjectPath="$(RepoRoot)src\Logging\Logging.Analyzers\src\Microsoft.Extensions.Logging.Analyzers.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Logging.Testing" ProjectPath="$(RepoRoot)src\Logging\Logging.Testing\src\Microsoft.Extensions.Logging.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Analyzer.Testing" ProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Analyzer.Testing\src\Microsoft.AspNetCore.Analyzer.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.Abstractions" ProjectPath="$(RepoRoot)src\Caching\Abstractions\src\Microsoft.Extensions.Caching.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\Caching\Abstractions\ref\Microsoft.Extensions.Caching.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.Memory" ProjectPath="$(RepoRoot)src\Caching\Memory\src\Microsoft.Extensions.Caching.Memory.csproj" RefProjectPath="$(RepoRoot)src\Caching\Memory\ref\Microsoft.Extensions.Caching.Memory.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" RefProjectPath="$(RepoRoot)src\Caching\SqlServer\ref\Microsoft.Extensions.Caching.SqlServer.csproj" />
Expand Down Expand Up @@ -57,6 +56,7 @@
<ProjectReferenceProvider Include="Microsoft.Extensions.Options.DataAnnotations" ProjectPath="$(RepoRoot)src\Options\DataAnnotations\src\Microsoft.Extensions.Options.DataAnnotations.csproj" RefProjectPath="$(RepoRoot)src\Options\DataAnnotations\ref\Microsoft.Extensions.Options.DataAnnotations.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Options" ProjectPath="$(RepoRoot)src\Options\Options\src\Microsoft.Extensions.Options.csproj" RefProjectPath="$(RepoRoot)src\Options\Options\ref\Microsoft.Extensions.Options.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Primitives" ProjectPath="$(RepoRoot)src\Primitives\src\Microsoft.Extensions.Primitives.csproj" RefProjectPath="$(RepoRoot)src\Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" RefProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Testing\ref\Microsoft.AspNetCore.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" RefProjectPath="$(RepoRoot)src\WebEncoders\ref\Microsoft.Extensions.WebEncoders.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion eng/targets/ReferenceAssembly.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

</Target>

<Target Name="_GenerateProjectSourceInner" Returns="@(ProjectListContent)" DependsOnTargets="Build" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
<Target Name="_GenerateProjectSourceInner" Returns="@(ProjectListContent)" DependsOnTargets="Build" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework' OR '$(GenerateFrameworkReferenceAssembly)' == 'true'">
<PropertyGroup>
<_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/</_RefSourceOutputPath>
<_RefSourceFileName>$(AssemblyName).$(TargetFramework).cs</_RefSourceFileName>
Expand Down
127 changes: 105 additions & 22 deletions eng/targets/ResolveReferences.targets
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(SharedSourceRoot)ProviderAliasUtilities\*.cs" />

<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
</ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@
<IsShipping>true</IsShipping>
</PropertyGroup>

<ItemGroup>
<InternalsVisibleTo Include="Microsoft.Extensions.Logging.Configuration" />
</ItemGroup>

<ItemGroup>
<Compile Include="../../shared/*.cs" />
<Compile Include="$(SharedSourceRoot)ProviderAliasUtilities\*.cs" />

<Reference Include="Microsoft.Extensions.Configuration.Binder" />
<Reference Include="Microsoft.Extensions.DependencyInjection" />
Expand Down
7 changes: 7 additions & 0 deletions ...red/src/ProviderAliasUtilities/Microsoft.Extensions.ProviderAliasUtilities.Sources.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
Copy link

@dougbu dougbu Oct 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine but only if it is not creating a new (useless) package

Copy link
Author

@JunTaoLuo JunTaoLuo Oct 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is being produced. Will remove.

<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

<Target Name="Compile" />
<Target Name="CopyFilesToOutputDirectory" />
</Project>
2 changes: 1 addition & 1 deletion ...ing/Logging/src/ProviderAliasUtilities.cs → ...rAliasUtilities/ProviderAliasUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Microsoft.Extensions.Logging
{
internal class ProviderAliasUtilities
internal static class ProviderAliasUtilities
{
private const string AliasAttibuteTypeFullName = "Microsoft.Extensions.Logging.ProviderAliasAttribute";
private const string AliasAttibuteAliasProperty = "Alias";
Expand Down
32 changes: 32 additions & 0 deletions src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<Compile Include="Microsoft.AspNetCore.Testing.netstandard2.0.cs" />
<Reference Include="Microsoft.Win32.Registry" />
<Reference Include="System.ValueTuple" />
<Reference Include="xunit.assert" />
<Reference Include="xunit.extensibility.execution" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
<Compile Include="Microsoft.AspNetCore.Testing.net46.cs" />
<Reference Include="Microsoft.Win32.Registry" />
<Reference Include="System.ValueTuple" />
<Reference Include="xunit.assert" />
<Reference Include="xunit.extensibility.execution" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Numerics" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="mscorlib" />
</ItemGroup>
</Project>
Loading