Merge branch 'feature/msi-installer-workflows' of https://github.com/…

…DaveyJonesBitPail/czicompress into feature/msi-installer-workflows
ZEISS · Nov 23, 2023 · 88b37ac · 88b37ac
2 parents ff89e16 + 5b94c78
commit 88b37ac
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 70 deletions.
diff --git a/.github/workflows/dependency-review.yaml b/.github/workflows/dependency-review.yaml
@@ -0,0 +1,18 @@
+---
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v4
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v3
+        with:
+          # Add more licenses as required. Do not add copy-left licenses or licenses incompatible with MIT (for czicompress) and GPL-3.0-or-later (for czishrink)
+          allow-licenses: MIT, MIT-0, Apache-2.0, BSD-2-Clause, BSD-3-Clause
diff --git a/czishrink/Directory.Build.props b/czishrink/Directory.Build.props
@@ -17,6 +17,6 @@
 
     <!-- Version -->
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-    <VersionPrefix>1.1.0<!--feature/dotnet8--></VersionPrefix>
+    <VersionPrefix>1.1.1<!--dependabot/nuget/czishrink/SystemIOAbstractionsVersion-19.2.87--></VersionPrefix>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/czishrink/Directory.Packages.props b/czishrink/Directory.Packages.props
@@ -3,7 +3,7 @@
     <AutoFixtureVersion>4.18.0</AutoFixtureVersion>
     <AvaloniaVersion>11.0.5</AvaloniaVersion>
     <ReactiveUIVersion>19.5.1</ReactiveUIVersion>
-    <SystemIOAbstractionsVersion>19.2.69</SystemIOAbstractionsVersion>
+    <SystemIOAbstractionsVersion>19.2.87</SystemIOAbstractionsVersion>
     <WixVersion>4.0.3</WixVersion>
   </PropertyGroup>
   <ItemGroup>
@@ -35,12 +35,11 @@
     <PackageVersion Include="System.IO.Abstractions" Version="$(SystemIOAbstractionsVersion)" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="$(SystemIOAbstractionsVersion)" />
     <PackageVersion Include="System.Reactive" Version="6.0.0" />
-    <PackageVersion Include="xunit" Version="2.6.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
-	<!-- Installer packages -->
     <PackageVersion Include="WixToolset.Util.wixext" Version="$(WixVersion)"/>
     <PackageVersion Include="WixToolset.Heat" Version="$(WixVersion)" />
     <PackageVersion Include="WixToolset.Bal.wixext" Version="$(WixVersion)" />
     <PackageVersion Include="WixToolset.UI.wixext" Version="$(WixVersion)"/>
+    <PackageVersion Include="xunit" Version="2.6.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
   </ItemGroup>
 </Project>
diff --git a/czishrink/netczicompress.Desktop/packages.lock.json b/czishrink/netczicompress.Desktop/packages.lock.json
@@ -648,15 +648,15 @@
       },
       "TestableIO.System.IO.Abstractions": {
         "type": "Transitive",
-        "resolved": "19.2.69",
-        "contentHash": "BHZ9uqMAPG7TId4dwJPEuofR6NjIu8AycwH8qSWTSLYUKpQzJKFMIgo7Igp37BW3oURRdIs5Dx4+W86BqvEXrg=="
+        "resolved": "19.2.87",
+        "contentHash": "wxsAThFm6cvvoht4hV++DvHrmLLCpEKwywzNxgJJEmXKkvnEDGCkRWyoAKmrBNKhxwX8QGoBT9cOYCCX7vrt4Q=="
       },
       "TestableIO.System.IO.Abstractions.Wrappers": {
         "type": "Transitive",
-        "resolved": "19.2.69",
-        "contentHash": "yHPZKCrsaVoA/LuZRqarYhecFJ+hUnQFXXfTvFfFaGdfKhCUYN7oo1CPgtMcr2TqLA2usGpSPZ2R7ybDWotY/g==",
+        "resolved": "19.2.87",
+        "contentHash": "2Fa0guLdRYRCpQte/TNVvLCTMRfaTxFZS/32OugutLpymvQV8qQmBwgb9fM9nPcn/Kt11oZ2kRfiuLlLlZRLew==",
         "dependencies": {
-          "TestableIO.System.IO.Abstractions": "19.2.69"
+          "TestableIO.System.IO.Abstractions": "19.2.87"
         }
       },
       "Tmds.DBus.Protocol": {
@@ -680,7 +680,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )",
           "Projektanker.Icons.Avalonia.FontAwesome": "[8.3.0, )",
           "ReactiveUI.Fody": "[19.5.1, )",
-          "System.IO.Abstractions": "[19.2.69, )",
+          "System.IO.Abstractions": "[19.2.87, )",
           "libczicompressc": "[0.5.2, )"
         }
       },
@@ -818,12 +818,12 @@
       },
       "System.IO.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[19.2.69, )",
-        "resolved": "19.2.69",
-        "contentHash": "VNc0GMVJ7df9IOupFyUrsLVwOvnba6W+lKJPeR/sDx+agPkd6LmdZkXbcURWNN1ue//uLTwP6145agO61c9gNg==",
+        "requested": "[19.2.87, )",
+        "resolved": "19.2.87",
+        "contentHash": "/plRdBOQzS2vGuoD+u9yjcjpxivFvbnB791xLvGIaxU8EWdjzNWt185kfaj6/HKFLxrkc3lKhjUbl5DzqZ069w==",
         "dependencies": {
-          "TestableIO.System.IO.Abstractions": "19.2.69",
-          "TestableIO.System.IO.Abstractions.Wrappers": "19.2.69"
+          "TestableIO.System.IO.Abstractions": "19.2.87",
+          "TestableIO.System.IO.Abstractions.Wrappers": "19.2.87"
         }
       },
       "System.Reactive": {

diff --git a/czishrink/netczicompress/packages.lock.json b/czishrink/netczicompress/packages.lock.json
@@ -133,12 +133,12 @@
       },
       "System.IO.Abstractions": {
         "type": "Direct",
-        "requested": "[19.2.69, )",
-        "resolved": "19.2.69",
-        "contentHash": "VNc0GMVJ7df9IOupFyUrsLVwOvnba6W+lKJPeR/sDx+agPkd6LmdZkXbcURWNN1ue//uLTwP6145agO61c9gNg==",
+        "requested": "[19.2.87, )",
+        "resolved": "19.2.87",
+        "contentHash": "/plRdBOQzS2vGuoD+u9yjcjpxivFvbnB791xLvGIaxU8EWdjzNWt185kfaj6/HKFLxrkc3lKhjUbl5DzqZ069w==",
         "dependencies": {
-          "TestableIO.System.IO.Abstractions": "19.2.69",
-          "TestableIO.System.IO.Abstractions.Wrappers": "19.2.69"
+          "TestableIO.System.IO.Abstractions": "19.2.87",
+          "TestableIO.System.IO.Abstractions.Wrappers": "19.2.87"
         }
       },
       "Avalonia.BuildServices": {
@@ -614,15 +614,15 @@
       },
       "TestableIO.System.IO.Abstractions": {
         "type": "Transitive",
-        "resolved": "19.2.69",
-        "contentHash": "BHZ9uqMAPG7TId4dwJPEuofR6NjIu8AycwH8qSWTSLYUKpQzJKFMIgo7Igp37BW3oURRdIs5Dx4+W86BqvEXrg=="
+        "resolved": "19.2.87",
+        "contentHash": "wxsAThFm6cvvoht4hV++DvHrmLLCpEKwywzNxgJJEmXKkvnEDGCkRWyoAKmrBNKhxwX8QGoBT9cOYCCX7vrt4Q=="
       },
       "TestableIO.System.IO.Abstractions.Wrappers": {
         "type": "Transitive",
-        "resolved": "19.2.69",
-        "contentHash": "yHPZKCrsaVoA/LuZRqarYhecFJ+hUnQFXXfTvFfFaGdfKhCUYN7oo1CPgtMcr2TqLA2usGpSPZ2R7ybDWotY/g==",
+        "resolved": "19.2.87",
+        "contentHash": "2Fa0guLdRYRCpQte/TNVvLCTMRfaTxFZS/32OugutLpymvQV8qQmBwgb9fM9nPcn/Kt11oZ2kRfiuLlLlZRLew==",
         "dependencies": {
-          "TestableIO.System.IO.Abstractions": "19.2.69"
+          "TestableIO.System.IO.Abstractions": "19.2.87"
         }
       },
       "DynamicData": {

diff --git a/czishrink/netczicompressTests/ViewModels/Converters/BytesToStringConverterTests.cs b/czishrink/netczicompressTests/ViewModels/Converters/BytesToStringConverterTests.cs
@@ -48,7 +48,7 @@ public void ConversionWorksWithInt(int byteCount, string expected)
     [InlineData(1e6, 0)]
     [InlineData(true, 0)]
     [InlineData(null, 0)]
-    public void ConversionWithArbitraryInput_Returns0(object byteCount, object expected)
+    public void ConversionWithArbitraryInput_Returns0(object? byteCount, object expected)
     {
         var converter = new BytesToStringConverter();
         var result = converter.Convert(byteCount, typeof(IconAnimation), null, CultureInfo.InvariantCulture);

diff --git a/.../netczicompressTests/ViewModels/Converters/FloatToCompressionRatioStringConverterTests.cs b/.../netczicompressTests/ViewModels/Converters/FloatToCompressionRatioStringConverterTests.cs
@@ -38,7 +38,7 @@ public void CheckConversionWorksWithDoubles(double value, string expected)
     [InlineData("foo")]
     [InlineData(null)]
     [InlineData(typeof(string))]
-    public void Convert_WhenCalledOnSomethingThatIsNeitherFloatNorDouble_ReturnsEmptyString(object value)
+    public void Convert_WhenCalledOnSomethingThatIsNeitherFloatNorDouble_ReturnsEmptyString(object? value)
     {
         var converter = new FloatToCompressionRatioStringConverter();
         var result = converter.Convert(value, typeof(double), null, CultureInfo.InvariantCulture);

diff --git a/czishrink/netczicompressTests/packages.lock.json b/czishrink/netczicompressTests/packages.lock.json
@@ -80,29 +80,29 @@
       },
       "System.IO.Abstractions.TestingHelpers": {
         "type": "Direct",
-        "requested": "[19.2.69, )",
-        "resolved": "19.2.69",
-        "contentHash": "5ID+VHXoJyHxbLel7+XRvmMDN8ufS7uLFFIhYFaq/4oLnPrLy08PARSped1CkEvJ61v5462Exe2+cDMLZZWsJQ==",
+        "requested": "[19.2.87, )",
+        "resolved": "19.2.87",
+        "contentHash": "/JjFje0RVP0QxJGmAU/58e4mwbDOAOQZPOBc8aXN8YsBon+PCRk5JRV8ozcf1p8XHcISqLBe8WRqTQTD0RBcFw==",
         "dependencies": {
-          "TestableIO.System.IO.Abstractions.TestingHelpers": "19.2.69"
+          "TestableIO.System.IO.Abstractions.TestingHelpers": "19.2.87"
         }
       },
       "xunit": {
         "type": "Direct",
-        "requested": "[2.6.1, )",
-        "resolved": "2.6.1",
-        "contentHash": "SnTEV7LFf2s3GJua5AJKB/m115jDcWJSG5n02YZS05iezU2QJKjShCsOxlxL8FUO+J7h2/yXGEr+evgpIHc3sA==",
+        "requested": "[2.6.2, )",
+        "resolved": "2.6.2",
+        "contentHash": "sErOyzTZBfgeLcdu5y3CkhCirZikCe9GwEv56jbQRjSa4FyI2tIHjfBRvlWqg7M78bfAGajrreH0IHnxrUOpVA==",
         "dependencies": {
-          "xunit.analyzers": "1.4.0",
-          "xunit.assert": "2.6.1",
-          "xunit.core": "[2.6.1]"
+          "xunit.analyzers": "1.6.0",
+          "xunit.assert": "2.6.2",
+          "xunit.core": "[2.6.2]"
         }
       },
       "xunit.runner.visualstudio": {
         "type": "Direct",
-        "requested": "[2.5.3, )",
-        "resolved": "2.5.3",
-        "contentHash": "HFFL6O+QLEOfs555SqHii48ovVa4CqGYanY+B32BjLpPptdE+wEJmCFNXlLHdEOD5LYeayb9EroaUpydGpcybg=="
+        "requested": "[2.5.4, )",
+        "resolved": "2.5.4",
+        "contentHash": "YUtEOBdArAISyb1cTWcHc6/bilSDB9q5lc8ughPQP1MqlAKSkxKMBqLQ+tiWMFRBd2o22E59nLD/4V5R3jfZxQ=="
       },
       "Avalonia.BuildServices": {
         "type": "Transitive",
@@ -1274,24 +1274,24 @@
       },
       "TestableIO.System.IO.Abstractions": {
         "type": "Transitive",
-        "resolved": "19.2.69",
-        "contentHash": "BHZ9uqMAPG7TId4dwJPEuofR6NjIu8AycwH8qSWTSLYUKpQzJKFMIgo7Igp37BW3oURRdIs5Dx4+W86BqvEXrg=="
+        "resolved": "19.2.87",
+        "contentHash": "wxsAThFm6cvvoht4hV++DvHrmLLCpEKwywzNxgJJEmXKkvnEDGCkRWyoAKmrBNKhxwX8QGoBT9cOYCCX7vrt4Q=="
       },
       "TestableIO.System.IO.Abstractions.TestingHelpers": {
         "type": "Transitive",
-        "resolved": "19.2.69",
-        "contentHash": "F2NNftuT9yB+wzMruGZFMCYeMbSN3/HnLZCgK1OxkQSyGfAmUu/d7OeBld/XkVJMaZXDj3SNNrUE64D9okCHng==",
+        "resolved": "19.2.87",
+        "contentHash": "UiPgRJy6P3RsJaCBSCo5xHeWdMJOjl/NvsDtRjZfrIMeMsQ5aJmwMkytRhhbmLbUgwo/CU+b0FH6JzZNI5fevg==",
         "dependencies": {
-          "TestableIO.System.IO.Abstractions": "19.2.69",
-          "TestableIO.System.IO.Abstractions.Wrappers": "19.2.69"
+          "TestableIO.System.IO.Abstractions": "19.2.87",
+          "TestableIO.System.IO.Abstractions.Wrappers": "19.2.87"
         }
       },
       "TestableIO.System.IO.Abstractions.Wrappers": {
         "type": "Transitive",
-        "resolved": "19.2.69",
-        "contentHash": "yHPZKCrsaVoA/LuZRqarYhecFJ+hUnQFXXfTvFfFaGdfKhCUYN7oo1CPgtMcr2TqLA2usGpSPZ2R7ybDWotY/g==",
+        "resolved": "19.2.87",
+        "contentHash": "2Fa0guLdRYRCpQte/TNVvLCTMRfaTxFZS/32OugutLpymvQV8qQmBwgb9fM9nPcn/Kt11oZ2kRfiuLlLlZRLew==",
         "dependencies": {
-          "TestableIO.System.IO.Abstractions": "19.2.69"
+          "TestableIO.System.IO.Abstractions": "19.2.87"
         }
       },
       "xunit.abstractions": {
@@ -1301,39 +1301,39 @@
       },
       "xunit.analyzers": {
         "type": "Transitive",
-        "resolved": "1.4.0",
-        "contentHash": "7ljnTJfFjz5zK+Jf0h2dd2QOSO6UmFizXsojv/x4QX7TU5vEgtKZPk9RvpkiuUqg2bddtNZufBoKQalsi7djfA=="
+        "resolved": "1.6.0",
+        "contentHash": "b/Wbrqr/bFvcjqAbYdJyCCvjz+PjjKMnoK/K6sbcCBu94pqAkB2vBAHFo87wNq2awsLPAuq5MA7q0XexyQ3mJQ=="
       },
       "xunit.assert": {
         "type": "Transitive",
-        "resolved": "2.6.1",
-        "contentHash": "+4bI81RS88tiYvfsBfC0YsdDd8v7kkLkRtDXmux3YBT8u1afhjdwxwBvkHGgrQ6NPRzE8xZpVGX2iaLkbXvYvg=="
+        "resolved": "2.6.2",
+        "contentHash": "JOj2+zWS08M59bCk3MkZFcKj2Izb2zwkHSPIKJLvnZYLR2Nw6HifjvBCpa8XhMF3mxDuGwZ0+ncmlhE9WoEaZw=="
       },
       "xunit.core": {
         "type": "Transitive",
-        "resolved": "2.6.1",
-        "contentHash": "Ru0POZXVYwa/G3/tS3TO3Yug/P+08RPeDkuepTmywNjfICYwHHY9zJBoxdeziZ0OintLtLKUMOBcC6VJzjqhwg==",
+        "resolved": "2.6.2",
+        "contentHash": "LxJ06D9uTDyvHY52+Lym2TUlq3ObgAKSTuzM9gniau8qI1fd/CPag4PFaGs0RJfunUJtYHg9+XrS5EcW/5dxGA==",
         "dependencies": {
-          "xunit.extensibility.core": "[2.6.1]",
-          "xunit.extensibility.execution": "[2.6.1]"
+          "xunit.extensibility.core": "[2.6.2]",
+          "xunit.extensibility.execution": "[2.6.2]"
         }
       },
       "xunit.extensibility.core": {
         "type": "Transitive",
-        "resolved": "2.6.1",
-        "contentHash": "DA4NqcFGLlRxX2zP3QptlQuRoOSdmBkr17ntK29jfRXqScj2fysIhvQvF5DHtDzAEkoRPqZcfR/IRGSItxmRqw==",
+        "resolved": "2.6.2",
+        "contentHash": "T8CmshbP1EeaDibLwgU/aEe53zrW0+x+mEz5aKxexS5vVyj1UwgDUjcTK/+prMF/9KgMHkgx1vIe7wv58wO6RQ==",
         "dependencies": {
           "NETStandard.Library": "1.6.1",
           "xunit.abstractions": "2.0.3"
         }
       },
       "xunit.extensibility.execution": {
         "type": "Transitive",
-        "resolved": "2.6.1",
-        "contentHash": "sLKPQKuEQhRuhVuLiYEkRdUcwCfp+BIKds3r0JL8AYvOWRmVYYKWYouuYzPjmeUF6iEGC9CHCVz/NF1+wv+Mag==",
+        "resolved": "2.6.2",
+        "contentHash": "kKo7XqyLF8blXGqQHlqKQ+AzST42kpB7oG81Km/kFEzWVfeDMgaEquOLAr/ZiR4tnkUbbWYrY6CJPTavFqGn6Q==",
         "dependencies": {
           "NETStandard.Library": "1.6.1",
-          "xunit.extensibility.core": "[2.6.1]"
+          "xunit.extensibility.core": "[2.6.2]"
         }
       },
       "netczicompress": {
@@ -1349,7 +1349,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )",
           "Projektanker.Icons.Avalonia.FontAwesome": "[8.3.0, )",
           "ReactiveUI.Fody": "[19.5.1, )",
-          "System.IO.Abstractions": "[19.2.69, )",
+          "System.IO.Abstractions": "[19.2.87, )",
           "libczicompressc": "[0.5.2, )"
         }
       },
@@ -1497,12 +1497,12 @@
       },
       "System.IO.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[19.2.69, )",
-        "resolved": "19.2.69",
-        "contentHash": "VNc0GMVJ7df9IOupFyUrsLVwOvnba6W+lKJPeR/sDx+agPkd6LmdZkXbcURWNN1ue//uLTwP6145agO61c9gNg==",
+        "requested": "[19.2.87, )",
+        "resolved": "19.2.87",
+        "contentHash": "/plRdBOQzS2vGuoD+u9yjcjpxivFvbnB791xLvGIaxU8EWdjzNWt185kfaj6/HKFLxrkc3lKhjUbl5DzqZ069w==",
         "dependencies": {
-          "TestableIO.System.IO.Abstractions": "19.2.69",
-          "TestableIO.System.IO.Abstractions.Wrappers": "19.2.69"
+          "TestableIO.System.IO.Abstractions": "19.2.87",
+          "TestableIO.System.IO.Abstractions.Wrappers": "19.2.87"
         }
       },
       "System.Reactive": {