Fix compilation due to codecleanup

WOA-Project · Jan 17, 2024 · 6f2a17e · 6f2a17e
1 parent 9f21ef7
commit 6f2a17e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/Img2Ffu/Data/StoreHeader.cs b/Img2Ffu/Data/StoreHeader.cs
@@ -36,7 +36,7 @@ public class StoreHeader
         private ushort FullFlashMinorVersion = 0;
 
         // Size is 0xC0
-        public required string[] PlatformIds
+        public string[] PlatformIds
         {
             get; set;
         }
@@ -85,9 +85,9 @@ public ulong StorePayloadSize
         // Must be followed by the unicode string of the device path
         // So the total size would be doubled from DevicePathLength in bytes in the binary
 
-        private required byte[] DevicePathBuffer;
+        private byte[] DevicePathBuffer;
 
-        public required string DevicePath
+        public string DevicePath
         {
             get; set;
         }

diff --git a/Img2Ffu/Data/WriteDescriptor.cs b/Img2Ffu/Data/WriteDescriptor.cs
@@ -4,11 +4,11 @@ namespace Img2Ffu.Data
 {
     public class WriteDescriptor
     {
-        public required BlockDataEntry BlockDataEntry
+        public BlockDataEntry BlockDataEntry
         {
             get; set;
         }
-        public required DiskLocation[] DiskLocations
+        public DiskLocation[] DiskLocations
         {
             get; set;
         }

diff --git a/Img2Ffu/GPT/Partition.cs b/Img2Ffu/GPT/Partition.cs
@@ -30,7 +30,7 @@ public class Partition
             private ulong _FirstSector;
             private ulong _LastSector;
 
-            public required string Name;            // 0x48
+            public string Name;            // 0x48
             public Guid PartitionTypeGuid; // 0x10
             public Guid PartitionGuid;     // 0x10
             internal ulong Attributes;      // 0x08

diff --git a/Img2Ffu/Manifest/FullFlashManifest.cs b/Img2Ffu/Manifest/FullFlashManifest.cs
@@ -27,16 +27,16 @@ namespace Img2Ffu.Manifest
 {
     internal class FullFlashManifest
     {
-        public required string OSVersion;
+        public string OSVersion;
         public string AntiTheftVersion = "1.1"; // Allow flashing on all devices
         public string Description = "Update on: " + DateTime.Now.ToString("u") + "::\r\n";
 
         public string StateSeparationLevel = "0";
         public string UEFI = "True";
         public string Version = "2.0";
-        public required string DevicePlatformId3;
-        public required string DevicePlatformId2;
-        public required string DevicePlatformId1;
-        public required string DevicePlatformId0;
+        public string DevicePlatformId3;
+        public string DevicePlatformId2;
+        public string DevicePlatformId1;
+        public string DevicePlatformId0;
     }
 }
diff --git a/Img2Ffu/Manifest/PartitionManifest.cs b/Img2Ffu/Manifest/PartitionManifest.cs
@@ -31,9 +31,9 @@ internal class PartitionManifest
         public uint UsedSectors;
         public Guid? Type;
         public uint TotalSectors;
-        public required string Primary;
-        public required string Name;
-        public required string FileSystem;
+        public string Primary;
+        public string Name;
+        public string FileSystem;
         public uint? ByteAlignment;
         public uint? ClusterSize;
         public bool? UseAllSpace;

diff --git a/Img2Ffu/Options.cs b/Img2Ffu/Options.cs
@@ -30,37 +30,37 @@ internal partial class Program
         internal class Options
         {
             [Option('i', "img-file", HelpText = @"A path to the img file to convert *OR* a PhysicalDisk path. i.e. \\.\PhysicalDrive1", Required = true)]
-            public required string InputFile
+            public string InputFile
             {
                 get; set;
             }
 
             [Option('f', "ffu-file", HelpText = "A path to the FFU file to output", Required = true)]
-            public required string FFUFile
+            public string FFUFile
             {
                 get; set;
             }
 
             [Option('e', "excluded-file", HelpText = "A path to the file with all partitions to exclude", Required = false, Default = ".\\provisioning-partitions.txt")]
-            public required string ExcludedPartitionNamesFilePath
+            public string ExcludedPartitionNamesFilePath
             {
                 get; set;
             }
 
             [Option('p', "plat-id", HelpText = "Platform ID to use", Required = true)]
-            public required string PlatformID
+            public string PlatformID
             {
                 get; set;
             }
 
             [Option('a', "anti-theft-version", Required = false, HelpText = "Anti theft version.", Default = "1.1")]
-            public required string AntiTheftVersion
+            public string AntiTheftVersion
             {
                 get; set;
             }
 
             [Option('o', "os-version", Required = false, HelpText = "Operating system version.", Default = "10.0.11111.0")]
-            public required string OperatingSystemVersion
+            public string OperatingSystemVersion
             {
                 get; set;
             }