zune/ZuneUIXTools
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneUIXTools.git synced 2026-07-27 13:11:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow building on Linux and update to .NET 8.0

Browse Source
This commit is contained in:
Yoshi Askharoun
2026-07-26 20:57:05 -05:00
parent 7c12de65bd
commit 9f1a892f7b
10 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DebugAdapter/UIX.DebugAdapter.Client/UIX.DebugAdapter.Client.csproj
-2
View File
@@ -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>
DebugAdapter/UIX.DebugAdapter.Server/UIX.DebugAdapter.Server.csproj
-2
View File
@@ -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>
DebugAdapter/UIX.DebugAdapter.Shared/UIX.DebugAdapter.Shared.csproj
-2
View File
@@ -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>
Directory.Build.props
+50
View File
@@ -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>
UIXC/UIXC.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>$(NetCoreTarget)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
libs/MicrosoftIris
+1 -1
Submodule libs/MicrosoftIris updated: cbb1eeb2bf...ea3594c065
libs/UIX.Asm/UIX.Asm.csproj
+3 -4
View File
@@ -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>
libs/UIX.DecompXml/Decompiler.Script.cs
+4 -4
View File
@@ -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;
libs/UIX.DecompXml/UIX.DecompXml.csproj
+1 -2
View File
@@ -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>
libs/UIX.Test/UIX.Test.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>$(NetCoreTarget)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>