Merge branch 'develop' into osxarm64

ikvmnet · Aug 9, 2023 · 392168f · 392168f
2 parents 2e32068 + 4616f9c
commit 392168f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 35 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -11,5 +11,5 @@ branches:
   develop:
     regex: ^develop$
     tag: dev
-    increment: Patch
-
+    increment: Minor
+
diff --git a/IKVM.deps.targets b/IKVM.deps.targets
@@ -3,38 +3,40 @@
     <ItemGroup>
         <PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" GeneratePathProperty="true" />
         <PackageReference Include="Mono.Posix" Version="7.1.0-final.1.21458.1" GeneratePathProperty="true" />
-        <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
-        <PackageReference Include="System.Memory" Version="4.5.5" />
     </ItemGroup>
 
-    <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
-        <Reference Include="System.Configuration" />
-        <Reference Include="System.IO.Compression" />
-        <Reference Include="System.Security" />
-        <PackageReference Include="System.Buffers" Version="4.5.1" />
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-        <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="System.Text.Json" Version="6.0.6" />
-    </ItemGroup>
-
-    <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp3.1'))">
-        <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
-        <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-        <PackageReference Include="System.Data.Odbc" Version="6.0.0" />
-        <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-        <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-        <PackageReference Include="System.Runtime" Version="4.3.1" />
-        <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
-        <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-        <PackageReference Include="System.Security.Cryptography.Primitives" Version="4.3.0" />
-        <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.3" />
-        <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
-        <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
-        <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
-        <PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
-    </ItemGroup>
+    <Choose>
+        <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
+            <ItemGroup>
+                <Reference Include="System.Configuration" />
+                <Reference Include="System.IO.Compression" />
+                <Reference Include="System.Security" />
+                <PackageReference Include="System.Buffers" Version="4.5.1" />
+                <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
+                <PackageReference Include="System.Memory" Version="4.5.5" />
+                <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+                <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
+                <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+                <PackageReference Include="System.Text.Json" Version="6.0.6" />
+            </ItemGroup>
+        </When>
+        <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
+            <ItemGroup>
+                <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
+                <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+                <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+                <PackageReference Include="System.Data.Odbc" Version="6.0.0" />
+            </ItemGroup>
+        </When>
+        <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp3.1'))">
+            <ItemGroup>
+                <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
+                <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+                <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+                <PackageReference Include="System.Data.Odbc" Version="6.0.0" />
+                <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
+            </ItemGroup>
+        </When>
+    </Choose>
 
 </Project>
diff --git a/src/IKVM.MSBuild.Tasks/IkvmTaskException.cs b/src/IKVM.MSBuild.Tasks/IkvmTaskException.cs
@@ -7,6 +7,7 @@ namespace IKVM.MSBuild.Tasks
     /// <summary>
     /// Generic IKVM task exception.
     /// </summary>
+    [Serializable]
     class IkvmTaskException : Exception
     {
 
@@ -43,4 +44,4 @@ protected IkvmTaskException(SerializationInfo info, StreamingContext context) :
 
     }
 
-}
+}
diff --git a/src/IKVM.MSBuild.Tasks/IkvmTaskMessageException.cs b/src/IKVM.MSBuild.Tasks/IkvmTaskMessageException.cs
@@ -9,6 +9,7 @@ namespace IKVM.MSBuild.Tasks
     /// <summary>
     /// IKVM task exception with error message.
     /// </summary>
+    [Serializable]
     class IkvmTaskMessageException : IkvmTaskException
     {
 
@@ -76,4 +77,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
     }
 
-}
+}