Merge pull request #23 from ful-stackz/task/update-packages

Update packages

Author: ful-stackz

CHANGELOG.md

@@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - `Code.cs`, the entry point for creating a structure, has been modified to use the fluent APIs of each structure instead of using overridden constructors; this reduces duplicated validation code
+- The Roslyn packages were updated which results in a slightly different formatting in some places
+  - `constructor() : base()` instead of `constructor(): base()`
+  - `Property { get; set; }` and `Property { get => _value; set => _value = value; }` instead of the old multi-line version
 
 ### Fixed
 

README.md

@@ -32,17 +32,9 @@ namespace Data
 {
     public class User
     {
-        public int Id
-        {
-            get;
-            set;
-        }
+        public int Id { get; set; }
 
-        public string Username
-        {
-            get;
-            set;
-        }
+        public string Username { get; set; }
     }
 }
 ```
@@ -98,15 +90,9 @@ namespace Data
             _username = username;
         }
 
-        public int Id
-        {
-            get => _id;
-        }
+        public int Id { get => _id; }
 
-        public string Username
-        {
-            get => _username;
-        }
+        public string Username { get => _username; }
     }
 
     public class User
@@ -116,10 +102,7 @@ namespace Data
             Details = details;
         }
 
-        public UserDetails Details
-        {
-            get;
-        }
+        public UserDetails Details { get; }
     }
 }
 ```
@@ -211,11 +194,7 @@ public class Data : DataBase, IHasData
     /// <summary>
     /// Docs!
     /// </summary>
-    public int Count
-    {
-        get => _count;
-        set => _count = value;
-    }
+    public int Count { get => _count; set => _count = value; }
 
     // ✔ Define auto-implemented properties
     public string Name { get; set; }
@@ -256,11 +235,7 @@ public struct DataPoint : IHasData
     /// <summary>
     /// Docs!
     /// </summary>
-    public int Count
-    {
-        get => _count;
-        set => _count = value;
-    }
+    public int Count { get => _count; set => _count = value; }
 }
 ```
 </details>

samples/JsonToNet/JsonToNet.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/SharpCode.Test/ClassBuilderTests.cs

@@ -90,17 +90,9 @@ public class Triangle
     private double _hypotenuse;
     private double _adjacent;
     private double _opposite;
-    public double Hypotenuse
-    {
-        get => _hypotenuse;
-        set => _hypotenuse = value;
-    }
+    public double Hypotenuse { get => _hypotenuse; set => _hypotenuse = value; }
 
-    public double Adjacent
-    {
-        get => _adjacent;
-        set => _adjacent = value;
-    }
+    public double Adjacent { get => _adjacent; set => _adjacent = value; }
 
     public double Opposite
     {
@@ -150,7 +142,7 @@ public void CreateClass_WithInheritance_AndBaseCall()
             var expectedCode = @"
 public class UserCredentials : Credentials, IAuthorizationDetails, IMadeThisUp
 {
-    public UserCredentials(string username, string password): base(username, password, ""basic"")
+    public UserCredentials(string username, string password) : base(username, password, ""basic"")
     {
     }
 }
@@ -176,15 +168,15 @@ public void CreateClass_WithInheritance_AndMultipleConstructors()
             var expectedCode = @"
 public class BasicCredentials : AuthorizationDetails
 {
-    public BasicCredentials(): base(string.Empty, string.Empty, ""basic"")
+    public BasicCredentials() : base(string.Empty, string.Empty, ""basic"")
     {
     }
 
-    public BasicCredentials(string username): base(username, string.Empty, ""basic"")
+    public BasicCredentials(string username) : base(username, string.Empty, ""basic"")
     {
     }
 
-    public BasicCredentials(string username, string password): base(username, password, ""basic"")
+    public BasicCredentials(string username, string password) : base(username, password, ""basic"")
     {
     }
 }
@@ -243,18 +235,8 @@ public void CreatingStaticClass_WithStaticProperties_Works()
             var expectedCode = @"
 public static class Config
 {
-    public static string Name
-    {
-        get;
-    }
-
-    = ""SharpCode"";
-    public static System.Version Version
-    {
-        get;
-    }
-
-    = new System.Version(0, 0, 1);
+    public static string Name { get; } = ""SharpCode"";
+    public static System.Version Version { get; } = new System.Version(0, 0, 1);
 }
             ".Trim().WithUnixEOL();
 
@@ -426,11 +408,7 @@ public void CreateClass_WithTypeParameters_WithProperty_Works()
 public class Dict<TKey, TValue>
     where TKey : IEquatable<TKey> where TValue : notnull
 {
-    public Dictionary<TKey, TValue> Store
-    {
-        get;
-        set;
-    }
+    public Dictionary<TKey, TValue> Store { get; set; }
 }
             ".Trim().WithUnixEOL();
 
@@ -455,11 +433,7 @@ public void CreateClass_WithTypeParameters_Params_WithProperty_Works()
             var expectedCode = @"
 public class Dict<K, V>
 {
-    public Dictionary<K, V> Store
-    {
-        get;
-        set;
-    }
+    public Dictionary<K, V> Store { get; set; }
 }
             ".Trim().WithUnixEOL();
 
@@ -486,11 +460,7 @@ public void CreateClass_WithTypeParameters_IEnumerable_WithProperty_Works()
             var expectedCode = @"
 public class Dict<K, V>
 {
-    public Dictionary<K, V> Store
-    {
-        get;
-        set;
-    }
+    public Dictionary<K, V> Store { get; set; }
 }
             ".Trim().WithUnixEOL();
 

src/SharpCode.Test/CodeTests.cs

@@ -274,13 +274,7 @@ public void CreateField_WithInvalidType_Throws()
     [Test]
     public void CreateProperty_Works()
     {
-        var expected = @"
-public Action DoWork
-{
-    get;
-    set;
-}
-        ".Trim().WithUnixEOL();
+        var expected = "public Action DoWork { get; set; }";
 
         // CreateProperty()
         Assert.AreEqual(

src/SharpCode.Test/InterfaceBuilderTests.cs

@@ -127,23 +127,11 @@ public void CreatingInterface_WithProperties_Works()
             var expectedCode = @"
 public interface ITest
 {
-    int Number
-    {
-        get;
-        set;
-    }
+    int Number { get; set; }
 
-    string Stringy
-    {
-        get;
-        set;
-    }
+    string Stringy { get; set; }
 
-    bool Booly
-    {
-        get;
-        set;
-    }
+    bool Booly { get; set; }
 }
             ".Trim().WithUnixEOL();
 
@@ -249,11 +237,7 @@ public void CreateInterface_WithTypeParameters_WithProperty_Works()
 public interface Dict<TKey, TValue>
     where TKey : IEquatable<TKey> where TValue : notnull
 {
-    Dictionary<TKey, TValue> Store
-    {
-        get;
-        set;
-    }
+    Dictionary<TKey, TValue> Store { get; set; }
 }
             ".Trim().WithUnixEOL();
 
@@ -278,11 +262,7 @@ public void CreateInterface_WithTypeParameters_Params_WithProperty_Works()
             var expectedCode = @"
 public interface Dict<K, V>
 {
-    Dictionary<K, V> Store
-    {
-        get;
-        set;
-    }
+    Dictionary<K, V> Store { get; set; }
 }
             ".Trim().WithUnixEOL();
 
@@ -309,11 +289,7 @@ public void CreateInterface_WithTypeParameters_IEnumerable_WithProperty_Works()
             var expectedCode = @"
 public interface Dict<K, V>
 {
-    Dictionary<K, V> Store
-    {
-        get;
-        set;
-    }
+    Dictionary<K, V> Store { get; set; }
 }
             ".Trim().WithUnixEOL();
 

src/SharpCode.Test/NamespaceBuilderTests.cs

@@ -95,29 +95,23 @@ public int Wheels
     public class Car : Vehicle
     {
         private readonly int _maxSpeed;
-        public Car(int maxSpeed): base(4)
+        public Car(int maxSpeed) : base(4)
         {
             _maxSpeed = maxSpeed;
         }
 
-        public int MaxSpeed
-        {
-            get => _maxSpeed;
-        }
+        public int MaxSpeed { get => _maxSpeed; }
     }
 
     public class Motorbike : Vehicle
     {
         private readonly int _maxSpeed;
-        public Motorbike(int maxSpeed): base(2)
+        public Motorbike(int maxSpeed) : base(2)
         {
             _maxSpeed = maxSpeed;
         }
 
-        public int MaxSpeed
-        {
-            get => _maxSpeed;
-        }
+        public int MaxSpeed { get => _maxSpeed; }
     }
 }
             ".Trim().WithUnixEOL();
@@ -353,20 +347,12 @@ namespace GeneratedGoodies
 {
     public interface IHaveGoodies
     {
-        int Count
-        {
-            get;
-            set;
-        }
+        int Count { get; set; }
     }
 
     internal interface IHaveHiddenGoodies : IHaveGoodies
     {
-        int HiddenCount
-        {
-            get;
-            set;
-        }
+        int HiddenCount { get; set; }
     }
 }
             ".Trim().WithUnixEOL();
@@ -398,11 +384,7 @@ public struct Cube
         /// <summary>
         /// Gets or sets the length of the cube side.
         /// </summary>
-        public int Side
-        {
-            get;
-            set;
-        }
+        public int Side { get; set; }
     }
 }
             ".Trim().WithUnixEOL();