Skip to content

Commit

Permalink
embed the analyzer package in the .Core package
Browse files Browse the repository at this point in the history
  • Loading branch information
mgravell committed May 7, 2021
1 parent 19834b7 commit bdd0a9f
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 92 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>
<RootNamespace>Dapper</RootNamespace>
<Version>0.0.11</Version>
<Version>0.0.12</Version>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageIcon>Dapper.png</PackageIcon>
</PropertyGroup>
Expand Down
32 changes: 16 additions & 16 deletions src/Dapper.AOT/Dapper.AOT.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">True</GeneratePackageOnBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NoPackageAnalysis>true</NoPackageAnalysis>
<DevelopmentDependency>true</DevelopmentDependency>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AllowUnsafeBlocks Condition="'$(TargetFramework)'=='netstandard2.0'">true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">True</GeneratePackageOnBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NoPackageAnalysis>true</NoPackageAnalysis>
<DevelopmentDependency>true</DevelopmentDependency>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AllowUnsafeBlocks Condition="'$(TargetFramework)'=='netstandard2.0'">true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<!-- build time deps -->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" Pack="false" PrivateAssets="all" />
<ItemGroup>
<!-- build time deps -->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" Pack="false" PrivateAssets="all" />

<None Include="$(OutputPath)/$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(OutputPath)/$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />

<!-- kinda hoping we can make this add a project reference to the consumer, but: we'll see (the lib itself doesn't need it) -->
<!--<ProjectReference Include="..\Dapper.Core\Dapper.Core.csproj" />-->
</ItemGroup>
<!-- kinda hoping we can make this add a project reference to the consumer, but: we'll see (the lib itself doesn't need it) -->
<!--<ProjectReference Include="..\Dapper.Core\Dapper.Core.csproj" />-->
</ItemGroup>
</Project>
22 changes: 12 additions & 10 deletions src/Dapper.Core/Dapper.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;netstandard2.0;netcoreapp3.1</TargetFrameworks>
<RootNamespace>Dapper</RootNamespace>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">True</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<WarningsAsErrors>true</WarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net48;netstandard2.0;netcoreapp3.1</TargetFrameworks>
<RootNamespace>Dapper</RootNamespace>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">True</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<WarningsAsErrors>true</WarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.4" Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='net48'"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.4" Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='net48'" />

<None Include="../Dapper.AOT/bin/Release/netstandard2.0/Dapper.AOT.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
</ItemGroup>
</Project>
68 changes: 34 additions & 34 deletions test/Dapper.AOT.Test/Dapper.AOT.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<NoWarn>$(NoWarn);IDE0042;CS8002</NoWarn>
<SignAssembly Condition="'$(TargetFramework)'=='net48'">false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Samples/**/*.input.cs" />
<Compile Remove="Samples/**/*.output.cs" />
<Compile Remove="Samples/**/*.output.netfx.cs" />
<None Include="Samples/**/*.input.cs" CopyToOutputDirectory="PreserveNewest" />
<None Include="Samples/**/*.output.cs" CopyToOutputDirectory="PreserveNewest" />
<None Include="Samples/**/*.output.netfx.cs" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.78" />
<PackageReference Include="Microsoft.Build" Version="16.9.0" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
<PackageReference Include="Oracle.ManagedDataAccess" Version="19.11.0" Condition="'$(TargetFramework)'=='net48'" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" Condition="'$(TargetFramework)'=='net48'"/>
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" Condition="'$(TargetFramework)'!='net48'" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<ProjectReference Include="..\..\src\Dapper.Core\Dapper.Core.csproj" />
<ProjectReference Include="..\..\src\Dapper.AOT\Dapper.AOT.csproj" />
</ItemGroup>
<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<NoWarn>$(NoWarn);IDE0042;CS8002</NoWarn>
<SignAssembly Condition="'$(TargetFramework)'=='net48'">false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Samples/**/*.input.cs" />
<Compile Remove="Samples/**/*.output.cs" />
<Compile Remove="Samples/**/*.output.netfx.cs" />
<None Include="Samples/**/*.input.cs" CopyToOutputDirectory="PreserveNewest" />
<None Include="Samples/**/*.output.cs" CopyToOutputDirectory="PreserveNewest" />
<None Include="Samples/**/*.output.netfx.cs" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.78" />
<PackageReference Include="Microsoft.Build" Version="16.9.0" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
<PackageReference Include="Oracle.ManagedDataAccess" Version="19.11.0" Condition="'$(TargetFramework)'=='net48'" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" Condition="'$(TargetFramework)'=='net48'"/>
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" Condition="'$(TargetFramework)'!='net48'" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<ProjectReference Include="..\..\src\Dapper.Core\Dapper.Core.csproj" />
<ProjectReference Include="..\..\src\Dapper.AOT\Dapper.AOT.csproj" />
</ItemGroup>
</Project>
25 changes: 12 additions & 13 deletions test/UsageBenchmark/UsageBenchmark.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<SignAssembly>False</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapper.AOT" Version="0.0.8" PrivateAssets="all" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" />
<PackageReference Include="Dapper" Version="2.0.78" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
<ProjectReference Include="..\..\src\Dapper.Core\Dapper.Core.csproj" />
</ItemGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<SignAssembly>False</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapper.Core" Version="0.0.12" />
<PackageReference Include="Dapper" Version="2.0.78" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
</ItemGroup>
</Project>
35 changes: 17 additions & 18 deletions test/UsageLinker/UsageLinker.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<SignAssembly>False</SignAssembly>
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PublishTrimmed>true</PublishTrimmed>
<PublishReadyToRun>true</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapper.AOT" Version="0.0.8" PrivateAssets="all" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.78" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
<ProjectReference Include="..\..\src\Dapper.Core\Dapper.Core.csproj" />
</ItemGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<SignAssembly>False</SignAssembly>
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PublishTrimmed>true</PublishTrimmed>
<PublishReadyToRun>true</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapper.Core" Version="0.0.12" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.78" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
</ItemGroup>
</Project>

0 comments on commit bdd0a9f

Please sign in to comment.