Skip to content

Commit 5ca6302

Browse files
author
Shay Rojansky
committed
Move JetBrains.CodeAnnotations into Npgsql
It was being compiled into Npgsql and EF7.Npgsql, but since Npgsql is InternalsVisibleTo EF7.Npgsql we got tons of warnings.
1 parent a3405da commit 5ca6302

File tree

4 files changed

+1
-13
lines changed

4 files changed

+1
-13
lines changed

Npgsql.sln

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework7.Npgsql.Fun
2929
EndProject
3030
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework7.Npgsql.Tests", "test\EntityFramework7.Npgsql.Tests\EntityFramework7.Npgsql.Tests.csproj", "{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}"
3131
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
3732
Global
3833
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3934
Debug|Any CPU = Debug|Any CPU

src/EntityFramework7.Npgsql/EntityFramework7.Npgsql.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@
151151
<Link>Properties\CommonAssemblyInfo.cs</Link>
152152
<SubType>Code</SubType>
153153
</Compile>
154-
<Compile Include="..\Shared\CodeAnnotations.cs">
155-
<Link>CodeAnnotations.cs</Link>
156-
<SubType>Code</SubType>
157-
</Compile>
158154
<Compile Include="Query\Expressions\Internal\AtTimeZoneExpression.cs" />
159155
<Compile Include="Query\Expressions\Internal\RegexMatchExpression.cs" />
160156
<Compile Include="Query\ExpressionTranslators\Internal\NpgsqlDateTimeNowTranslator.cs" />

src/Npgsql/Npgsql.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,7 @@
256256
<Link>Properties\CommonAssemblyInfo.cs</Link>
257257
<SubType>Code</SubType>
258258
</Compile>
259-
<Compile Include="..\Shared\CodeAnnotations.cs">
260-
<Link>CodeAnnotations.cs</Link>
261-
<SubType>Code</SubType>
262-
</Compile>
259+
<Compile Include="Util\CodeAnnotations.cs" />
263260
<Compile Include="TypeHandlers\ArrayHandler.cs" />
264261
<Compile Include="TypeHandlers\NumericHandlers\UInt32Handler.cs" />
265262
<Compile Include="TypeHandlers\PostgisGeometryHandler.cs" />

0 commit comments

Comments
 (0)