Skip to content

Commit 83d118c

Browse files
nickeeexjvuoti
nickeeex
authored and
jvuoti
committed
Migrate task to target both .net standard 2.0 and framework 451 (#7)
1 parent 9b41d96 commit 83d118c

File tree

14 files changed

+437
-607
lines changed

14 files changed

+437
-607
lines changed

‎Frends.Sql.Tests/App.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Frends.Sql.Tests/Frends.Sql.Tests.csproj

Lines changed: 21 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,29 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{50EDD7FF-7B9E-4400-BB3D-9443B25CF7CD}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>Frends.Sql.Tests</RootNamespace>
10-
<AssemblyName>Frends.Sql.Tests</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
15-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
16-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
17-
<IsCodedUITest>False</IsCodedUITest>
18-
<TestProjectType>UnitTest</TestProjectType>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
197
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21-
<DebugSymbols>true</DebugSymbols>
22-
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
25-
<DefineConstants>DEBUG;TRACE</DefineConstants>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
28-
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
</PropertyGroup>
37-
<ItemGroup>
38-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
40-
<Private>True</Private>
41-
</Reference>
42-
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
43-
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
46-
<Reference Include="System" />
47-
<Reference Include="System.Configuration" />
48-
<Reference Include="System.Data" />
49-
<Reference Include="System.Xml" />
50-
</ItemGroup>
51-
<Choose>
52-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
53-
<ItemGroup>
54-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
55-
</ItemGroup>
56-
</When>
57-
<Otherwise>
58-
<ItemGroup>
59-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
60-
</ItemGroup>
61-
</Otherwise>
62-
</Choose>
8+
639
<ItemGroup>
64-
<Compile Include="Tests.cs" />
65-
<Compile Include="Properties\AssemblyInfo.cs" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
14+
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
15+
<PackageReference Include="xunit" Version="2.3.1" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
6617
</ItemGroup>
18+
6719
<ItemGroup>
68-
<None Include="App.config" />
69-
<None Include="packages.config" />
20+
<ProjectReference Include="..\Frends.Sql\Frends.Sql.csproj" />
7021
</ItemGroup>
22+
7123
<ItemGroup>
72-
<ProjectReference Include="..\Frends.Sql\Frends.Sql.csproj">
73-
<Project>{0071C1C6-E568-4CDF-B44B-9D8942D4905A}</Project>
74-
<Name>Frends.Sql</Name>
75-
</ProjectReference>
24+
<None Update="appsettings.json">
25+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26+
</None>
7627
</ItemGroup>
77-
<Choose>
78-
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
79-
<ItemGroup>
80-
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81-
<Private>False</Private>
82-
</Reference>
83-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84-
<Private>False</Private>
85-
</Reference>
86-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87-
<Private>False</Private>
88-
</Reference>
89-
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90-
<Private>False</Private>
91-
</Reference>
92-
</ItemGroup>
93-
</When>
94-
</Choose>
95-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
96-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
97-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
98-
Other similar extension points exist, see Microsoft.Common.targets.
99-
<Target Name="BeforeBuild">
100-
</Target>
101-
<Target Name="AfterBuild">
102-
</Target>
103-
-->
104-
</Project>
28+
29+
</Project>

‎Frends.Sql.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)