Skip to content

Convert to .netstandard 2.0 nuget package #4

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
voloda wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Convert to .netstandard 2.0 nuget package #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b928c8a
NetStandard2.0 nuget package
voloda Sep 19, 2018
e7951e4
Build
voloda Sep 19, 2018
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
133 changes: 72 additions & 61 deletions AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{34B7E6F3-858A-489B-BDD0-45CC6EB62551}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AsyncDataAdapter.Tests</RootNamespace>
<AssemblyName>AsyncDataAdapter.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="HelpersTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SqlDataAdapterTest.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AsyncDataAdapter\AsyncDataAdapter.csproj">
<Project>{0384745d-0e1d-4f87-a24e-2cf5762faab1}</Project>
<Name>AsyncDataAdapter</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{34B7E6F3-858A-489B-BDD0-45CC6EB62551}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AsyncDataAdapter.Tests</RootNamespace>
<AssemblyName>AsyncDataAdapter.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.SqlClient, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SqlClient.4.5.1\lib\net461\System.Data.SqlClient.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="HelpersTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SqlDataAdapterTest.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AsyncDataAdapter\AsyncDataAdapter.csproj">
<Project>{0384745d-0e1d-4f87-a24e-2cf5762faab1}</Project>
<Name>AsyncDataAdapter</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
-->
</Project>
2 changes: 1 addition & 1 deletion AsyncDataAdapter.Tests/SqlDataAdapterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace AsyncDataAdapter.Tests
public class SqlDataAdapterTest
{
// private const string ConnectionString = @"server=.\sqlexpress;database=TestDb;Trusted_Connection=Yes";
private const string ConnectionString = @"server=.\SQL2012SP1;database=TestDb;Trusted_Connection=Yes";
private const string ConnectionString = @"server=.\SQL2017;database=TestDb;Trusted_Connection=Yes";

[Test]
public async Task FillAsyncDataTable()
Expand Down
22 changes: 12 additions & 10 deletions AsyncDataAdapter.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.5.0" targetFramework="net452" />
<package id="NUnit.Console" version="3.5.0" targetFramework="net452" />
<package id="NUnit.ConsoleRunner" version="3.5.0" targetFramework="net452" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net452" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.5.0" targetFramework="net452" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net452" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net452" />
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net452" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.10.1" targetFramework="net462" />
<package id="NUnit.Console" version="3.9.0" targetFramework="net462" />
<package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net462" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.4" targetFramework="net462" />
<package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net462" />
<package id="System.Data.SqlClient" version="4.5.1" targetFramework="net462" />
<package id="MSBuildTasks" version="1.5.0.214" targetFramework="net462" developmentDependency="true" />
</packages>
22 changes: 5 additions & 17 deletions AsyncDataAdapter.msbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@

<Target Name="CI" DependsOnTargets="SetAssemblyVersion;Build;CreateDb">
<Exec Command='"$(NUnitTool)" "$(SrcRootDir)\AsyncDataAdapter.Tests\bin\$(Configuration)\AsyncDataAdapter.Tests.dll" --result=myresults.xml;format=AppVeyor --labels=All' />

<CallTarget Targets="NugetPackages" Condition="'$(CreateBinaries)' == 'true'" />
</Target>

<Target Name="CreateDb">
<Exec Command='osql -E -S .\SQL2012SP1 -Q "CREATE DATABASE TestDb"' />
<Exec Command='osql -E -S .\SQL2012SP1 -d TestDb -i DbSetup.sql' />
<Exec Command='osql -E -S .\SQL2017 -Q "CREATE DATABASE TestDb"' />
<Exec Command='osql -E -S .\SQL2017 -d TestDb -i DbSetup.sql' />
</Target>

<Target Name="Test" DependsOnTargets="Build">
Expand All @@ -33,20 +31,10 @@
<Target Name="SetAssemblyVersion">
<ItemGroup>
<AssemblyInfoFiles Include=".\**\AssemblyInfo.cs" />
<AssemblyProjectFiles Include=".\**\*.csproj" />
</ItemGroup>
<FileUpdate Files="@(AssemblyInfoFiles)" Regex="(\d+)\.(\d+)\.(\d+)\.(\d+)" ReplacementText="$(BuildNumber)" />
</Target>

<Target Name="NugetPackages" DependsOnTargets="Build">
<RemoveDir Directories="$(NugetSrcDirectory)" />
<ItemGroup>
<Nuget Include="AsyncDataAdapter\bin\$(Configuration)\**\AsyncDataAdapter*.dll">
<Package>AsyncDataAdapter</Package>
</Nuget>
</ItemGroup>

<Copy SourceFiles="@(Nuget)" DestinationFiles="@(Nuget->'$(NugetSrcDirectory)\%(Package)\lib\net45\%(RecursiveDir)%(Filename)%(Extension)')" />
<Exec Command="$(NugetTool) pack -Version $(BuildNumber) -BasePath $(NugetSrcDirectory)\%(Nuget.Package) %(Nuget.Package).nuspec" />
<FileUpdate Files="@(AssemblyInfoFiles)" Regex="(\d+)\.(\d+)\.(\d+)\.(\d+)" ReplacementText="$(BuildNumber).0" />
<FileUpdate Files="@(AssemblyProjectFiles)" Regex="(\d+)\.(\d+)\.(\d+)" ReplacementText="$(BuildNumber)" />
</Target>

<Target Name="Build">
Expand Down
17 changes: 0 additions & 17 deletions AsyncDataAdapter.nuspec
View file
Open in desktop

This file was deleted.

82 changes: 42 additions & 40 deletions AsyncDataAdapter.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,42 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncDataAdapter", "AsyncDataAdapter\AsyncDataAdapter.csproj", "{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncDataAdapter.Tests", "AsyncDataAdapter.Tests\AsyncDataAdapter.Tests.csproj", "{34B7E6F3-858A-489B-BDD0-45CC6EB62551}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{366B2040-653C-4536-86F6-7A8B8765D6AF}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
appveyor.yml = appveyor.yml
AsyncDataAdapter.msbuild = AsyncDataAdapter.msbuild
AsyncDataAdapter.nuspec = AsyncDataAdapter.nuspec
DbSetup.sql = DbSetup.sql
LICENSE = LICENSE
Properties.xml = Properties.xml
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Release|Any CPU.Build.0 = Release|Any CPU
{34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2019
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncDataAdapter", "AsyncDataAdapter\AsyncDataAdapter.csproj", "{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncDataAdapter.Tests", "AsyncDataAdapter.Tests\AsyncDataAdapter.Tests.csproj", "{34B7E6F3-858A-489B-BDD0-45CC6EB62551}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{366B2040-653C-4536-86F6-7A8B8765D6AF}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
appveyor.yml = appveyor.yml
AsyncDataAdapter.msbuild = AsyncDataAdapter.msbuild
DbSetup.sql = DbSetup.sql
LICENSE = LICENSE
Properties.xml = Properties.xml
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Release|Any CPU.Build.0 = Release|Any CPU
{34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {ABB37006-C016-409A-88C0-B3E06924773D}
EndGlobalSection
EndGlobal
Loading