Skip to content

LRN 17472 - Update to .NET Standard #15

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

Merged
merged 6 commits into from
Dec 7, 2017
Merged

LRN 17472 - Update to .NET Standard #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e99dbe
Add JsonObject support to decimal
gonzalozawa Nov 2, 2017
439d8cd
Update unit tests to handle decimal numbers
gonzalozawa Nov 2, 2017
de81702
Update to .Net Standard
gonzalozawa Nov 16, 2017
ad507b5
Update nuget package details
gonzalozawa Nov 24, 2017
67d477d
Merge branch 'master' into LRN-17472
gonzalozawa Nov 29, 2017
3cd3250
Update nuget package version and settings
gonzalozawa Dec 7, 2017
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
20 changes: 0 additions & 20 deletions LearnositySDK-VS2010.sln
View file
Open in desktop

This file was deleted.

30 changes: 18 additions & 12 deletions LearnositySDK.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,34 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2009
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LearnositySDK", "LearnositySDK\LearnositySDK.csproj", "{4A1F8BE2-02A2-424D-AE33-11F742E18EED}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearnositySDK", "LearnositySDK\LearnositySDK.csproj", "{DC1B295A-F21E-4A3C-A4DA-76130D281546}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LearnositySDKUnitTests", "UnitTestProject1\LearnositySDKUnitTests.csproj", "{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearnositySDKUnitTests", "LearnositySDKUnitTests\LearnositySDKUnitTests.csproj", "{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}"
ProjectSection(ProjectDependencies) = postProject
{DC1B295A-F21E-4A3C-A4DA-76130D281546} = {DC1B295A-F21E-4A3C-A4DA-76130D281546}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Release|Any CPU.Build.0 = Release|Any CPU
{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Release|Any CPU.Build.0 = Release|Any CPU
{DC1B295A-F21E-4A3C-A4DA-76130D281546}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{DC1B295A-F21E-4A3C-A4DA-76130D281546}.Debug|Any CPU.Build.0 = Release|Any CPU
{DC1B295A-F21E-4A3C-A4DA-76130D281546}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC1B295A-F21E-4A3C-A4DA-76130D281546}.Release|Any CPU.Build.0 = Release|Any CPU
{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3C8708D7-B4D7-4294-A8EE-854A68D6CDA4}
EndGlobalSection
EndGlobal
102 changes: 25 additions & 77 deletions LearnositySDK/LearnositySDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4A1F8BE2-02A2-424D-AE33-11F742E18EED}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LearnositySDK</RootNamespace>
<TargetFramework>netstandard2.0</TargetFramework>
Copy link
Contributor

@karoltarasiuk karoltarasiuk Dec 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gonzalozawa what did you pick the version of .NET standard based on? They recommend:

to target the lowest version of .NET Standard possible

Copy link
Contributor Author

@gonzalozawa gonzalozawa Dec 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@karoltarasiuk this is a great question. I've tried using a lower version of .NET Standard but the project doesn't compile and throw errors. Mainly on Remote.cs and Init.cs
The problem in that particular classes is that System.Web and System.Net aren't included in the previous version of .NET Standard. See https://stackoverflow.com/questions/30227219/how-to-use-webclient-with-netcore
Do you think I should try to fix those classes and use .NET Core functionality or should we just target .NET Standard 2.0 ?

Copy link
Contributor

@karoltarasiuk karoltarasiuk Dec 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, makes sense. I think that in this case we leave it as is and only come back to it if somebody complains :)

<AssemblyName>LearnositySDK</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</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>
<Prefer32Bit>false</Prefer32Bit>
<RootNamespace>LearnositySDK</RootNamespace>
<PackageId>LearnositySDK</PackageId>
<PackageVersion>0.8.0</PackageVersion>
<Authors>Learnosity</Authors>
<Description>Learnosity SDK for ASP.NET / C#</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>Update to .Net Standard</PackageReleaseNotes>
<Copyright>Copyright Learnosity 2017 (c)</Copyright>
<PackageTags>learnosity sdk asp .net</PackageTags>
<Version>0.8.0</Version>
<PackageLicenseUrl>https://github.com/Learnosity/learnosity-sdk-asp.net/blob/master/LICENSE.md</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Learnosity/learnosity-sdk-asp.net</PackageProjectUrl>
<PackageIconUrl>https://www.learnosity.com/static/img/logos/learnositylogoforfacebook.jpg</PackageIconUrl>
<RepositoryUrl>https://www.learnosity.com/static/img/logos/learnositylogoforfacebook.jpg</RepositoryUrl>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</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>
<Prefer32Bit>false</Prefer32Bit>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>bin\Release\netstandard2.0\LearnositySDK.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Credentials.cs" />
<Compile Include="Examples\Assess.cs" />
<Compile Include="Examples\Author.cs" />
<Compile Include="Examples\Schemas.cs" />
<Compile Include="Examples\Data.cs" />
<Compile Include="Examples\Items.cs" />
<Compile Include="Examples\Questions.cs" />
<Compile Include="Examples\Reports.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Request\DataApi.cs" />
<Compile Include="Request\Init.cs" />
<Compile Include="Request\Remote.cs" />
<Compile Include="Utils\Conversion.cs" />
<Compile Include="Utils\GuidUtility.cs" />
<Compile Include="Utils\Json.cs" />
<Compile Include="Utils\JsonObject.cs" />
<Compile Include="Utils\JsonObjectFactory.cs" />
<Compile Include="Utils\CryptoUtil.cs" />
<Compile Include="Utils\Tools.cs" />
<Compile Include="Utils\Uuid.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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>

</Project>
36 changes: 0 additions & 36 deletions LearnositySDK/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions LearnositySDK/packages.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...TestProject1/CheckingEqualityUnitTests.cs → ...SDKUnitTests/CheckingEqualityUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using LearnositySDK.Utils;
using Newtonsoft.Json.Linq;

namespace UnitTestProject1
namespace LearnositySDKUnitTests
{
/// <summary>
/// Summary description for CheckingEqualityUnitTests
Expand Down
2 changes: 1 addition & 1 deletion UnitTestProject1/LearnositySDKUnitTests.cs → ...itySDKUnitTests/LearnositySDKUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using LearnositySDK.Utils;

namespace UnitTestProject1
namespace LearnositySDKUnitTests
{
[TestClass]
public class LearnositySDKUnitTests
Expand Down
23 changes: 23 additions & 0 deletions LearnositySDKUnitTests/LearnositySDKUnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>

<IsPackable>false</IsPackable>

<RootNamespace>LearnositySDKUnitTests</RootNamespace>

<AssemblyName>LearnositySDKUnitTests</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\LearnositySDK\LearnositySDK.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion UnitTestProject1/MergingObjectsUnitTests.cs → ...tySDKUnitTests/MergingObjectsUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using LearnositySDK.Utils;
using Newtonsoft.Json.Linq;

namespace UnitTestProject1
namespace LearnositySDKUnitTests
{
/// <summary>
/// Summary description for MergingObjectsUnitTests
Expand Down
2 changes: 1 addition & 1 deletion UnitTestProject1/ToolIsEmptyUnitTests.cs → ...ositySDKUnitTests/ToolIsEmptyUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using LearnositySDK.Utils;

namespace UnitTestProject1
namespace LearnositySDKUnitTests
{
/// <summary>
/// Summary description for ToolIsEmptyUnitTests
Expand Down
99 changes: 0 additions & 99 deletions UnitTestProject1/LearnositySDKUnitTests.csproj
View file
Open in desktop

This file was deleted.

Loading