Merge branch 'release/1.3.1'

max-eroshkin · Sep 22, 2023 · 07011c2 · 07011c2
2 parents e76c4b4 + 5bc2f4b
commit 07011c2
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -14,7 +14,10 @@
   <ItemGroup>
     <PackageReference Include="BimLab.Nuke" Version="2023.1.0-dev02" />
     <PackageReference Include="Tools.InnoSetup" Version="6.2.2" IncludeAssets="All" />
-    <PackageReference Include="NuGet.CommandLine" Version="6.4.0"/>
+    <PackageReference Include="NuGet.CommandLine" Version="6.7.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/source/BuilderTests/EnumTests.cs b/source/BuilderTests/EnumTests.cs
@@ -0,0 +1,38 @@
+namespace BuilderTests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Reflection;
+    using FluentAssertions;
+    using InnoSetup.ScriptBuilder;
+    using Xunit;
+
+    public class EnumTests
+    {
+        [Theory]
+        [MemberData(nameof(GetFlagEnums))]
+        public void ValueDuplicationTest(Type enumType)
+        {
+            if (!enumType.IsEnum)
+                throw new ArgumentException($"{enumType.Name} is not an enum");
+
+            var values = Enum
+                .GetValues(enumType)
+                .Cast<object>()
+                .Select(x => new { Value = Enum.Format(enumType, x, "D"), EnumValue = x })
+                .GroupBy(x => x.Value)
+                .Where(x => x.Count() > 1)
+                .ToList();
+
+            values.Should().BeEmpty();
+        }
+
+        public static IEnumerable<object[]> GetFlagEnums()
+        {
+            return typeof(Architectures).Assembly.GetTypes()
+                .Where(x => x.IsEnum && x.GetCustomAttribute<FlagsAttribute>() != null)
+                .Select(x => new object[] { x });
+        }
+    }
+}
diff --git a/source/Directory.Build.Props b/source/Directory.Build.Props
@@ -21,8 +21,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-        <Version>1.3.0</Version>
-        <Company>Reactive BIM</Company>
+        <Version>1.3.1</Version>
         <Authors>Reactive BIM</Authors>
         <Product>InnoSetup Script Builder</Product>
         <PackageTags>installer innosetup inno script builder</PackageTags>
@@ -31,6 +30,9 @@
         <RepositoryUrl>https://github.com:max-eroshkin/InnoSetup.ScriptBuilder.git</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <NoPackageAnalysis>true</NoPackageAnalysis>
+        <PackageReleaseNotes>
+            Fixed "RegTypeLib value has the same value of OverwriteReadonly"
+        </PackageReleaseNotes>
     </PropertyGroup>
 
 </Project>
diff --git a/source/InnoSetup.ScriptBuilder/Constants/FileFlags.cs b/source/InnoSetup.ScriptBuilder/Constants/FileFlags.cs
@@ -28,7 +28,7 @@ public enum FileFlags : ulong
         PromptIfolder = 0x100000,
         RecurseSubdirs = 0x200000,
         RegServer = 0x400000,
-        RegTypeLib = 0x80000,
+        RegTypeLib = 0x800000,
         ReplaceSameVersion = 0x1000000,
         RestartReplace = 0x2000000,
         SetNtfsCompression = 0x4000000,