Allow building dnSpy-x86 for .NET 8 when not self contained

dnSpyEx · Nov 17, 2024 · e266b66 · e266b66
1 parent 0ef3fe6
commit e266b66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/dnSpy/dnSpy-x86/Program.cs b/dnSpy/dnSpy-x86/Program.cs
@@ -23,7 +23,7 @@ namespace dnSpy_x86 {
 	static class Program {
 		[STAThread]
 		static void Main() {
-#if NET
+#if NET && BUILD_SELF_CONTAINED
 			const string errmsg = "Wrong startup project";
 			System.Diagnostics.Debug.Fail(errmsg);
 			throw new InvalidOperationException(errmsg);

diff --git a/dnSpy/dnSpy-x86/dnSpy-x86.csproj b/dnSpy/dnSpy-x86/dnSpy-x86.csproj
@@ -10,13 +10,17 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\dnSpy.snk</AssemblyOriginatorKeyFile>
     <Nullable>enable</Nullable>
-    <OutputPath Condition=" '$(IsDotNetFramework)' == 'true' ">..\dnSpy\bin\$(Configuration)\</OutputPath>
+    <OutputPath Condition=" '$(IsDotNetFramework)' == 'true' OR '$(RuntimeIdentifier)' == '' ">..\dnSpy\bin\$(Configuration)\</OutputPath>
 
     <RuntimeIdentifiers>$(DnSpyRuntimeIdentifiers)</RuntimeIdentifiers>
     <OutputType>WinExe</OutputType>
     <Prefer32Bit>true</Prefer32Bit>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
+
+    <PlatformTarget Condition="'$(IsDotNetFramework)' == 'false'" >x86</PlatformTarget>
+
+    <DefineConstants Condition="'$(RuntimeIdentifier)' != ''">BUILD_SELF_CONTAINED</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>