Skip to content

Commit 49df394

Browse files
jam40jeffjam40jeff
authored
Merge pull request #12 from mculhane1/dotnet-standard
Updating library to .NETStandard2.0
2 parents 2239217 + a9da167 commit 49df394

File tree

7 files changed

+53
-277
lines changed

7 files changed

+53
-277
lines changed

‎Source/MorseCode.ITask/.nuget/packages.config‎

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

‎Source/MorseCode.ITask/MorseCode.ITask.sln‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,31 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2024
4+
VisualStudioVersion = 15.0.28010.2016
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Root", "_Root\_Root.csproj", "{2611A503-AE4B-4739-AD31-80685D786D26}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Root", "_Root\_Root.csproj", "{AA6961E2-E995-4774-BAAF-4576B5F13D20}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0024A69C-E51D-4B1B-9971-180715B52D3D}"
9-
ProjectSection(SolutionItems) = preProject
10-
MorseCode.snk = MorseCode.snk
11-
EndProjectSection
12-
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{88191769-417A-4306-B025-C01C2D431A11}"
14-
EndProject
15-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{DA6DEDCD-84E0-4E44-AEED-9DC7164B65A8}"
16-
ProjectSection(SolutionItems) = preProject
17-
.nuget\packages.config = .nuget\packages.config
18-
EndProjectSection
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{4D9F8BED-6088-4D9E-86E7-C7B0DF5973F7}"
199
EndProject
2010
Global
2111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2212
Debug|Any CPU = Debug|Any CPU
2313
Release|Any CPU = Release|Any CPU
2414
EndGlobalSection
2515
GlobalSection(ProjectConfigurationPlatforms) = postSolution
26-
{2611A503-AE4B-4739-AD31-80685D786D26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{2611A503-AE4B-4739-AD31-80685D786D26}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{2611A503-AE4B-4739-AD31-80685D786D26}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{2611A503-AE4B-4739-AD31-80685D786D26}.Release|Any CPU.Build.0 = Release|Any CPU
30-
{88191769-417A-4306-B025-C01C2D431A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{88191769-417A-4306-B025-C01C2D431A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{88191769-417A-4306-B025-C01C2D431A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{88191769-417A-4306-B025-C01C2D431A11}.Release|Any CPU.Build.0 = Release|Any CPU
16+
{AA6961E2-E995-4774-BAAF-4576B5F13D20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{AA6961E2-E995-4774-BAAF-4576B5F13D20}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{AA6961E2-E995-4774-BAAF-4576B5F13D20}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{AA6961E2-E995-4774-BAAF-4576B5F13D20}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{4D9F8BED-6088-4D9E-86E7-C7B0DF5973F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{4D9F8BED-6088-4D9E-86E7-C7B0DF5973F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{4D9F8BED-6088-4D9E-86E7-C7B0DF5973F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{4D9F8BED-6088-4D9E-86E7-C7B0DF5973F7}.Release|Any CPU.Build.0 = Release|Any CPU
3424
EndGlobalSection
3525
GlobalSection(SolutionProperties) = preSolution
3626
HideSolutionNode = FALSE
3727
EndGlobalSection
3828
GlobalSection(ExtensibilityGlobals) = postSolution
39-
SolutionGuid = {50923C37-4989-4EDC-B347-64A93300E65D}
29+
SolutionGuid = {4D91E50D-9C29-42F1-95D2-76DD6F7CA1EA}
4030
EndGlobalSection
4131
EndGlobal

‎Source/MorseCode.ITask/Tests/Properties/AssemblyInfo.cs‎

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

‎Source/MorseCode.ITask/Tests/Tests.csproj‎

Lines changed: 18 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,27 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.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>{88191769-417A-4306-B025-C01C2D431A11}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>MorseCode.ITask.Tests</RootNamespace>
4+
<TargetFramework>netcoreapp1.0</TargetFramework>
115
<AssemblyName>MorseCode.ITask.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
6+
<RootNamespace>MorseCode.ITask.Tests</RootNamespace>
147
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
8+
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
10+
<DebugType>portable</DebugType>
1611
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
2312
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<Reference Include="nunit.framework">
34-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
35-
</Reference>
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="System.Xml.Linq" />
39-
<Reference Include="System.Data.DataSetExtensions" />
40-
<Reference Include="Microsoft.CSharp" />
41-
<Reference Include="System.Data" />
42-
<Reference Include="System.Xml" />
43-
</ItemGroup>
44-
<ItemGroup>
45-
<Compile Include="AwaitTaskInterfaceDifferentNamespaceTests.cs" />
46-
<Compile Include="TaskExtensionMethodsTests.cs" />
47-
<Compile Include="TaskInterfaceAsyncMethodBuilderTests.cs" />
48-
<Compile Include="TaskInterfaceFactoryTests.cs" />
49-
<Compile Include="TaskWrapperTests.cs" />
50-
<Compile Include="Properties\AssemblyInfo.cs" />
51-
</ItemGroup>
13+
5214
<ItemGroup>
53-
<None Include="packages.config" />
15+
<PackageReference Include="coveralls.io" Version="1.4.2" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
17+
<PackageReference Include="NUnit" Version="3.10.1" />
18+
<PackageReference Include="NUnit.Console" Version="3.9.0" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
20+
<PackageReference Include="OpenCover" Version="4.6.519" />
5421
</ItemGroup>
22+
5523
<ItemGroup>
56-
<ProjectReference Include="..\_Root\_Root.csproj">
57-
<Project>{2611a503-ae4b-4739-ad31-80685d786d26}</Project>
58-
<Name>_Root</Name>
59-
</ProjectReference>
24+
<ProjectReference Include="..\_Root\_Root.csproj" />
6025
</ItemGroup>
61-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
62-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
63-
Other similar extension points exist, see Microsoft.Common.targets.
64-
<Target Name="BeforeBuild">
65-
</Target>
66-
<Target Name="AfterBuild">
67-
</Target>
68-
-->
69-
</Project>
26+
27+
</Project>

‎Source/MorseCode.ITask/Tests/packages.config‎

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

‎Source/MorseCode.ITask/_Root/Properties/AssemblyInfo.cs‎

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

‎Source/MorseCode.ITask/_Root/_Root.csproj‎

Lines changed: 23 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.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>{2611A503-AE4B-4739-AD31-80685D786D26}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>MorseCode.ITask</RootNamespace>
4+
<TargetFramework>netstandard1.0</TargetFramework>
5+
<Version>2.0.0</Version>
6+
<Authors>MorseCode Software</Authors>
7+
<Description>An awaitable covariant ITask interface which may be used in place of the built-in Task class.</Description>
8+
<PackageId>MorseCode.ITask</PackageId>
9+
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
10+
<PackageProjectUrl>https://github.com/jam40jeff/ITask</PackageProjectUrl>
11+
<Product>MorseCode ITask</Product>
12+
<Copyright>Copyright © MorseCode Software 2015</Copyright>
1113
<AssemblyName>MorseCode.ITask</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14+
<RootNamespace>MorseCode.ITask</RootNamespace>
1415
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
18+
<DocumentationFile>bin\Debug\netstandard1.0\MorseCode.ITask.xml</DocumentationFile>
19+
<DebugType>pdbonly</DebugType>
1620
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<RunCodeAnalysis>true</RunCodeAnalysis>
24-
<DocumentationFile>bin\Debug\MorseCode.ITask.XML</DocumentationFile>
2521
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
22+
23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
24+
<DocumentationFile>bin\Release\netstandard1.0\MorseCode.ITask.xml</DocumentationFile>
2725
<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-
<RunCodeAnalysis>true</RunCodeAnalysis>
34-
<DocumentationFile>bin\Release\MorseCode.ITask.XML</DocumentationFile>
35-
</PropertyGroup>
36-
<PropertyGroup>
37-
<SignAssembly>true</SignAssembly>
38-
</PropertyGroup>
39-
<PropertyGroup>
40-
<AssemblyOriginatorKeyFile>..\MorseCode.snk</AssemblyOriginatorKeyFile>
26+
<DebugSymbols>true</DebugSymbols>
4127
</PropertyGroup>
42-
<ItemGroup>
43-
<Reference Include="System" />
44-
<Reference Include="System.Core" />
45-
<Reference Include="System.Xml.Linq" />
46-
<Reference Include="System.Data.DataSetExtensions" />
47-
<Reference Include="Microsoft.CSharp" />
48-
<Reference Include="System.Data" />
49-
<Reference Include="System.Xml" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="AsyncMethodBuilderAttribute.cs" />
53-
<Compile Include="AwaiterInterfaceWrapper.cs" />
54-
<Compile Include="AwaiterInterfaceWrapper{TResult}.cs" />
55-
<Compile Include="TaskInterfaceAsyncMethodBuilder.cs" />
56-
<Compile Include="TaskInterfaceAsyncMethodBuilder{TResult}.cs" />
57-
<Compile Include="TaskInterfaceFactory.cs" />
58-
<Compile Include="TaskExtensionMethods.cs" />
59-
<Compile Include="TaskWrapper{TResult}.cs" />
60-
<Compile Include="ConfiguredTaskWrapper.cs" />
61-
<Compile Include="ConfiguredTaskWrapper{TResult}.cs" />
62-
<Compile Include="TaskAwaiterWrapper{TResult}.cs" />
63-
<Compile Include="ConfiguredTaskAwaiterWrapper.cs" />
64-
<Compile Include="ConfiguredTaskAwaiterWrapper{TResult}.cs" />
65-
<Compile Include="IAwaiter{TResult}.cs" />
66-
<Compile Include="IAwaiter.cs" />
67-
<Compile Include="IConfiguredTask{TResult}.cs" />
68-
<Compile Include="IConfiguredTask.cs" />
69-
<Compile Include="ITask{TResult}.cs" />
70-
<Compile Include="ITask.cs" />
71-
<Compile Include="Properties\AssemblyInfo.cs" />
72-
<Compile Include="TaskAwaiterWrapper.cs" />
73-
<Compile Include="TaskWrapper.cs" />
74-
</ItemGroup>
75-
<ItemGroup>
76-
<None Include="..\MorseCode.snk">
77-
<Link>MorseCode.snk</Link>
78-
</None>
79-
<None Include="_Root.nuspec" />
80-
</ItemGroup>
81-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
82-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
83-
Other similar extension points exist, see Microsoft.Common.targets.
84-
<Target Name="BeforeBuild">
85-
</Target>
86-
<Target Name="AfterBuild">
87-
</Target>
88-
-->
89-
</Project>
28+
29+
30+
</Project>

0 commit comments

Comments
 (0)