Skip to content

Commit 9b8dcb0

Browse files
gonzalozawagonzalozawa
authored
LRN 17472 - Update to .NET Standard (#15)
* Add JsonObject support to decimal * Update unit tests to handle decimal numbers * Update to .Net Standard * Update nuget package details * Update nuget package version and settings
1 parent df887b6 commit 9b8dcb0

File tree

12 files changed

+70
-288
lines changed

12 files changed

+70
-288
lines changed

‎LearnositySDK-VS2010.sln‎

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

‎LearnositySDK.sln‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27004.2009
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LearnositySDK", "LearnositySDK\LearnositySDK.csproj", "{4A1F8BE2-02A2-424D-AE33-11F742E18EED}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearnositySDK", "LearnositySDK\LearnositySDK.csproj", "{DC1B295A-F21E-4A3C-A4DA-76130D281546}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LearnositySDKUnitTests", "UnitTestProject1\LearnositySDKUnitTests.csproj", "{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearnositySDKUnitTests", "LearnositySDKUnitTests\LearnositySDKUnitTests.csproj", "{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}"
9+
ProjectSection(ProjectDependencies) = postProject
10+
{DC1B295A-F21E-4A3C-A4DA-76130D281546} = {DC1B295A-F21E-4A3C-A4DA-76130D281546}
11+
EndProjectSection
912
EndProject
1013
Global
1114
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1215
Debug|Any CPU = Debug|Any CPU
1316
Release|Any CPU = Release|Any CPU
1417
EndGlobalSection
1518
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Release|Any CPU.Build.0 = Release|Any CPU
19+
{DC1B295A-F21E-4A3C-A4DA-76130D281546}.Debug|Any CPU.ActiveCfg = Release|Any CPU
20+
{DC1B295A-F21E-4A3C-A4DA-76130D281546}.Debug|Any CPU.Build.0 = Release|Any CPU
21+
{DC1B295A-F21E-4A3C-A4DA-76130D281546}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{DC1B295A-F21E-4A3C-A4DA-76130D281546}.Release|Any CPU.Build.0 = Release|Any CPU
23+
{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
26+
{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Release|Any CPU.Build.0 = Release|Any CPU
2427
EndGlobalSection
2528
GlobalSection(SolutionProperties) = preSolution
2629
HideSolutionNode = FALSE
2730
EndGlobalSection
31+
GlobalSection(ExtensibilityGlobals) = postSolution
32+
SolutionGuid = {3C8708D7-B4D7-4294-A8EE-854A68D6CDA4}
33+
EndGlobalSection
2834
EndGlobal

‎LearnositySDK/LearnositySDK.csproj‎

Lines changed: 25 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,31 @@
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-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{4A1F8BE2-02A2-424D-AE33-11F742E18EED}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>LearnositySDK</RootNamespace>
4+
<TargetFramework>netstandard2.0</TargetFramework>
125
<AssemblyName>LearnositySDK</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<TargetFrameworkProfile />
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
<Prefer32Bit>false</Prefer32Bit>
6+
<RootNamespace>LearnositySDK</RootNamespace>
7+
<PackageId>LearnositySDK</PackageId>
8+
<PackageVersion>0.8.0</PackageVersion>
9+
<Authors>Learnosity</Authors>
10+
<Description>Learnosity SDK for ASP.NET / C#</Description>
11+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
12+
<PackageReleaseNotes>Update to .Net Standard</PackageReleaseNotes>
13+
<Copyright>Copyright Learnosity 2017 (c)</Copyright>
14+
<PackageTags>learnosity sdk asp .net</PackageTags>
15+
<Version>0.8.0</Version>
16+
<PackageLicenseUrl>https://github.com/Learnosity/learnosity-sdk-asp.net/blob/master/LICENSE.md</PackageLicenseUrl>
17+
<PackageProjectUrl>https://github.com/Learnosity/learnosity-sdk-asp.net</PackageProjectUrl>
18+
<PackageIconUrl>https://www.learnosity.com/static/img/logos/learnositylogoforfacebook.jpg</PackageIconUrl>
19+
<RepositoryUrl>https://www.learnosity.com/static/img/logos/learnositylogoforfacebook.jpg</RepositoryUrl>
20+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2621
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
<Prefer32Bit>false</Prefer32Bit>
22+
23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
24+
<DocumentationFile>bin\Release\netstandard2.0\LearnositySDK.xml</DocumentationFile>
3525
</PropertyGroup>
26+
3627
<ItemGroup>
37-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
40-
</Reference>
41-
<Reference Include="System" />
42-
<Reference Include="System.configuration" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Web" />
45-
<Reference Include="System.Xml.Linq" />
46-
<Reference Include="System.Data.DataSetExtensions" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Xml" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<Compile Include="Credentials.cs" />
52-
<Compile Include="Examples\Assess.cs" />
53-
<Compile Include="Examples\Author.cs" />
54-
<Compile Include="Examples\Schemas.cs" />
55-
<Compile Include="Examples\Data.cs" />
56-
<Compile Include="Examples\Items.cs" />
57-
<Compile Include="Examples\Questions.cs" />
58-
<Compile Include="Examples\Reports.cs" />
59-
<Compile Include="Properties\AssemblyInfo.cs" />
60-
<Compile Include="Request\DataApi.cs" />
61-
<Compile Include="Request\Init.cs" />
62-
<Compile Include="Request\Remote.cs" />
63-
<Compile Include="Utils\Conversion.cs" />
64-
<Compile Include="Utils\GuidUtility.cs" />
65-
<Compile Include="Utils\Json.cs" />
66-
<Compile Include="Utils\JsonObject.cs" />
67-
<Compile Include="Utils\JsonObjectFactory.cs" />
68-
<Compile Include="Utils\CryptoUtil.cs" />
69-
<Compile Include="Utils\Tools.cs" />
70-
<Compile Include="Utils\Uuid.cs" />
71-
</ItemGroup>
72-
<ItemGroup>
73-
<None Include="packages.config" />
28+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
7429
</ItemGroup>
75-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
77-
Other similar extension points exist, see Microsoft.Common.targets.
78-
<Target Name="BeforeBuild">
79-
</Target>
80-
<Target Name="AfterBuild">
81-
</Target>
82-
-->
83-
</Project>
30+
31+
</Project>

‎LearnositySDK/Properties/AssemblyInfo.cs‎

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

‎LearnositySDK/packages.config‎

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

‎UnitTestProject1/CheckingEqualityUnitTests.cs‎ renamed to ‎LearnositySDKUnitTests/CheckingEqualityUnitTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using LearnositySDK.Utils;
44
using Newtonsoft.Json.Linq;
55

6-
namespace UnitTestProject1
6+
namespace LearnositySDKUnitTests
77
{
88
/// <summary>
99
/// Summary description for CheckingEqualityUnitTests

‎UnitTestProject1/LearnositySDKUnitTests.cs‎ renamed to ‎LearnositySDKUnitTests/LearnositySDKUnitTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Microsoft.VisualStudio.TestTools.UnitTesting;
33
using LearnositySDK.Utils;
44

5-
namespace UnitTestProject1
5+
namespace LearnositySDKUnitTests
66
{
77
[TestClass]
88
public class LearnositySDKUnitTests

‎LearnositySDKUnitTests/LearnositySDKUnitTests.csproj‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
7+
8+
<RootNamespace>LearnositySDKUnitTests</RootNamespace>
9+
10+
<AssemblyName>LearnositySDKUnitTests</AssemblyName>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
15+
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
16+
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="..\LearnositySDK\LearnositySDK.csproj" />
21+
</ItemGroup>
22+
23+
</Project>

‎UnitTestProject1/MergingObjectsUnitTests.cs‎ renamed to ‎LearnositySDKUnitTests/MergingObjectsUnitTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using LearnositySDK.Utils;
44
using Newtonsoft.Json.Linq;
55

6-
namespace UnitTestProject1
6+
namespace LearnositySDKUnitTests
77
{
88
/// <summary>
99
/// Summary description for MergingObjectsUnitTests

‎UnitTestProject1/ToolIsEmptyUnitTests.cs‎ renamed to ‎LearnositySDKUnitTests/ToolIsEmptyUnitTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
66
using LearnositySDK.Utils;
77

8-
namespace UnitTestProject1
8+
namespace LearnositySDKUnitTests
99
{
1010
/// <summary>
1111
/// Summary description for ToolIsEmptyUnitTests

0 commit comments

Comments
 (0)