diff --git a/DebugAdapter/UIX.DebugAdapter.Client/UIX.DebugAdapter.Client.csproj b/DebugAdapter/UIX.DebugAdapter.Client/UIX.DebugAdapter.Client.csproj
index c0f216f..85e6d91 100644
--- a/DebugAdapter/UIX.DebugAdapter.Client/UIX.DebugAdapter.Client.csproj
+++ b/DebugAdapter/UIX.DebugAdapter.Client/UIX.DebugAdapter.Client.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net461;net6.0;net6.0-windows10.0.22000</TargetFrameworks>
-        <LangVersion>12</LangVersion>
         <RootNamespace>Microsoft.Iris.DebugAdapter.Client</RootNamespace>
     </PropertyGroup>
 
diff --git a/DebugAdapter/UIX.DebugAdapter.Server/UIX.DebugAdapter.Server.csproj b/DebugAdapter/UIX.DebugAdapter.Server/UIX.DebugAdapter.Server.csproj
index 5a0072b..12c2926 100644
--- a/DebugAdapter/UIX.DebugAdapter.Server/UIX.DebugAdapter.Server.csproj
+++ b/DebugAdapter/UIX.DebugAdapter.Server/UIX.DebugAdapter.Server.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net461;net6.0;net6.0-windows10.0.22000</TargetFrameworks>
-        <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <RootNamespace>Microsoft.Iris.DebugAdapter.Server</RootNamespace>
     </PropertyGroup>
diff --git a/DebugAdapter/UIX.DebugAdapter.Shared/UIX.DebugAdapter.Shared.csproj b/DebugAdapter/UIX.DebugAdapter.Shared/UIX.DebugAdapter.Shared.csproj
index ebd1bbb..487b9ca 100644
--- a/DebugAdapter/UIX.DebugAdapter.Shared/UIX.DebugAdapter.Shared.csproj
+++ b/DebugAdapter/UIX.DebugAdapter.Shared/UIX.DebugAdapter.Shared.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net461;net6.0;net6.0-windows10.0.22000</TargetFrameworks>
-        <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <RootNamespace>Microsoft.Iris.DebugAdapter</RootNamespace>
     </PropertyGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..7289ab3
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+        <ApplicationVersion>5.0.0.0</ApplicationVersion>
+        <AssemblyVersion>$(ApplicationVersion)</AssemblyVersion>
+        <FileVersion>$(ApplicationVersion)</FileVersion>
+        <LangVersion>latest</LangVersion>
+
+        <DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
+
+        <NetCoreTarget>net8.0</NetCoreTarget>
+        <TargetFrameworks>$(NetCoreTarget)</TargetFrameworks>
+        <Platforms>AnyCPU;x64;x86</Platforms>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">
+        <TargetFrameworks>$(TargetFrameworks);$(NetCoreTarget)-windows10.0.22000;net48</TargetFrameworks>
+    </PropertyGroup>
+
+    <Choose>
+        <When Condition=" $([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework))) == 'windows' ">
+            <PropertyGroup>
+                <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
+                <TargetWindowsVersion>$([MSBuild]::GetTargetPlatformVersion($(TargetFramework)))</TargetWindowsVersion>
+
+                <DefineConstants Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetWindowsVersion), '7.0'))">
+                    $(DefineConstants);WINDOWS7
+                </DefineConstants>
+                <DefineConstants Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetWindowsVersion), '8.0'))">
+                    $(DefineConstants);WINDOWS8
+                </DefineConstants>
+                <DefineConstants Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetWindowsVersion), '10.0'))">
+                    $(DefineConstants);WINDOWS10
+                </DefineConstants>
+            </PropertyGroup>
+        </When>
+
+        <When Condition=" $(TargetFramework.StartsWith('net4')) ">
+            <PropertyGroup>
+                <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
+
+                <DefineConstants Condition=" !$(TargetFramework.StartsWith('net40')) ">
+                    $(DefineConstants);NETSTANDARD1_0_OR_GREATER;NETSTANDARD2_0_OR_GREATER
+                </DefineConstants>
+            </PropertyGroup>
+        </When>
+    </Choose>
+</Project>
\ No newline at end of file
diff --git a/UIXC/UIXC.csproj b/UIXC/UIXC.csproj
index f4fc7e7..fb30c73 100644
--- a/UIXC/UIXC.csproj
+++ b/UIXC/UIXC.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(NetCoreTarget)</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/libs/MicrosoftIris b/libs/MicrosoftIris
index cbb1eeb..ea3594c 160000
--- a/libs/MicrosoftIris
+++ b/libs/MicrosoftIris
@@ -1 +1 @@
-Subproject commit cbb1eeb2bf261b98ae4d4a95af41d069fa06af05
+Subproject commit ea3594c06551338de9f66285a90ec52531bb2b98
diff --git a/libs/UIX.Asm/UIX.Asm.csproj b/libs/UIX.Asm/UIX.Asm.csproj
index e17d950..8986c36 100644
--- a/libs/UIX.Asm/UIX.Asm.csproj
+++ b/libs/UIX.Asm/UIX.Asm.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
-        <LangVersion>12</LangVersion>
+        <TargetFramework>$(NetCoreTarget)</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <DefaultNamespace>Microsoft.Iris.Asm</DefaultNamespace>
-        <Version>0.0.2-beta</Version>
+        <Version>0.0.3-beta</Version>
         
         <Title>$(DefaultNamespace)</Title>
         <Authors>Joshua Askharoun</Authors>
@@ -13,7 +12,7 @@
         <Description>An Assembly-like language for the compiled Microsoft Iris UI format.</Description>
         <PackageProjectUrl>$(PublishRepositoryUrl)</PackageProjectUrl>
         <PackageTags>Zune, Iris, UIX, UIB</PackageTags>
-        <Copyright>2024</Copyright>
+        <Copyright>2026</Copyright>
 
         <!-- SourceLink and NuGet symbols -->
         <PublishRepositoryUrl>https://github.com/ZuneDev/ZuneUIXTools</PublishRepositoryUrl>
diff --git a/libs/UIX.DecompXml/Decompiler.Script.cs b/libs/UIX.DecompXml/Decompiler.Script.cs
index b1077c2..392688e 100644
--- a/libs/UIX.DecompXml/Decompiler.Script.cs
+++ b/libs/UIX.DecompXml/Decompiler.Script.cs
@@ -273,9 +273,9 @@ partial class Decompiler
                         if (opCode is OpCode.JumpIfFalse)
                         {
                             // JMPF is used to evaluate the branch condition
-                            var ifBlockEndOffset = methodBody
+                            var ifBlockEndOffset = methodBody.AsEnumerable()
                                .Reverse()
-                               .SkipWhile(i => i.Offset >= jumpToOffset)
+                               .SkipWhile(i2 => i2.Offset >= jumpToOffset)
                                .First()
                                .Offset;
 
@@ -330,9 +330,9 @@ partial class Decompiler
                                 // End of if block, skipping over else block
 
                                 // Figure out where the else block ends by searching for the last instruction we skip
-                                var elseBlockEndOffset = methodBody
+                                var elseBlockEndOffset = methodBody.AsEnumerable()
                                     .Reverse()
-                                    .SkipWhile(i => i.Offset >= jumpOffset)
+                                    .SkipWhile(i2 => i2.Offset >= jumpOffset)
                                     .First()
                                     .Offset;
 
diff --git a/libs/UIX.DecompXml/UIX.DecompXml.csproj b/libs/UIX.DecompXml/UIX.DecompXml.csproj
index 01f523b..aa78ba2 100644
--- a/libs/UIX.DecompXml/UIX.DecompXml.csproj
+++ b/libs/UIX.DecompXml/UIX.DecompXml.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
-        <LangVersion>12</LangVersion>
+        <TargetFramework>$(NetCoreTarget)</TargetFramework>
         <RootNamespace>Microsoft.Iris.DecompXml</RootNamespace>
     </PropertyGroup>
 
diff --git a/libs/UIX.Test/UIX.Test.csproj b/libs/UIX.Test/UIX.Test.csproj
index e9647c3..31b3b81 100644
--- a/libs/UIX.Test/UIX.Test.csproj
+++ b/libs/UIX.Test/UIX.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(NetCoreTarget)</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>