Skip to content

Commit df62209

Browse files
kinetiqkinetiq
authored
Merge pull request #2 from burtonr/netcore
Update to netstandard2.0 framework
2 parents 2e7f706 + ad0d3e6 commit df62209

5 files changed

Lines changed: 65 additions & 254 deletions

File tree

‎Ether.WeightedSelector.Tests/Ether.WeightedSelector.Tests.csproj‎

Lines changed: 13 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.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>{336C2E6A-A8FB-4BB4-BE6F-2CA841740E38}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>Ether.WeightedSelector.Tests</RootNamespace>
10-
<AssemblyName>Ether.WeightedSelector.Tests</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</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="System" />
39-
</ItemGroup>
40-
<Choose>
41-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
42-
<ItemGroup>
43-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
44-
</ItemGroup>
45-
</When>
46-
<Otherwise>
47-
<ItemGroup>
48-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
49-
</ItemGroup>
50-
</Otherwise>
51-
</Choose>
8+
529
<ItemGroup>
53-
<Compile Include="Helpers\InputBuilder.cs" />
54-
<Compile Include="Helpers\ProbabilityHelpers.cs" />
55-
<Compile Include="NinjaStringTests.cs" />
56-
<Compile Include="ReuseTests.cs" />
57-
<Compile Include="NinjaTests.cs" />
58-
<Compile Include="MultiSelect_NoDuplicates_Tests.cs" />
59-
<Compile Include="MultiSelect_WithAllowDuplicates_Tests.cs" />
60-
<Compile Include="Probability_ExtremeInputs_Tests.cs" />
61-
<Compile Include="Properties\AssemblyInfo.cs" />
62-
<Compile Include="Probability_ExtremeWeight_Tests.cs" />
63-
<Compile Include="Probability_Simple_Tests.cs" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
12+
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
6413
</ItemGroup>
14+
6515
<ItemGroup>
66-
<ProjectReference Include="..\Ether.WeightedSelector\Ether.WeightedSelector.csproj">
67-
<Project>{23c09e37-3742-4e08-86f5-941f492d2713}</Project>
68-
<Name>Ether.WeightedSelector</Name>
69-
</ProjectReference>
16+
<ProjectReference Include="..\Ether.WeightedSelector\Ether.WeightedSelector.csproj" />
7017
</ItemGroup>
71-
<Choose>
72-
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
73-
<ItemGroup>
74-
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75-
<Private>False</Private>
76-
</Reference>
77-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78-
<Private>False</Private>
79-
</Reference>
80-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81-
<Private>False</Private>
82-
</Reference>
83-
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84-
<Private>False</Private>
85-
</Reference>
86-
</ItemGroup>
87-
</When>
88-
</Choose>
89-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
90-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
92-
Other similar extension points exist, see Microsoft.Common.targets.
93-
<Target Name="BeforeBuild">
94-
</Target>
95-
<Target Name="AfterBuild">
96-
</Target>
97-
-->
98-
</Project>
18+
19+
</Project>

‎Ether.WeightedSelector.Tests/Properties/AssemblyInfo.cs‎

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

‎Ether.WeightedSelector.sln‎

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,48 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30501.0
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ether.WeightedSelector", "Ether.WeightedSelector\Ether.WeightedSelector.csproj", "{23C09E37-3742-4E08-86F5-941F492D2713}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ether.WeightedSelector.Tests", "Ether.WeightedSelector.Tests\Ether.WeightedSelector.Tests.csproj", "{336C2E6A-A8FB-4BB4-BE6F-2CA841740E38}"
9-
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EB2B4D7E-C6D6-46E1-9745-FFB421C745B4}"
11-
ProjectSection(SolutionItems) = preProject
12-
WebEssentials-Settings.json = WebEssentials-Settings.json
13-
EndProjectSection
14-
EndProject
15-
Global
16-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
17-
Debug|Any CPU = Debug|Any CPU
18-
Release|Any CPU = Release|Any CPU
19-
EndGlobalSection
20-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21-
{23C09E37-3742-4E08-86F5-941F492D2713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22-
{23C09E37-3742-4E08-86F5-941F492D2713}.Debug|Any CPU.Build.0 = Debug|Any CPU
23-
{23C09E37-3742-4E08-86F5-941F492D2713}.Release|Any CPU.ActiveCfg = Release|Any CPU
24-
{23C09E37-3742-4E08-86F5-941F492D2713}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{336C2E6A-A8FB-4BB4-BE6F-2CA841740E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{336C2E6A-A8FB-4BB4-BE6F-2CA841740E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{336C2E6A-A8FB-4BB4-BE6F-2CA841740E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{336C2E6A-A8FB-4BB4-BE6F-2CA841740E38}.Release|Any CPU.Build.0 = Release|Any CPU
29-
EndGlobalSection
30-
GlobalSection(SolutionProperties) = preSolution
31-
HideSolutionNode = FALSE
32-
EndGlobalSection
33-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26124.0
5+
MinimumVisualStudioVersion = 15.0.26124.0
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ether.WeightedSelector", "Ether.WeightedSelector\Ether.WeightedSelector.csproj", "{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ether.WeightedSelector.Tests", "Ether.WeightedSelector.Tests\Ether.WeightedSelector.Tests.csproj", "{4B897D9D-A476-4A86-812F-0C259DE49E7A}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Debug|x64 = Debug|x64
14+
Debug|x86 = Debug|x86
15+
Release|Any CPU = Release|Any CPU
16+
Release|x64 = Release|x64
17+
Release|x86 = Release|x86
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Debug|x64.ActiveCfg = Debug|Any CPU
26+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Debug|x64.Build.0 = Debug|Any CPU
27+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Debug|x86.ActiveCfg = Debug|Any CPU
28+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Debug|x86.Build.0 = Debug|Any CPU
29+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Release|x64.ActiveCfg = Release|Any CPU
32+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Release|x64.Build.0 = Release|Any CPU
33+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Release|x86.ActiveCfg = Release|Any CPU
34+
{8A5C83B2-B2F3-4019-8998-1CA38FBED88F}.Release|x86.Build.0 = Release|Any CPU
35+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Debug|x64.ActiveCfg = Debug|Any CPU
38+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Debug|x64.Build.0 = Debug|Any CPU
39+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Debug|x86.ActiveCfg = Debug|Any CPU
40+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Debug|x86.Build.0 = Debug|Any CPU
41+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
42+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Release|Any CPU.Build.0 = Release|Any CPU
43+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Release|x64.ActiveCfg = Release|Any CPU
44+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Release|x64.Build.0 = Release|Any CPU
45+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Release|x86.ActiveCfg = Release|Any CPU
46+
{4B897D9D-A476-4A86-812F-0C259DE49E7A}.Release|x86.Build.0 = Release|Any CPU
47+
EndGlobalSection
48+
EndGlobal

‎Ether.WeightedSelector/Ether.WeightedSelector.csproj‎

Lines changed: 4 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{23C09E37-3742-4E08-86F5-941F492D2713}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Ether.WeightedSelector</RootNamespace>
11-
<AssemblyName>Ether.WeightedSelector</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFramework>netstandard2.0</TargetFramework>
145
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<PlatformTarget>AnyCPU</PlatformTarget>
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<PlatformTarget>AnyCPU</PlatformTarget>
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
</PropertyGroup>
34-
<PropertyGroup>
35-
<StartupObject />
36-
</PropertyGroup>
37-
<ItemGroup>
38-
<Reference Include="System" />
39-
<Reference Include="System.Core" />
40-
</ItemGroup>
41-
<ItemGroup>
42-
<Compile Include="Algorithm\BinarySearchOptimizer.cs" />
43-
<Compile Include="Algorithm\MultiSelector.cs" />
44-
<Compile Include="Algorithm\SelectorBase.cs" />
45-
<Compile Include="Extensions\ExtensionMethods.cs" />
46-
<Compile Include="SelectorOptions.cs" />
47-
<Compile Include="Properties\AssemblyInfo.cs" />
48-
<Compile Include="Algorithm\SingleSelector.cs" />
49-
<Compile Include="WeightedItem.cs" />
50-
<Compile Include="WeightedSelector.cs" />
51-
</ItemGroup>
52-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
53-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
54-
Other similar extension points exist, see Microsoft.Common.targets.
55-
<Target Name="BeforeBuild">
56-
</Target>
57-
<Target Name="AfterBuild">
58-
</Target>
59-
-->
6+
607
</Project>

‎Ether.WeightedSelector/Properties/AssemblyInfo.cs‎

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

0 commit comments

Comments
 (0)