Skip to content

Commit f4b6e27

Browse files
rojiroji
committed
Made Jetbrains Annotations attributes internal
As recommended by Jetbrains (and was also causing some issues with EF7). Code Contracts was complaining about internal attributes on public methods, so removed the offending annotations for now and opened an issue with CC. As we may be dropping CC soon (future unclear) these may be brought back.
1 parent e2d93ba commit f4b6e27

10 files changed

Lines changed: 285 additions & 533 deletions

‎Npgsql.sln‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework5.Npgsql", "
2121
EndProject
2222
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.Tests", "test\Npgsql.Tests\Npgsql.Tests.csproj", "{E9C258D7-0D8E-4E6A-9857-5C6438591755}"
2323
EndProject
24-
EndProject
2524
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql.Tests", "test\EntityFramework6.Npgsql.Tests\EntityFramework6.Npgsql.Tests.csproj", "{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}"
2625
EndProject
2726
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework7.Npgsql", "src\EntityFramework7.Npgsql\EntityFramework7.Npgsql.csproj", "{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}"
@@ -30,6 +29,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework7.Npgsql.Fun
3029
EndProject
3130
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework7.Npgsql.Tests", "test\EntityFramework7.Npgsql.Tests\EntityFramework7.Npgsql.Tests.csproj", "{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}"
3231
EndProject
32+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{8D01DA20-AA83-4590-B014-4CD6FF2686B1}"
33+
ProjectSection(SolutionItems) = preProject
34+
src\Shared\CodeAnnotations.cs = src\Shared\CodeAnnotations.cs
35+
EndProjectSection
36+
EndProject
3337
Global
3438
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3539
Debug|Any CPU = Debug|Any CPU
@@ -81,6 +85,7 @@ Global
8185
{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
8286
{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
8387
{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
88+
{8D01DA20-AA83-4590-B014-4CD6FF2686B1} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
8489
EndGlobalSection
8590
GlobalSection(MonoDevelopProperties) = preSolution
8691
StartupItem = Npgsql.csproj

‎src/EntityFramework7.Npgsql/EntityFramework7.Npgsql.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@
142142
<Link>Properties\CommonAssemblyInfo.cs</Link>
143143
<SubType>Code</SubType>
144144
</Compile>
145+
<Compile Include="..\Shared\CodeAnnotations.cs">
146+
<Link>CodeAnnotations.cs</Link>
147+
<SubType>Code</SubType>
148+
</Compile>
145149
<Compile Include="Query\Expressions\Internal\AtTimeZoneExpression.cs" />
146150
<Compile Include="Query\Expressions\Internal\RegexMatchExpression.cs" />
147151
<Compile Include="Query\ExpressionTranslators\Internal\NpgsqlDateTimeNowTranslator.cs" />

‎src/EntityFramework7.Npgsql/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"type": "git",
1010
"url": "git://github.com/npgsql/npgsql"
1111
},
12+
"compile": "../Shared/*.cs",
1213
"compilationOptions": {
1314
"keyFile": "../../Npgsql.snk"
1415
},

0 commit comments

Comments
 (0)