Upgraded to .Net 8.0 (#658)

Co-authored-by: Andrew Petrochuk (from Dev Box) <[email protected]>

.editorconfig

@@ -225,6 +225,10 @@ dotnet_diagnostic.IDE0090.severity = warning    # expression can be simplified
 dotnet_diagnostic.IDE0130.severity = none       # Namespace does not match folder structure
 dotnet_diagnostic.IDE0161.severity = error      # Namespace declaration preferences
 dotnet_diagnostic.IDE0210.severity = none       # Convert to top-level statements
+dotnet_diagnostic.IDE0290.severity = suggestion # Use primary constructor
+dotnet_diagnostic.IDE0300.severity = suggestion # Collection initialization can be simplified
+dotnet_diagnostic.IDE0301.severity = suggestion # Collection initialization can be simplified
+dotnet_diagnostic.IDE0305.severity = suggestion # Collection initialization can be simplified
 dotnet_diagnostic.IDE1006.severity = none       # These words must begin with upper case characters
 
 

src/PAModel/Serializers/MsAppSerializer.cs

@@ -57,10 +57,7 @@ private static string AsString(ZipArchiveEntry entry)
 
     public static CanvasDocument Load(Stream streamToMsapp, ErrorContainer errors)
     {
-        if (streamToMsapp == null)
-        {
-            throw new ArgumentNullException(nameof(streamToMsapp));
-        }
+        ArgumentNullException.ThrowIfNull(streamToMsapp);
 
         // Read raw files. 
         // Apply transforms. 

src/PAModel/packages.lock.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net7.0": {
+    "net8.0": {
       "Newtonsoft.Json": {
         "type": "Direct",
         "requested": "[13.0.1, )",
@@ -119,4 +119,4 @@
       }
     }
   }
-}
+}

src/Persistence.Tests/.editorconfig

@@ -1,3 +1,4 @@
 [*.cs]
 
-# Rule overrides:
+dotnet_diagnostic.CA1861.severity = silent # Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array
+dotnet_diagnostic.CA1859.severity = silent # Change return type of method

src/Persistence.Tests/PersistenceLibraryExceptionTests.cs

@@ -52,20 +52,6 @@ public void MessageTest()
             .WithMessage("[5000:MsappArchiveError] An error was detected in an msapp file. A test reason2. Line: 5; Column: 3; MsappEntry: src/entry1.txt; JsonPath: some.json.path[0].value;");
     }
 
-    [TestMethod]
-    public void IsSerializableTests()
-    {
-        new PersistenceLibraryException(PersistenceErrorCode.DeserializationError).Should().BeBinarySerializable();
-        new PersistenceLibraryException(PersistenceErrorCode.SerializationError, "A test reason.").Should().BeBinarySerializable();
-        new PersistenceLibraryException(PersistenceErrorCode.MsappArchiveError, "A test reason2.")
-        {
-            MsappEntryFullPath = "src/entry1.txt",
-            LineNumber = 5,
-            Column = 3,
-            JsonPath = "some.json.path[0].value",
-        }.Should().BeBinarySerializable();
-    }
-
     /// <summary>
     /// Throws the specified exception and then asserts it was thrown,
     /// returning the <see cref="ExceptionAssertions{TException}"/> allowing caller to

src/Persistence.Tests/TestBase.cs

@@ -33,15 +33,15 @@ public TestBase()
         ControlFactory = ServiceProvider.GetRequiredService<IControlFactory>();
     }
 
-    private static IServiceProvider BuildServiceProvider()
+    private static ServiceProvider BuildServiceProvider()
     {
         var serviceCollection = new ServiceCollection();
         var serviceProvider = ConfigureServices(serviceCollection);
 
         return serviceProvider;
     }
 
-    private static IServiceProvider ConfigureServices(IServiceCollection services)
+    private static ServiceProvider ConfigureServices(IServiceCollection services)
     {
         services.AddPowerAppsPersistence(useDefaultTemplates: true);
 

src/Persistence/Extensions/StringExtensions.cs

@@ -13,7 +13,7 @@ public static string FirstCharToUpper(this string input)
 
         var first = char.ToUpper(input[0], CultureInfo.InvariantCulture);
         var rest = input.AsSpan(1);
-        return string.Concat(new ReadOnlySpan<char>(first), rest);
+        return string.Concat(new ReadOnlySpan<char>(in first), rest);
     }
 
     public static bool StartsWithInvariant(this string input, string value)

src/Persistence/PersistenceLibraryException.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System.Globalization;
-using System.Runtime.Serialization;
 using System.Text;
 using YamlDotNet.Core;
 
@@ -32,20 +31,6 @@ public PersistenceLibraryException(PersistenceErrorCode errorCode, string? reaso
         ErrorCode = errorCode.CheckArgumentInRange();
     }
 
-    protected PersistenceLibraryException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-        ErrorCode = ((PersistenceErrorCode)info.GetInt32(nameof(ErrorCode))).CheckArgumentInRange();
-        MsappEntryFullPath = info.GetString(nameof(MsappEntryFullPath));
-        JsonPath = info.GetString(nameof(JsonPath));
-
-        // Normalize null numbers to make serialization easier. -1 isn't valid values for LineNumber or Column.
-        var lineNumber = info.GetInt64(nameof(LineNumber));
-        LineNumber = lineNumber < 0 ? null : lineNumber;
-        var column = info.GetInt64(nameof(Column));
-        Column = column < 0 ? null : column;
-    }
-
     public override string Message => ComposeMessage();
 
     public string? Reason => base.Message.Length == 0 ? null : base.Message; // we get the storage of a string for free
@@ -103,17 +88,6 @@ private string ComposeMessage()
         return sb.ToString();
     }
 
-    public override void GetObjectData(SerializationInfo info, StreamingContext context)
-    {
-        info.AddValue(nameof(ErrorCode), ErrorCode);
-        info.AddValue(nameof(MsappEntryFullPath), MsappEntryFullPath);
-        info.AddValue(nameof(JsonPath), JsonPath);
-        info.AddValue(nameof(LineNumber), LineNumber ?? -1);
-        info.AddValue(nameof(Column), Column ?? -1);
-
-        base.GetObjectData(info, context);
-    }
-
     internal static PersistenceLibraryException FromYamlException(YamlException ex, PersistenceErrorCode errorCode)
     {
         return ex.Start.Equals(Mark.Empty)

src/Persistence/Yaml/ControlObjectFactory.cs

@@ -11,7 +11,7 @@ namespace Microsoft.PowerPlatform.PowerApps.Persistence.Yaml;
 
 public class ControlObjectFactory : IObjectFactory
 {
-    private readonly IObjectFactory _defaultObjectFactory;
+    private readonly DefaultObjectFactory _defaultObjectFactory;
     private readonly IControlTemplateStore _controlTemplateStore;
     private readonly IControlFactory _controlFactory;
 

src/Persistence/Yaml/FirstClassControlsEmitter.cs

@@ -13,7 +13,7 @@ namespace Microsoft.PowerPlatform.PowerApps.Persistence.Yaml;
 internal sealed class FirstClassControlsEmitter : ChainedEventEmitter
 {
     private readonly IControlTemplateStore _controlTemplateStore;
-    private readonly IReadOnlySet<string> _shortNameTypes = new HashSet<string> { "App", "Host", "Screen" };
+    private readonly HashSet<string> _shortNameTypes = new() { "App", "Host", "Screen" };
 
     public FirstClassControlsEmitter(IEventEmitter nextEmitter, IControlTemplateStore controlTemplateStore)
        : base(nextEmitter)

src/Persistence/packages.lock.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net7.0": {
+    "net8.0": {
       "Microsoft.Extensions.Logging": {
         "type": "Direct",
         "requested": "[7.0.0, )",

src/Versions.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworkVersion>net7.0</TargetFrameworkVersion>
+        <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
         <YamlDotNetVersion>15.1.2</YamlDotNetVersion>
         <MicrosoftNETTestSdkVersion>17.7.1</MicrosoftNETTestSdkVersion>
         <MSTestTestAdapterVersion>3.2.2</MSTestTestAdapterVersion>