diff --git a/src/NmeaParser/BluetoothDevice.UWP.cs b/src/NmeaParser/BluetoothDevice.UWP.cs
index 673d605..346bbb6 100644
--- a/src/NmeaParser/BluetoothDevice.UWP.cs
+++ b/src/NmeaParser/BluetoothDevice.UWP.cs
@@ -12,7 +12,7 @@
 //  *   limitations under the License.
 //  ******************************************************************************
 
-#if NETFX_CORE
+#if WINDOWS_UWP
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/NmeaParser/NmeaFileDevice.cs b/src/NmeaParser/NmeaFileDevice.cs
index cf19ed4..249c0e2 100644
--- a/src/NmeaParser/NmeaFileDevice.cs
+++ b/src/NmeaParser/NmeaFileDevice.cs
@@ -26,7 +26,7 @@ namespace NmeaParser
     /// </summary>
     public class NmeaFileDevice : BufferedStreamDevice
     {
-#if NETFX_CORE
+#if WINDOWS_UWP
         private Windows.Storage.IStorageFile? m_storageFile;
 #endif
         private string m_filename;
@@ -40,7 +40,7 @@ namespace NmeaParser
         {
         }
 
-#if NETFX_CORE
+#if WINDOWS_UWP
         /// <summary>
         /// Initializes a new instance of the <see cref="NmeaFileDevice"/> class.
         /// </summary>
@@ -59,7 +59,7 @@ namespace NmeaParser
             m_filename = fileName;
         }
 
-#if NETFX_CORE
+#if WINDOWS_UWP
         /// <summary>
         /// Initializes a new instance of the <see cref="NmeaFileDevice"/> class.
         /// </summary>
@@ -89,7 +89,7 @@ namespace NmeaParser
         protected override Task<Stream> GetStreamAsync()
         {
 
-#if NETFX_CORE
+#if WINDOWS_UWP
             if (m_storageFile != null)
                 return m_storageFile.OpenStreamForReadAsync();
 #endif
diff --git a/src/NmeaParser/NmeaParser.csproj b/src/NmeaParser/NmeaParser.csproj
index 7259760..fc0fcdb 100644
--- a/src/NmeaParser/NmeaParser.csproj
+++ b/src/NmeaParser/NmeaParser.csproj
@@ -18,7 +18,7 @@
     <PackageProjectUrl>https://dotmorten.github.io/NmeaParser/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/dotMorten/NmeaParser</RepositoryUrl>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Copyright>Copyright © Morten Nielsen 2015-2023</Copyright>
+    <Copyright>Copyright © Morten Nielsen 2015-$([System.DateTime]::Now.ToString('yyyy'))</Copyright>
     <OutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\NmeaParser\$(Configuration)</OutputPath>
     <PackageOutputPath>..\..\artifacts\NuGet\$(Configuration)\</PackageOutputPath>
     <PackageReleaseNotes></PackageReleaseNotes>
@@ -34,7 +34,7 @@
     <PackageIconUrl />
     <CheckEolWorkloads>false</CheckEolWorkloads>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
-	<_SdkIgnoreMSBuildCoreWarning>true</_SdkIgnoreMSBuildCoreWarning>
+    <_SdkIgnoreMSBuildCoreWarning>true</_SdkIgnoreMSBuildCoreWarning>
   </PropertyGroup>
     
   <PropertyGroup Label="PackageValidationSettings">
@@ -91,11 +91,11 @@
     <NoWarn>$(NoWarn);VSX1000</NoWarn>
   </PropertyGroup>
   
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.19041'">
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
   </PropertyGroup>
   
-  <ItemGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'uap10.0.19041'">
     <EmbeddedResource Include="**\*.rd.xml" />
   </ItemGroup>
 
diff --git a/src/SampleApp.WinDesktop/RestoreAutoPanMode.cs b/src/SampleApp.WinDesktop/RestoreAutoPanMode.cs
index 1328995..1048115 100644
--- a/src/SampleApp.WinDesktop/RestoreAutoPanMode.cs
+++ b/src/SampleApp.WinDesktop/RestoreAutoPanMode.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows;
 using System.ComponentModel;
-#if NETFX_CORE
+#if WINDOWS_UWP
 using Windows.UI.Xaml;
 #else
 using System.Windows.Threading;
@@ -28,7 +28,7 @@ namespace SampleApp.WinDesktop
             }
 
 
-#if NETFX_CORE
+#if WINDOWS_UWP
             void m_timer_Tick(object sender, object e)
 #else
             void m_timer_Tick(object sender, EventArgs e)
diff --git a/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs b/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs
index 4154345..a18bfbc 100644
--- a/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs
+++ b/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs
@@ -31,14 +31,14 @@ namespace NmeaParser.Tests
     {
         [TestMethod]
         public
-#if NETFX_CORE
+#if WINDOWS_UWP
             async Task
 #else
             void
 #endif
             ParseNmeaFile()
         {
-#if NETFX_CORE
+#if WINDOWS_UWP
             var file = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///NmeaSampleData.txt"));
             System.IO.StreamReader reader = new System.IO.StreamReader(await file.OpenStreamForReadAsync());
 #else
@@ -64,14 +64,14 @@ namespace NmeaParser.Tests
         }
         [TestMethod]
         public
-#if NETFX_CORE
+#if WINDOWS_UWP
             async Task
 #else
             void
 #endif
             ParseTrimbleR2NmeaFile()
         {
-#if NETFX_CORE
+#if WINDOWS_UWP
             var file = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///TrimbleR2SampleData.txt"));
             System.IO.StreamReader reader = new System.IO.StreamReader(await file.OpenStreamForReadAsync());
 #else