Skip to content

Commit

Permalink
remove all but .net standard 2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
pwelter34 committed May 20, 2019
1 parent 97eb0d1 commit cf79158
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 11,284 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -243,3 +243,4 @@ _Pvt_Extensions
*.GhostDoc.xml
*.csv
coverage.xml
coverage.opencover.xml
4 changes: 2 additions & 2 deletions FluentCommand.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.645
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand", "src\FluentCommand\FluentCommand.csproj", "{4D5F125D-8DD5-496B-959E-78F55D8BE946}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2.0.0.{build}
version: 3.0.0.{build}
os: Visual Studio 2017

environment:
Expand Down
2 changes: 1 addition & 1 deletion build/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PropertyGroup Label="Package">
<Product>FluentCommand</Product>
<Description>Fluent Wrapper for DbCommand</Description>
<Copyright>Copyright (c) 2018 LoreSoft</Copyright>
<Copyright>Copyright (c) 2019 LoreSoft</Copyright>
<Authors>LoreSoft</Authors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageOutputPath>$(SolutionDir)artifacts</PackageOutputPath>
Expand Down
10 changes: 5 additions & 5 deletions build/version.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<Version>2.0.0.0</Version>
<PackageVersion>2.0.0.0</PackageVersion>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
<InformationalVersion>2.0.0.0</InformationalVersion>
<Version>3.0.0.0</Version>
<PackageVersion>3.0.0.0</PackageVersion>
<AssemblyVersion>3.0.0.0</AssemblyVersion>
<FileVersion>3.0.0.0</FileVersion>
<InformationalVersion>3.0.0.0</InformationalVersion>
</PropertyGroup>
</Project>
14 changes: 2 additions & 12 deletions src/FluentCommand.Batch/FluentCommand.Batch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\..\build\common.props" />

<PropertyGroup>
<TargetFrameworks>net451;netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>FluentCommand</RootNamespace>
</PropertyGroup>

Expand All @@ -15,17 +15,7 @@
<ProjectReference Include="..\FluentCommand\FluentCommand.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Transactions" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@
<Import Project="..\..\build\common.props" />

<PropertyGroup>
<TargetFrameworks>net451;netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>FluentCommand</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\FluentCommand\FluentCommand.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<ItemGroup>
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
</ItemGroup>
Expand Down
10 changes: 3 additions & 7 deletions src/FluentCommand.SqlServer/FluentCommand.SqlServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\..\build\common.props" />

<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>FluentCommand</RootNamespace>
</PropertyGroup>

Expand All @@ -14,12 +14,8 @@
<ProjectReference Include="..\FluentCommand\FluentCommand.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
</ItemGroup>

</Project>
8 changes: 2 additions & 6 deletions src/FluentCommand/FluentCommand.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@
<Import Project="..\..\build\common.props" />

<PropertyGroup>
<TargetFrameworks>net451;netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
</ItemGroup>

Expand Down

0 comments on commit cf79158

Please sign in to comment.