Updated to netstandard2.0

nabinked · Jul 13, 2017 · f055ad2 · f055ad2
1 parent 609c42b
commit f055ad2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/sample/NToastNotify.Web/NToastNotify.Web.csproj b/sample/NToastNotify.Web/NToastNotify.Web.csproj
@@ -1,24 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="wwwroot\images\about-2-0-1.PNG" />
-    <Content Include="wwwroot\images\about2-0-1.PNG" />
-    <Content Include="wwwroot\images\contact-2-0-1.PNG" />
-    <Content Include="wwwroot\images\home-2-0-1.png" />
-    <Content Include="wwwroot\images\home2-0-1.png" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version=" 2.0.0-preview2-final" />
+    <!--<PackageReference Include="NToastNotify" Version="2.0.3" />-->
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
-    <PackageReference Include="NToastNotify" Version="2.0.3" />
+    <ProjectReference Include="..\..\src\NToastNotify.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/NToastNotify.csproj b/src/NToastNotify.csproj
@@ -3,14 +3,14 @@
     <Description>Dot Net abstraction of javascript toastr to create toast notification on ASP.NET Core MVC Projects</Description>
     <Copyright>Nabin Karki Thapa</Copyright>
     <AssemblyTitle>NToastNotify</AssemblyTitle>
-    <VersionPrefix>2.0.3</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Nabin Kakri Thapa</Authors>
     <PackageProjectUrl>https://github.com/nabinked/NToastNotify</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>ASP.NET Core MVC toastr toast notification server side rendered </PackageTags>
     <RepositoryUrl>https://github.com/nabinked/NToastNotify</RepositoryUrl>
-    <PackageReleaseNotes>Fixed Bugs</PackageReleaseNotes>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <PackageReleaseNotes>Updated to netstandard2.0</PackageReleaseNotes>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>NToastNotify</AssemblyName>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>

diff --git a/tests/NToastNotify.Tests/NToastNotify.Tests.csproj b/tests/NToastNotify.Tests/NToastNotify.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/NToastNotify.Tests/ObjectMergerTest.cs b/tests/NToastNotify.Tests/ObjectMergerTest.cs
@@ -8,13 +8,16 @@ public class ToastNotificationTest
         public void MergeWith_ValidArguments_ReturnMergedObject()
         {
             //Arrange
-            var primaryObject = new { prop1 = "p1", prop2 = "p2", prop3 = "p3" };
-            var secondaryObject = new { prop1 = "s1", prop3 = "s3" };
+            var obj1 = new ToastOption(){
+                PositionClass = "primary"
+            };
+            var obj2 = new ToastOption(){ 
+               CloseClass = "Close" 
+             };
             //Act
-            primaryObject.MergeWith<object>(secondaryObject);
+            obj2.MergeWith(obj1);
 
             //Assert
-            Assert.Same(secondaryObject.prop3, primaryObject.prop3);
         }
     }
 }