Skip to content
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

Jump to bottom

Re-introduce INTERNALS_INVISIBLE #1105

Merged
merged 1 commit into from
Jul 31, 2019
Merged

Re-introduce INTERNALS_INVISIBLE #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 25 additions & 1 deletion EntityFramework.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.ProviderAgn
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Entity.Build.Tasks", "src\Microsoft.Data.Entity.Build.Tasks\Microsoft.Data.Entity.Build.Tasks.csproj", "{B8DB9CC0-822A-423C-A5BE-28C19F94899B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ef6", "src\ef6\ef6.csproj", "{7F79B619-FA4D-46D7-876E-FD06C22465DB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ef6", "src\ef6\ef6.csproj", "{7F79B619-FA4D-46D7-876E-FD06C22465DB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.InternalsVisibleTo", "src\EntityFramework\EntityFramework.InternalsVisibleTo.csproj", "{A883C5CA-53F5-41FA-9123-728F94CC6599}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InternalsVisibleTo", "InternalsVisibleTo", "{A92C22F0-200B-4C61-8544-0EAE620B8006}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.SqlServer.InternalsVisibleTo", "src\EntityFramework.SqlServer\EntityFramework.SqlServer.InternalsVisibleTo.csproj", "{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.SqlServerCompact.InternalsVisibleTo", "src\EntityFramework.SqlServerCompact\EntityFramework.SqlServerCompact.InternalsVisibleTo.csproj", "{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -85,6 +93,18 @@ Global
{7F79B619-FA4D-46D7-876E-FD06C22465DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F79B619-FA4D-46D7-876E-FD06C22465DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F79B619-FA4D-46D7-876E-FD06C22465DB}.Release|Any CPU.Build.0 = Release|Any CPU
{A883C5CA-53F5-41FA-9123-728F94CC6599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A883C5CA-53F5-41FA-9123-728F94CC6599}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A883C5CA-53F5-41FA-9123-728F94CC6599}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A883C5CA-53F5-41FA-9123-728F94CC6599}.Release|Any CPU.Build.0 = Release|Any CPU
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}.Release|Any CPU.ActiveCfg = Release|Any CPU
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}.Release|Any CPU.Build.0 = Release|Any CPU
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -96,6 +116,10 @@ Global
{CF1C27F8-D603-4960-BE99-BCF348545368} = {24A9C4D1-E189-4D3A-A2D7-36D3ED51D277}
{3D65611F-E8FB-4A33-9196-7836969D6378} = {24A9C4D1-E189-4D3A-A2D7-36D3ED51D277}
{C0B5124C-0133-4E0B-BF36-A32CE5AD9DAA} = {24A9C4D1-E189-4D3A-A2D7-36D3ED51D277}
{A883C5CA-53F5-41FA-9123-728F94CC6599} = {A92C22F0-200B-4C61-8544-0EAE620B8006}
{A92C22F0-200B-4C61-8544-0EAE620B8006} = {24A9C4D1-E189-4D3A-A2D7-36D3ED51D277}
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93} = {A92C22F0-200B-4C61-8544-0EAE620B8006}
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D} = {A92C22F0-200B-4C61-8544-0EAE620B8006}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D7045317-2675-4853-926A-4D4354176EEE}
Expand Down
109 changes: 109 additions & 0 deletions src/EntityFramework.SqlServer/EntityFramework.SqlServer.InternalsVisibleTo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>EntityFramework.SqlServer</AssemblyName>
<RootNamespace>System.Data.Entity.SqlServer</RootNamespace>
<TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
<AssemblyVersion>6.0.0.0</AssemblyVersion>
<DefineConstants>$(DefineConstants);SQLSERVER</DefineConstants>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\EntityFramework\Utilities\TaskExtensions.cs">
<Link>Utilities\TaskExtensions.cs</Link>
</Compile>
<Compile Include="..\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\SharedAssemblyVersionInfo.cs">
<Link>Properties\SharedAssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Common\ByteExtensions.cs">
<Link>Utilities\ByteExtensions.cs</Link>
</Compile>
<Compile Include="..\Common\TypeExtensions.cs">
<Link>Utilities\TypeExtensions.cs</Link>
</Compile>
<Compile Include="..\Common\PropertyInfoExtensions.cs">
<Link>Utilities\PropertyInfo.cs</Link>
</Compile>
<Compile Include="..\Common\Check.cs">
<Link>Utilities\Check.cs</Link>
</Compile>
<Compile Include="..\Common\DatabaseName.cs">
<Link>Utilities\DatabaseName.cs</Link>
</Compile>
<Compile Include="..\Common\DebugCheck.cs">
<Link>Utilities\DebugCheck.cs</Link>
</Compile>
<Compile Include="..\Common\IEnumerableExtensions.cs">
<Link>Utilities\IEnumerableExtensions.cs</Link>
</Compile>
<Compile Include="..\Common\StringExtensions.cs">
<Link>Utilities\StringExtensions.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Resources.SqlServer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.SqlServer.tt</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<None Update="Properties\Resources.SqlServer.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>Resources.SqlServer.cs</LastGenOutput>
<CustomToolNamespace>System.Data.Entity.SqlServer</CustomToolNamespace>
</None>
</ItemGroup>

<ItemGroup>
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl" />
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl" />
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl" />
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl" />
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl" />
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl" />
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml</LogicalName>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\EntityFramework\EntityFramework.InternalsVisibleTo.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/EntityFramework.SqlServer/EntityFramework.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<TargetFrameworks>net45;net40;netstandard2.1</TargetFrameworks>
<Description>EntityFramework.SqlServer.dll</Description>
<AssemblyVersion>6.0.0.0</AssemblyVersion>
<DefineConstants>$(DefineConstants);SQLSERVER</DefineConstants>
<DefineConstants>$(DefineConstants);SQLSERVER;INTERNALS_INVISIBLE</DefineConstants>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
4 changes: 4 additions & 0 deletions src/EntityFramework.SqlServer/Properties/InternalsVisibleTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.

#if !INTERNALS_INVISIBLE

using System.Runtime.CompilerServices;

[assembly:
Expand All @@ -17,3 +19,5 @@
InternalsVisibleTo(
"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"
)]

#endif
95 changes: 95 additions & 0 deletions ...tityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.InternalsVisibleTo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>EntityFramework.SqlServerCompact</AssemblyName>
<RootNamespace>System.Data.Entity.SqlServerCompact</RootNamespace>
<TargetFrameworks>net45</TargetFrameworks>
<AssemblyVersion>6.0.0.0</AssemblyVersion>
<DefineConstants>$(DefineConstants);SQLSERVERCOMPACT</DefineConstants>
</PropertyGroup>

<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Transactions" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SqlServer.Compact" Version="$(MicrosoftSqlServerCompactVersion)" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\SharedAssemblyVersionInfo.cs">
<Link>Properties\SharedAssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\Common\ByteExtensions.cs">
<Link>Utilities\ByteExtensions.cs</Link>
</Compile>
<Compile Include="..\Common\Check.cs">
<Link>Utilities\Check.cs</Link>
</Compile>
<Compile Include="..\Common\DatabaseName.cs">
<Link>Utilities\DatabaseName.cs</Link>
</Compile>
<Compile Include="..\Common\DebugCheck.cs">
<Link>Utilities\DebugCheck.cs</Link>
</Compile>
<Compile Include="..\Common\IEnumerableExtensions.cs">
<Link>Utilities\IEnumerableExtensions.cs</Link>
</Compile>
<Compile Include="..\Common\StringExtensions.cs">
<Link>Utilities\StringExtensions.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Resources.SqlServerCompact.cs">
<DependentUpon>Resources.SqlServerCompact.tt</DependentUpon>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="SqlCeMultiCommand.cs">
<SubType>Component</SubType>
</Compile>
</ItemGroup>

<ItemGroup>
<None Update="Properties\Resources.SqlServerCompact.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>Resources.SqlServerCompact.cs</LastGenOutput>
<CustomToolNamespace>System.Data.Entity.SqlServerCompact</CustomToolNamespace>
</None>
</ItemGroup>

<ItemGroup>
<None Remove="Resources\Microsoft.SqlServerCe.Client.Resources.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl" />
<None Remove="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.ProviderManifest.xml" />
<None Remove="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl" />
<None Remove="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaMapping.msl" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\Microsoft.SqlServerCe.Client.Resources.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl">
<LogicalName>Microsoft.SqlServerCe.Client.Resources.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.ProviderManifest.xml">
<LogicalName>System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.ProviderManifest.xml</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl">
<LogicalName>System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaMapping.msl">
<LogicalName>System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaMapping.msl</LogicalName>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\EntityFramework\EntityFramework.InternalsVisibleTo.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<TargetFrameworks>net45;net40</TargetFrameworks>
<Description>Allows SQL Server Compact 4.0 to be used with Entity Framework.</Description>
<AssemblyVersion>6.0.0.0</AssemblyVersion>
<DefineConstants>$(DefineConstants);SQLSERVERCOMPACT</DefineConstants>
<DefineConstants>$(DefineConstants);SQLSERVERCOMPACT;INTERNALS_INVISIBLE</DefineConstants>
<IsPackable>True</IsPackable>
<PackageTags>$(PackageTags);SQL Compact;CE</PackageTags>
<NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
Expand Down
4 changes: 4 additions & 0 deletions src/EntityFramework.SqlServerCompact/Properties/InternalsVisibleTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.

#if !INTERNALS_INVISIBLE

using System.Runtime.CompilerServices;

[assembly:
Expand All @@ -17,3 +19,5 @@
InternalsVisibleTo(
"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"
)]

#endif
Loading