Skip to content

Commit

Permalink
Update Target Version and Dependencies
Browse files Browse the repository at this point in the history
Preparation for 4.2.0 release
Update from iCAL.Net Library 3.x to 4.x required small code changes for parsing calendar entries.
  • Loading branch information
andijakl committed Mar 9, 2018
1 parent 77f614d commit 00b07e5
Show file tree
Hide file tree
Showing 38 changed files with 69 additions and 66 deletions.
1 change: 1 addition & 0 deletions NdefDemo/NdefDemoWin10/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
<TextBlock x:Uid="About" Style="{StaticResource BeaconTypeTextBlockStyle}"/>
<TextBlock x:Uid="AboutText1" Style="{StaticResource InfoTextBlockStyle}" />
<HyperlinkButton x:Uid="TwitterButton" Style="{StaticResource HyperlinkStyle}"/>
<HyperlinkButton x:Uid="BlogButton" Style="{StaticResource HyperlinkStyle}"/>
<HyperlinkButton x:Uid="ContactEmailButton" Style="{StaticResource HyperlinkStyle}"/>
<TextBlock x:Uid="AboutText2" Style="{StaticResource InfoTextBlockStyle}" />
<HyperlinkButton x:Uid="LibraryUrlButton" Style="{StaticResource HyperlinkStyle}"/>
Expand Down
18 changes: 16 additions & 2 deletions NdefDemo/NdefDemoWin10/NdefDemoWin10.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>NdefDemoWin10</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
Expand All @@ -22,6 +22,7 @@
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -95,7 +96,6 @@
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
<None Include="NdefDemoWin10_TemporaryKey.pfx" />
<None Include="project.json" />
<PRIResource Include="Strings\en-US\Resources.resw" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -145,6 +145,20 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Ical.Net">
<Version>4.0.6</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.8</Version>
</PackageReference>
<PackageReference Include="NdefLibrary">
<Version>4.2.0</Version>
</PackageReference>
<PackageReference Include="NdefLibraryExtension">
<Version>4.2.0</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
Expand Down
6 changes: 6 additions & 0 deletions NdefDemo/NdefDemoWin10/Strings/en-US/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@
<data name="ApplicationTitle.Text" xml:space="preserve">
<value>NFC NDEF Demo</value>
</data>
<data name="BlogButton.Content" xml:space="preserve">
<value>Blog</value>
</data>
<data name="BlogButton.NavigateUri" xml:space="preserve">
<value>https://www.andreasjakl.com</value>
</data>
<data name="BtnInitNfc.Content" xml:space="preserve">
<value>Initialize NFC</value>
</data>
Expand Down
19 changes: 0 additions & 19 deletions NdefDemo/NdefDemoWin10/project.json

This file was deleted.

10 changes: 5 additions & 5 deletions NdefLibrary/NdefLibrary.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>NdefLibrary</id>
<version>4.1.0</version>
<version>4.2.0</version>
<title>NFC / NDEF Library for Proximity APIs</title>
<authors>Andreas Jakl</authors>
<owners>Andreas Jakl</owners>
Expand All @@ -19,7 +19,7 @@ This NDEF Library provides a set of classes that enable you to easily work with
Further NDEF record classes that extend this library with platform integration are available in the NdefLibraryExtension NuGet package (e.g., to use business cards, iCalendar data or images).</description>
<releaseNotes>See https://github.com/andijakl/ndef-nfc/releases for details</releaseNotes>
<summary>Easily parse and create standardized NDEF records for NFC Tags.</summary>
<copyright>Copyright 2012 - 2017 Andreas Jakl, https://www.nfcinteractor.com/</copyright>
<copyright>Copyright 2012 - 2018 Andreas Jakl, https://www.nfcinteractor.com/</copyright>
<tags>nfc ndef proximity smart poster snep near field communication message record launchapp vcard vcf icalendar ical ics bluetooth handover</tags>
<repository url="https://github.com/andijakl/ndef-nfc/" />
<dependencies>
Expand All @@ -29,8 +29,8 @@ Further NDEF record classes that extend this library with platform integration a
</dependencies>
</metadata>
<files>
<file src="D:\Source\GitHub\ndef-nfc\NdefLibrary\NdefLibrary\bin\Release\netstandard1.4\NdefLibrary.dll" target="lib\netstandard1.4\NdefLibrary.dll" />
<file src="D:\Source\GitHub\ndef-nfc\NdefLibrary\NdefLibrary\bin\Release\netstandard1.4\NdefLibrary.pdb" target="lib\netstandard1.4\NdefLibrary.pdb" />
<file src="D:\Source\GitHub\ndef-nfc\NdefLibrary\NdefLibrary\**\*.cs" target="src\NdefLibrary" exclude="**\TemporaryGeneratedFile*.cs;NdefLibrary\obj\**\*.*" />
<file src="NdefLibrary\bin\Release\netstandard1.4\NdefLibrary.dll" target="lib\netstandard1.4\NdefLibrary.dll" />
<file src="NdefLibrary\bin\Release\netstandard1.4\NdefLibrary.pdb" target="lib\netstandard1.4\NdefLibrary.pdb" />
<file src="NdefLibrary\**\*.cs" target="src\NdefLibrary" exclude="**\TemporaryGeneratedFile*.cs;NdefLibrary\obj\**\*.*" />
</files>
</package>
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/GeoCoordinate.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefAndroidAppRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefException.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefGeoRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefHandoverErrorRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefHandoverSelectRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefHandoverVersion.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefIcalendarRecordBase.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefLaunchAppRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefMailtoRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefMessage.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** Original version copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
**
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefMimeImageRecordBase.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** Original version copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
**
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefSmartUriRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefSmsRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefSocialRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefSpRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefTelRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefTextRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** Original version copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
**
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefUriRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** Original version copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
**
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefVcardRecordBase.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibrary/Ndef/NdefWindowsSettingsRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
10 changes: 5 additions & 5 deletions NdefLibrary/NdefLibraryExtension.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.8.1">
<id>NdefLibraryExtension</id>
<version>4.1.0</version>
<version>4.2.0</version>
<title>NFC / NDEF Library Platform Extensions for Proximity APIs</title>
<authors>Andreas Jakl</authors>
<owners>Andreas Jakl</owners>
Expand All @@ -15,16 +15,16 @@
Based on the cross platform NFC / NDEF library, this extension module adds additional NDEF record classes that integrate with platform features to enable additional use cases. The extension enables creating vCard records, Mime Image records as well as iCalendar records on Windows 10 (UWP). This extension includes 3rd party extension libraries.</description>
<summary>Extends the NFC / NDEF Library with platform specific support for additional use cases.</summary>
<releaseNotes>See https://github.com/andijakl/ndef-nfc/releases for details</releaseNotes>
<copyright>Copyright 2012 - 2017 Andreas Jakl, https://www.nfcinteractor.com/</copyright>
<copyright>Copyright 2012 - 2018 Andreas Jakl, https://www.nfcinteractor.com/</copyright>
<tags>nfc ndef proximity smart poster snep near field communication message record launchapp vcard vcf icalendar ical ics</tags>
<dependencies>
<group>
<dependency id="NdefLibrary" version="4.1.0" />
<dependency id="NdefLibrary" version="4.2.0" />
</group>

<group targetFramework="uap10.0">
<dependency id="NdefLibrary" version="4.1.0" />
<dependency id="Ical.Net" version="3.0.11-net-core-beta" />
<dependency id="NdefLibrary" version="4.2.0" />
<dependency id="Ical.Net" version="4.0.6" />
</group>

</dependencies>
Expand Down
7 changes: 4 additions & 3 deletions NdefLibrary/NdefLibraryUwp/Ndef/NdefIcalendarRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2017 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down Expand Up @@ -34,8 +34,9 @@
using Windows.ApplicationModel.Appointments;
using Ical.Net;
using Ical.Net.DataTypes;
using Ical.Net.Serialization.iCalendar.Serializers;
using NdefLibrary.Ndef;
using Ical.Net.Serialization;
using Ical.Net.CalendarComponents;

namespace NdefLibraryUwp.Ndef
{
Expand Down Expand Up @@ -191,7 +192,7 @@ private Calendar ConvertAppointmentToIcalendar(Appointment ap)
private void ConvertIcalendarToAppointment(byte[] iCalendarPayload)
{
var iCalendarStream = new MemoryStream(iCalendarPayload);
var calendarCollection = Calendar.LoadFromStream(iCalendarStream);
var calendarCollection = CalendarCollection.Load(iCalendarStream);

if (calendarCollection.Count >= 1)
{
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibraryUwp/Ndef/NdefMimeImageRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
2 changes: 1 addition & 1 deletion NdefLibrary/NdefLibraryUwp/Ndef/NdefVcardRecord.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012-2016 Andreas Jakl - https://www.nfcinteractor.com/
** Copyright (C) 2012-2018 Andreas Jakl - https://www.nfcinteractor.com/
** All rights reserved.
**
** Extension to the NDEF handling classes.
Expand Down
Loading

0 comments on commit 00b07e5

Please sign in to comment.