Skip to content

Commit 1c79db6

Browse files
eben-rouxeben-roux
committed
- csproj compile exclude
1 parent c458433 commit 1c79db6

3 files changed

Lines changed: 66 additions & 59 deletions

File tree

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017, Eben Roux
1+
Copyright (c) 2018, Eben Roux
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

‎Shuttle.Core.Data.Tests/Shuttle.Core.Data.Tests.csproj‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
5-
<ApplicationIcon />
6-
<OutputType>Library</OutputType>
7-
<StartupObject />
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
5+
<ApplicationIcon />
6+
<OutputType>Library</OutputType>
7+
<StartupObject />
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<None Include=".scripts\file-script.sql">
12-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
13-
</None>
14-
<EmbeddedResource Include=".scripts\System.Data.SqlClient\embedded-script.sql">
15-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
16-
</EmbeddedResource>
17-
</ItemGroup>
10+
<ItemGroup>
11+
<None Include=".scripts\file-script.sql">
12+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
13+
</None>
14+
<EmbeddedResource Include=".scripts\System.Data.SqlClient\embedded-script.sql">
15+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
16+
</EmbeddedResource>
17+
</ItemGroup>
1818

19-
<ItemGroup>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
21-
<PackageReference Include="Moq" Version="4.8.0" />
22-
<PackageReference Include="NUnit" Version="3.9.0" />
23-
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
24-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
25-
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
26-
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
21+
<PackageReference Include="Moq" Version="4.8.0" />
22+
<PackageReference Include="NUnit" Version="3.9.0" />
23+
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
24+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
25+
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
26+
</ItemGroup>
2727

28-
<ItemGroup>
29-
<ProjectReference Include="..\Shuttle.Core.Data\Shuttle.Core.Data.csproj" />
30-
</ItemGroup>
28+
<ItemGroup>
29+
<ProjectReference Include="..\Shuttle.Core.Data\Shuttle.Core.Data.csproj" />
30+
</ItemGroup>
3131

32+
<ItemGroup>
33+
<Compile Remove="DefaultDbProviderFactories.cs" Condition="'$(TargetFramework)' != 'netcoreapp2.0'"/>
34+
</ItemGroup>
3235
</Project>

‎Shuttle.Core.Data/Shuttle.Core.Data.csproj‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,45 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>net46;net461;net462;net47;net471;netstandard2.0;netcoreapp2.0</TargetFrameworks>
5-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net46;net461;net462;net47;net471;netstandard2.0;netcoreapp2.0</TargetFrameworks>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
</PropertyGroup>
77

8-
<ItemGroup>
9-
<None Include=".build\package.msbuild" />
10-
<None Include=".build\package.nuspec" />
11-
<None Include=".build\Shuttle.MSBuild.dll" />
12-
<None Include=".build\Shuttle.MSBuild.targets" />
13-
</ItemGroup>
8+
<ItemGroup>
9+
<None Include=".build\package.msbuild" />
10+
<None Include=".build\package.nuspec" />
11+
<None Include=".build\Shuttle.MSBuild.dll" />
12+
<None Include=".build\Shuttle.MSBuild.targets" />
13+
</ItemGroup>
1414

15-
<ItemGroup>
16-
<PackageReference Include="Shuttle.Core.Configuration" Version="10.0.0" />
17-
<PackageReference Include="Shuttle.Core.Container" Version="10.0.1" />
18-
<PackageReference Include="Shuttle.Core.Logging" Version="10.0.1" />
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0'" />
20-
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="Shuttle.Core.Configuration" Version="10.0.0" />
17+
<PackageReference Include="Shuttle.Core.Container" Version="10.0.1" />
18+
<PackageReference Include="Shuttle.Core.Logging" Version="10.0.1" />
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0'" />
20+
</ItemGroup>
2121

22-
<ItemGroup>
23-
<Reference Include="System.Configuration" Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.0'" />
24-
<Reference Include="System.Transactions" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
25-
</ItemGroup>
22+
<ItemGroup>
23+
<Reference Include="System.Configuration" Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.0'" />
24+
<Reference Include="System.Transactions" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
25+
</ItemGroup>
2626

27-
<ItemGroup>
28-
<Compile Update="Resources.Designer.cs">
29-
<DesignTime>True</DesignTime>
30-
<AutoGen>True</AutoGen>
31-
<DependentUpon>Resources.resx</DependentUpon>
32-
</Compile>
33-
</ItemGroup>
27+
<ItemGroup>
28+
<Compile Update="Resources.Designer.cs">
29+
<DesignTime>True</DesignTime>
30+
<AutoGen>True</AutoGen>
31+
<DependentUpon>Resources.resx</DependentUpon>
32+
</Compile>
33+
</ItemGroup>
3434

35-
<ItemGroup>
36-
<EmbeddedResource Update="Resources.resx">
37-
<Generator>PublicResXFileCodeGenerator</Generator>
38-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
39-
</EmbeddedResource>
40-
</ItemGroup>
35+
<ItemGroup>
36+
<EmbeddedResource Update="Resources.resx">
37+
<Generator>PublicResXFileCodeGenerator</Generator>
38+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
39+
</EmbeddedResource>
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<Compile Remove="IDbProviderFactories.cs" Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.0'"/>
44+
</ItemGroup>
4145
</Project>

0 commit comments

Comments
 (0)