Updated UIX and ZuneShell to .NET 5

UIX/Microsoft/Iris/InputHandlers/TextEditingHandler.cs

@@ -16,6 +16,7 @@ using Microsoft.Iris.Session;
 using Microsoft.Iris.UI;
 using Microsoft.Iris.ViewItems;
 using System;
+using Range = Microsoft.Iris.ModelItems.Range;
 
 namespace Microsoft.Iris.InputHandlers
 {

UIX/Microsoft/Iris/OS/CLR/NativeMethods.cs

@@ -4,11 +4,8 @@
 // MVID: A56C6C9D-B7F6-46A9-8BDE-B3D9B8D60B11
 // Assembly location: C:\Program Files\Zune\UIX.dll
 
-using System.Security.Permissions;
-
 namespace Microsoft.Iris.OS.CLR
 {
-    [HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
     internal static class NativeMethods
     {
         public const int S_OK = 0;

UIX/Microsoft/Iris/OS/CLR/UnsafeNativeMethods.cs

@@ -8,12 +8,10 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security;
-using System.Security.Permissions;
 
 namespace Microsoft.Iris.OS.CLR
 {
     [SuppressUnmanagedCodeSecurity]
-    [HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
     internal static class UnsafeNativeMethods
     {
         [DllImport("Ole32.dll")]

UIX/UIX.csproj

@@ -9,9 +9,7 @@
         <AssemblyName>UIX</AssemblyName>
         <ApplicationVersion>4.8.0.0</ApplicationVersion>
 
-        <TargetFramework>net35</TargetFramework>
-        <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-        <OldToolsVersion>3.5</OldToolsVersion>
+        <TargetFramework>net5.0</TargetFramework>
         <Platforms>x64;x86</Platforms>
 
         <FileAlignment>512</FileAlignment>
@@ -21,9 +19,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Reference Include="Accessibility" />
-        <Reference Include="System" />
-        <Reference Include="System.XML" />
+		<PackageReference Include="Accessibility" Version="4.6.0-preview3-27504-2" />
 		<Reference Include="UIX.RenderApi">
             <HintPath>..\ZuneShell\lib\UIX.renderapi.dll</HintPath>
         </Reference>

UIXSign/Program.cs

@@ -10,9 +10,12 @@ namespace UIXSign
 {
     class Program
     {
-        static void Main(string[] args)
+        static int Main(string[] args)
         {
             string dll = args[0];
+            if (!File.Exists(dll))
+                return -1;
+
             string outputName = args.Length >= 2 ? args[1] : "UIX_signed.dll";
             string outputDir = Path.GetDirectoryName(dll);
             string dllCopy = Path.Combine(outputDir, outputName);
@@ -61,6 +64,8 @@ namespace UIXSign
             File.Delete(dllCopy);
             Console.WriteLine("DLL modded:");
             Console.WriteLine(dll);
+
+            return 0;
         }
     }
 }

ZuneShell/Properties/launchSettings.json

@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "ZuneShell": {
+      "commandName": "Executable",
+      "executablePath": "C:\\Program Files\\Zune\\Zune.exe",
+      "nativeDebugging": true
+    }
+  }
+}