Make sure NET8 is its own defined constant

NetSparkleUpdater · Oct 8, 2023 · fa2431e · fa2431e
1 parent 8d2be27
commit fa2431e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/NetSparkle.Tests/SparkleUpdaterFixture.cs b/src/NetSparkle.Tests/SparkleUpdaterFixture.cs
@@ -4,7 +4,7 @@
 using NetSparkleUpdater.AppCastHandlers;
 using NetSparkleUpdater.Interfaces;
 using Xunit;
-#if (NETSTANDARD || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET5 || NET6 || NET7 || NET8)
 using System.Runtime.InteropServices;
 #endif
 

diff --git a/src/NetSparkle/Configurations/JSONConfiguration.cs b/src/NetSparkle/Configurations/JSONConfiguration.cs
@@ -8,7 +8,7 @@
 using System.Globalization;
 using System.IO;
 using System.Text;
-#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7 || NET8)
 using System.Text.Json;
 #endif
 
@@ -138,7 +138,7 @@ private bool LoadValuesFromPath(string saveLocation)
                 try
                 {
                     string json = File.ReadAllText(saveLocation);
-#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7 || NET8)
                     var data = JsonSerializer.Deserialize<SavedConfigurationData>(json);
 #else
                     var data = JsonConvert.DeserializeObject<SavedConfigurationData>(json);
@@ -201,7 +201,7 @@ private bool SaveValuesToPath(string savePath)
             };
             LastConfigUpdate = savedConfig.LastConfigUpdate;
 
-#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7 || NET8)
             string json = JsonSerializer.Serialize(savedConfig);
 #else
             string json = JsonConvert.SerializeObject(savedConfig);

diff --git a/src/NetSparkle/Configurations/RegistryConfiguration.cs b/src/NetSparkle/Configurations/RegistryConfiguration.cs
@@ -3,7 +3,7 @@
 using Microsoft.Win32;
 using NetSparkleUpdater.AssemblyAccessors;
 using NetSparkleUpdater.Interfaces;
-#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7 || NET8)
 using System.Runtime.InteropServices;
 #endif
 
@@ -140,7 +140,7 @@ private DateTime ConvertStringToDate(string str)
         /// <returns><c>true</c> if the items were loaded successfully; false otherwise</returns>
         private bool LoadValuesFromPath(string regPath)
         {
-#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7 || NET8)
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 return false;
@@ -212,7 +212,7 @@ private void SaveDidRunOnceAsTrue(string regPath)
         /// <returns><c>true</c> if the values were saved to the registry; false otherwise</returns>
         private bool SaveValuesToPath(string regPath)
         {
-#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7 || NET8)
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 return false;

diff --git a/src/NetSparkle/NetSparkle.csproj b/src/NetSparkle/NetSparkle.csproj
@@ -87,12 +87,12 @@
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
 		<OutputPath>..\bin\Release\NetSparkle\</OutputPath>
 		<DocumentationFile>..\bin\Release\NetSparkle\NetSparkle.xml</DocumentationFile>
-		<DefineConstants>TRACE;NETCORE;NET7</DefineConstants>
+		<DefineConstants>TRACE;NETCORE;NET8</DefineConstants>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
 		<OutputPath>..\bin\Debug\NetSparkle\</OutputPath>
 		<DocumentationFile>..\bin\Debug\NetSparkle\NetSparkle.xml</DocumentationFile>
-		<DefineConstants>DEBUG;TRACE;NETCORE;NET7</DefineConstants>
+		<DefineConstants>DEBUG;TRACE;NETCORE;NET8</DefineConstants>
 	</PropertyGroup>
   <!-- .NET 4.5.2 references, compilation flags and build options -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">

diff --git a/src/NetSparkle/SparkleUpdater.cs b/src/NetSparkle/SparkleUpdater.cs
@@ -19,7 +19,7 @@
 using NetSparkleUpdater.AssemblyAccessors;
 using System.Text;
 using System.Globalization;
-#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7 || NET8)
 using System.Runtime.InteropServices;
 #endif
 
@@ -248,7 +248,7 @@ public Configuration Configuration
             {
                 if (_configuration == null)
                 {
-#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7)
+#if (NETSTANDARD || NET31 || NET5 || NET6 || NET7 || NET8)
                     if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                     {
                         _configuration = new RegistryConfiguration(new AssemblyReflectionAccessor(_appReferenceAssembly));