Skip to content

Commit 9528afc

Browse files
bricelambricelam
committed
Re-introduce INTERNALS_INVISIBLE
Fixes #1020
1 parent aee8898 commit 9528afc

File tree

16 files changed

+390
-20
lines changed

16 files changed

+390
-20
lines changed

‎EntityFramework.sln‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.ProviderAgn
3333
EndProject
3434
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}"
3535
EndProject
36-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ef6", "src\ef6\ef6.csproj", "{7F79B619-FA4D-46D7-876E-FD06C22465DB}"
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ef6", "src\ef6\ef6.csproj", "{7F79B619-FA4D-46D7-876E-FD06C22465DB}"
37+
EndProject
38+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.InternalsVisibleTo", "src\EntityFramework\EntityFramework.InternalsVisibleTo.csproj", "{A883C5CA-53F5-41FA-9123-728F94CC6599}"
39+
EndProject
40+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InternalsVisibleTo", "InternalsVisibleTo", "{A92C22F0-200B-4C61-8544-0EAE620B8006}"
41+
EndProject
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.SqlServer.InternalsVisibleTo", "src\EntityFramework.SqlServer\EntityFramework.SqlServer.InternalsVisibleTo.csproj", "{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}"
43+
EndProject
44+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.SqlServerCompact.InternalsVisibleTo", "src\EntityFramework.SqlServerCompact\EntityFramework.SqlServerCompact.InternalsVisibleTo.csproj", "{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}"
3745
EndProject
3846
Global
3947
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -85,6 +93,18 @@ Global
8593
{7F79B619-FA4D-46D7-876E-FD06C22465DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
8694
{7F79B619-FA4D-46D7-876E-FD06C22465DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
8795
{7F79B619-FA4D-46D7-876E-FD06C22465DB}.Release|Any CPU.Build.0 = Release|Any CPU
96+
{A883C5CA-53F5-41FA-9123-728F94CC6599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97+
{A883C5CA-53F5-41FA-9123-728F94CC6599}.Debug|Any CPU.Build.0 = Debug|Any CPU
98+
{A883C5CA-53F5-41FA-9123-728F94CC6599}.Release|Any CPU.ActiveCfg = Release|Any CPU
99+
{A883C5CA-53F5-41FA-9123-728F94CC6599}.Release|Any CPU.Build.0 = Release|Any CPU
100+
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
101+
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}.Debug|Any CPU.Build.0 = Debug|Any CPU
102+
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}.Release|Any CPU.ActiveCfg = Release|Any CPU
103+
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93}.Release|Any CPU.Build.0 = Release|Any CPU
104+
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105+
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}.Debug|Any CPU.Build.0 = Debug|Any CPU
106+
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}.Release|Any CPU.ActiveCfg = Release|Any CPU
107+
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D}.Release|Any CPU.Build.0 = Release|Any CPU
88108
EndGlobalSection
89109
GlobalSection(SolutionProperties) = preSolution
90110
HideSolutionNode = FALSE
@@ -96,6 +116,10 @@ Global
96116
{CF1C27F8-D603-4960-BE99-BCF348545368} = {24A9C4D1-E189-4D3A-A2D7-36D3ED51D277}
97117
{3D65611F-E8FB-4A33-9196-7836969D6378} = {24A9C4D1-E189-4D3A-A2D7-36D3ED51D277}
98118
{C0B5124C-0133-4E0B-BF36-A32CE5AD9DAA} = {24A9C4D1-E189-4D3A-A2D7-36D3ED51D277}
119+
{A883C5CA-53F5-41FA-9123-728F94CC6599} = {A92C22F0-200B-4C61-8544-0EAE620B8006}
120+
{A92C22F0-200B-4C61-8544-0EAE620B8006} = {24A9C4D1-E189-4D3A-A2D7-36D3ED51D277}
121+
{63368BF7-E04A-4F0E-ACE7-3CC6DE7F3E93} = {A92C22F0-200B-4C61-8544-0EAE620B8006}
122+
{0E08516E-89A5-4C72-BBE2-59AFCD4EF55D} = {A92C22F0-200B-4C61-8544-0EAE620B8006}
99123
EndGlobalSection
100124
GlobalSection(ExtensibilityGlobals) = postSolution
101125
SolutionGuid = {D7045317-2675-4853-926A-4D4354176EEE}

‎src/EntityFramework.SqlServer/EntityFramework.SqlServer.InternalsVisibleTo.csproj‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<RootNamespace>System.Data.Entity.SqlServer</RootNamespace>
5+
<TargetFrameworks>net45;net40;netstandard2.1</TargetFrameworks>
6+
<AssemblyVersion>6.0.0.0</AssemblyVersion>
7+
<DefineConstants>$(DefineConstants);SQLSERVER</DefineConstants>
8+
</PropertyGroup>
9+
10+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
11+
<Reference Include="Microsoft.CSharp" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<Compile Include="..\EntityFramework\Utilities\TaskExtensions.cs">
16+
<Link>Utilities\TaskExtensions.cs</Link>
17+
</Compile>
18+
<Compile Include="..\SharedAssemblyInfo.cs">
19+
<Link>Properties\SharedAssemblyInfo.cs</Link>
20+
</Compile>
21+
<Compile Include="..\SharedAssemblyVersionInfo.cs">
22+
<Link>Properties\SharedAssemblyVersionInfo.cs</Link>
23+
</Compile>
24+
<Compile Include="..\Common\ByteExtensions.cs">
25+
<Link>Utilities\ByteExtensions.cs</Link>
26+
</Compile>
27+
<Compile Include="..\Common\TypeExtensions.cs">
28+
<Link>Utilities\TypeExtensions.cs</Link>
29+
</Compile>
30+
<Compile Include="..\Common\PropertyInfoExtensions.cs">
31+
<Link>Utilities\PropertyInfo.cs</Link>
32+
</Compile>
33+
<Compile Include="..\Common\Check.cs">
34+
<Link>Utilities\Check.cs</Link>
35+
</Compile>
36+
<Compile Include="..\Common\DatabaseName.cs">
37+
<Link>Utilities\DatabaseName.cs</Link>
38+
</Compile>
39+
<Compile Include="..\Common\DebugCheck.cs">
40+
<Link>Utilities\DebugCheck.cs</Link>
41+
</Compile>
42+
<Compile Include="..\Common\IEnumerableExtensions.cs">
43+
<Link>Utilities\IEnumerableExtensions.cs</Link>
44+
</Compile>
45+
<Compile Include="..\Common\StringExtensions.cs">
46+
<Link>Utilities\StringExtensions.cs</Link>
47+
</Compile>
48+
</ItemGroup>
49+
50+
<ItemGroup>
51+
<Compile Update="Properties\Resources.SqlServer.cs">
52+
<AutoGen>True</AutoGen>
53+
<DesignTime>True</DesignTime>
54+
<DependentUpon>Resources.SqlServer.tt</DependentUpon>
55+
</Compile>
56+
</ItemGroup>
57+
58+
<ItemGroup>
59+
<None Update="Properties\Resources.SqlServer.tt">
60+
<Generator>TextTemplatingFileGenerator</Generator>
61+
<LastGenOutput>Resources.SqlServer.cs</LastGenOutput>
62+
<CustomToolNamespace>System.Data.Entity.SqlServer</CustomToolNamespace>
63+
</None>
64+
</ItemGroup>
65+
66+
<ItemGroup>
67+
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl" />
68+
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl" />
69+
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl" />
70+
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl" />
71+
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl" />
72+
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl" />
73+
<None Remove="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml" />
74+
</ItemGroup>
75+
76+
<ItemGroup>
77+
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl">
78+
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
79+
</EmbeddedResource>
80+
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl">
81+
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl</LogicalName>
82+
</EmbeddedResource>
83+
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl">
84+
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl</LogicalName>
85+
</EmbeddedResource>
86+
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl">
87+
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl</LogicalName>
88+
</EmbeddedResource>
89+
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl">
90+
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl</LogicalName>
91+
</EmbeddedResource>
92+
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl">
93+
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl</LogicalName>
94+
</EmbeddedResource>
95+
<EmbeddedResource Include="Resources\System\Data\SqlClient\System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml">
96+
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml</LogicalName>
97+
</EmbeddedResource>
98+
</ItemGroup>
99+
100+
<ItemGroup>
101+
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
102+
</ItemGroup>
103+
104+
<ItemGroup>
105+
<ProjectReference Include="..\EntityFramework\EntityFramework.InternalsVisibleTo.csproj" />
106+
</ItemGroup>
107+
108+
</Project>

‎src/EntityFramework.SqlServer/EntityFramework.SqlServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<TargetFrameworks>net45;net40;netstandard2.1</TargetFrameworks>
77
<Description>EntityFramework.SqlServer.dll</Description>
88
<AssemblyVersion>6.0.0.0</AssemblyVersion>
9-
<DefineConstants>$(DefineConstants);SQLSERVER</DefineConstants>
9+
<DefineConstants>$(DefineConstants);SQLSERVER;INTERNALS_INVISIBLE</DefineConstants>
1010
</PropertyGroup>
1111

1212
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

‎src/EntityFramework.SqlServer/Properties/InternalsVisibleTo.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
22

3+
#if !INTERNALS_INVISIBLE
4+
35
using System.Runtime.CompilerServices;
46

57
[assembly:
@@ -17,3 +19,5 @@
1719
InternalsVisibleTo(
1820
"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"
1921
)]
22+
23+
#endif

‎src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.InternalsVisibleTo.csproj‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<RootNamespace>System.Data.Entity.SqlServerCompact</RootNamespace>
5+
<TargetFrameworks>net45;net40</TargetFrameworks>
6+
<AssemblyVersion>6.0.0.0</AssemblyVersion>
7+
<DefineConstants>$(DefineConstants);SQLSERVERCOMPACT</DefineConstants>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Reference Include="Microsoft.CSharp" />
12+
<Reference Include="System.Transactions" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.SqlServer.Compact" Version="$(MicrosoftSqlServerCompactVersion)" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<Compile Include="..\SharedAssemblyInfo.cs">
21+
<Link>Properties\SharedAssemblyInfo.cs</Link>
22+
</Compile>
23+
<Compile Include="..\SharedAssemblyVersionInfo.cs">
24+
<Link>Properties\SharedAssemblyVersionInfo.cs</Link>
25+
</Compile>
26+
<Compile Include="..\Common\ByteExtensions.cs">
27+
<Link>Utilities\ByteExtensions.cs</Link>
28+
</Compile>
29+
<Compile Include="..\Common\Check.cs">
30+
<Link>Utilities\Check.cs</Link>
31+
</Compile>
32+
<Compile Include="..\Common\DatabaseName.cs">
33+
<Link>Utilities\DatabaseName.cs</Link>
34+
</Compile>
35+
<Compile Include="..\Common\DebugCheck.cs">
36+
<Link>Utilities\DebugCheck.cs</Link>
37+
</Compile>
38+
<Compile Include="..\Common\IEnumerableExtensions.cs">
39+
<Link>Utilities\IEnumerableExtensions.cs</Link>
40+
</Compile>
41+
<Compile Include="..\Common\StringExtensions.cs">
42+
<Link>Utilities\StringExtensions.cs</Link>
43+
</Compile>
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<Compile Update="Properties\Resources.SqlServerCompact.cs">
48+
<DependentUpon>Resources.SqlServerCompact.tt</DependentUpon>
49+
<AutoGen>True</AutoGen>
50+
</Compile>
51+
<Compile Update="SqlCeMultiCommand.cs">
52+
<SubType>Component</SubType>
53+
</Compile>
54+
</ItemGroup>
55+
56+
<ItemGroup>
57+
<None Update="Properties\Resources.SqlServerCompact.tt">
58+
<Generator>TextTemplatingFileGenerator</Generator>
59+
<LastGenOutput>Resources.SqlServerCompact.cs</LastGenOutput>
60+
<CustomToolNamespace>System.Data.Entity.SqlServerCompact</CustomToolNamespace>
61+
</None>
62+
</ItemGroup>
63+
64+
<ItemGroup>
65+
<None Remove="Resources\Microsoft.SqlServerCe.Client.Resources.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl" />
66+
<None Remove="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.ProviderManifest.xml" />
67+
<None Remove="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl" />
68+
<None Remove="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaMapping.msl" />
69+
</ItemGroup>
70+
71+
<ItemGroup>
72+
<EmbeddedResource Include="Resources\Microsoft.SqlServerCe.Client.Resources.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl">
73+
<LogicalName>Microsoft.SqlServerCe.Client.Resources.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
74+
</EmbeddedResource>
75+
<EmbeddedResource Include="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.ProviderManifest.xml">
76+
<LogicalName>System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.ProviderManifest.xml</LogicalName>
77+
</EmbeddedResource>
78+
<EmbeddedResource Include="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl">
79+
<LogicalName>System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
80+
</EmbeddedResource>
81+
<EmbeddedResource Include="Resources\System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaMapping.msl">
82+
<LogicalName>System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaMapping.msl</LogicalName>
83+
</EmbeddedResource>
84+
</ItemGroup>
85+
86+
<ItemGroup>
87+
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
88+
</ItemGroup>
89+
90+
<ItemGroup>
91+
<ProjectReference Include="..\EntityFramework\EntityFramework.InternalsVisibleTo.csproj" />
92+
</ItemGroup>
93+
94+
</Project>

‎src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<TargetFrameworks>net45;net40</TargetFrameworks>
77
<Description>Allows SQL Server Compact 4.0 to be used with Entity Framework.</Description>
88
<AssemblyVersion>6.0.0.0</AssemblyVersion>
9-
<DefineConstants>$(DefineConstants);SQLSERVERCOMPACT</DefineConstants>
9+
<DefineConstants>$(DefineConstants);SQLSERVERCOMPACT;INTERNALS_INVISIBLE</DefineConstants>
1010
<IsPackable>True</IsPackable>
1111
<PackageTags>$(PackageTags);SQL Compact;CE</PackageTags>
1212
<NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>

‎src/EntityFramework.SqlServerCompact/Properties/InternalsVisibleTo.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
22

3+
#if !INTERNALS_INVISIBLE
4+
35
using System.Runtime.CompilerServices;
46

57
[assembly:
@@ -17,3 +19,5 @@
1719
InternalsVisibleTo(
1820
"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"
1921
)]
22+
23+
#endif

0 commit comments

Comments
 (0)