Skip to content

Upgraded to .net standard 2.0 with Net4.6 support (Vs 2017) #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agkoutis wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded to .net standard 2.0 with Net4.6 support (Vs 2017) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ obj
*.suo
*.lock.json
restore.dg
/.vs
15 changes: 9 additions & 6 deletions bUtility.NetCore.sln
View file
Open in desktop
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 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.28307.168
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{013CAB5A-C044-4116-9187-D6A09DA69AD4}"
EndProject
Expand All @@ -10,13 +10,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "bUtility", "src\bUtility\bUtility.xproj", "{98DA0D67-D765-4A26-A153-D0D060F75D69}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bUtility", "src\bUtility\bUtility.csproj", "{98DA0D67-D765-4A26-A153-D0D060F75D69}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "bUtility.Logging", "src\bUtility.Logging\bUtility.Logging.xproj", "{B54C900A-ACF3-4688-9053-7234F573B847}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bUtility.Logging", "src\bUtility.Logging\bUtility.Logging.csproj", "{B54C900A-ACF3-4688-9053-7234F573B847}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "bUtility.Dapper", "src\bUtility.Dapper\bUtility.Dapper.xproj", "{829DF365-57FF-4B37-A1A6-734279200E23}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bUtility.Dapper", "src\bUtility.Dapper\bUtility.Dapper.csproj", "{829DF365-57FF-4B37-A1A6-734279200E23}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "bUtility.Json", "src\bUtility.Json\bUtility.Json.xproj", "{C068ED8D-7712-4414-B7D8-9790B66D2D23}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bUtility.Json", "src\bUtility.Json\bUtility.Json.csproj", "{C068ED8D-7712-4414-B7D8-9790B66D2D23}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -50,4 +50,7 @@ Global
{829DF365-57FF-4B37-A1A6-734279200E23} = {013CAB5A-C044-4116-9187-D6A09DA69AD4}
{C068ED8D-7712-4414-B7D8-9790B66D2D23} = {013CAB5A-C044-4116-9187-D6A09DA69AD4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C205864D-B39F-4CCC-B878-03FFDBCE281E}
EndGlobalSection
EndGlobal
7 changes: 1 addition & 6 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-preview2-003131"
}
}
{"projects":["src","test"]}
40 changes: 40 additions & 0 deletions src/bUtility.Dapper/bUtility.Dapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<Description>Dapper Shortcuts for Simple database Operations</Description>
<Copyright>Copyright © 2016</Copyright>
<AssemblyTitle>bUtility.Dapper</AssemblyTitle>
<VersionPrefix>0.0.1</VersionPrefix>
<AssemblyName>bUtility.Dapper</AssemblyName>
<AssemblyOriginatorKeyFile>bUtility.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageId>bUtility.Dapper</PackageId>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

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

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Dapper.StrongName" Version="1.50.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PackageReference Include="System.Data.Common" Version="4.1.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Data" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions src/bUtility.Dapper/bUtility.Dapper.xproj
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions src/bUtility.Dapper/project.json
View file
Open in desktop

This file was deleted.

Loading