From 66df1509c911209a9434ce32372d74e8e2bcf6b6 Mon Sep 17 00:00:00 2001
From: Hansjoerg Petriffer <hansjoerg.petriffer@infominds.eu>
Date: Wed, 2 Sep 2026 08:28:34 +0200
Subject: [PATCH 1/2] Preserve inherited DefaultItemExcludes in
 XSharp.SDK.Props

XSharp.SDK.Props assigned DefaultItemExcludes instead of appending to it,
so any value the user had set in Directory.Build.props was silently
discarded for .xsproj projects. Microsoft.NET.Sdk.DefaultItems.props always
appends, so DefaultItemExcludes works as documented for C# and VB but not
for X#.

Prepend $(DefaultItemExcludes) to the assignment. The .NET SDK adds its own
entries (BaseOutputPath, BaseIntermediateOutputPath, publish, **/*.user)
after this file is imported, so the only values picked up by the prefix are
the ones the user set explicitly.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props b/src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props
index f9ca37c67b..5aa11f6cd7 100644
--- a/src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props
+++ b/src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props
@@ -17,7 +17,10 @@ Copyright (C) XSharp BV. All rights reserved.
     <AppXamlFiles>**\App.xaml</AppXamlFiles>
     <HeaderFiles>**\*.vh;**\*.xh</HeaderFiles>
     <!-- App.xaml files need special item type ApplicationDefinition, so exclude these as well -->
-    <DefaultItemExcludes>$(VOBinaryFiles);$(AppXamlFiles);$(HeaderFiles);**/*.rc;**/*.resx;**/*.designer.prg;**/*.xaml.prg</DefaultItemExcludes>
+    <!-- $(DefaultItemExcludes) must be preserved: the value set by the user in Directory.Build.props
+         is evaluated before this file. Assigning without it silently discards their setting, unlike
+         Microsoft.NET.Sdk.DefaultItems.props, which always appends. -->
+    <DefaultItemExcludes>$(DefaultItemExcludes);$(VOBinaryFiles);$(AppXamlFiles);$(HeaderFiles);**/*.rc;**/*.resx;**/*.designer.prg;**/*.xaml.prg</DefaultItemExcludes>
   </PropertyGroup>
   
   <ItemGroup>

From 32017abb2e3a5b490cd00e117b35dfa1c41757ea Mon Sep 17 00:00:00 2001
From: Hansjoerg Petriffer <hansjoerg.petriffer@infominds.eu>
Date: Wed, 2 Sep 2026 08:28:46 +0200
Subject: [PATCH 2/2] Exclude output directories from the default globs in
 XSharp.SDK.Props

The item globs owned by the X# SDK (VOBinary, NativeResource, Compile for
*.designer.prg and *.xaml.prg, EmbeddedResource, None, ApplicationDefinition)
carried no Exclude attribute, so they reached into obj\ and bin\ as well.
Stale generated files there are picked up as project items, which surfaces as
XS0579/CS0579 "Duplicate attribute" whenever an intermediate directory from an
earlier configuration is still on disk.

Add Exclude="$(XSharpDefaultItemExcludes)" to those globs. The property is
computed before the item types owned by X# are appended to DefaultItemExcludes,
because the appended value would exclude exactly the files these globs are
meant to collect. The output directories are listed explicitly: the .NET SDK
adds them to DefaultItemExcludes only after this file is imported, which is too
late for these globs. Empty-value guards keep a bare "/**" pattern from being
formed.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../Compiler/XSharpBuildTask/XSharp.SDK.Props | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props b/src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props
index 5aa11f6cd7..de18bdbd9b 100644
--- a/src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props
+++ b/src/Compiler/src/Compiler/XSharpBuildTask/XSharp.SDK.Props
@@ -16,6 +16,19 @@ Copyright (C) XSharp BV. All rights reserved.
     <VOBinaryFiles>**\*.xsfs;**\*.xsdbs;**\*.xsmnu;**\*.xsfrm;**\*.xsrep;**\*.xssql;**/*.vnfs;**/*.vndbs;**/*.vnmnu;**/*.vnfrm</VOBinaryFiles>
     <AppXamlFiles>**\App.xaml</AppXamlFiles>
     <HeaderFiles>**\*.vh;**\*.xh</HeaderFiles>
+    <!-- Exclusions for the globs below. This must be captured BEFORE the item types owned by
+         X# are appended to DefaultItemExcludes: using the appended value would exclude exactly
+         the files these globs are meant to collect.
+         $(DefaultExcludesInProjectFolder) is still empty here (Microsoft.NET.Sdk.DefaultItems.props
+         is imported after this file) and is listed so the value is picked up should that order
+         ever change. The output directories are added explicitly for the same reason - they are
+         only appended to DefaultItemExcludes later, which is too late for the globs below. -->
+    <XSharpDefaultItemExcludes>$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)</XSharpDefaultItemExcludes>
+    <XSharpDefaultItemExcludes Condition="'$(BaseOutputPath)' != ''">$(XSharpDefaultItemExcludes);$(BaseOutputPath)/**</XSharpDefaultItemExcludes>
+    <XSharpDefaultItemExcludes Condition="'$(BaseIntermediateOutputPath)' != ''">$(XSharpDefaultItemExcludes);$(BaseIntermediateOutputPath)/**</XSharpDefaultItemExcludes>
+    <XSharpDefaultItemExcludes Condition="'$(OutputPath)' != ''">$(XSharpDefaultItemExcludes);$(OutputPath)/**</XSharpDefaultItemExcludes>
+    <XSharpDefaultItemExcludes Condition="'$(IntermediateOutputPath)' != ''">$(XSharpDefaultItemExcludes);$(IntermediateOutputPath)/**</XSharpDefaultItemExcludes>
+
     <!-- App.xaml files need special item type ApplicationDefinition, so exclude these as well -->
     <!-- $(DefaultItemExcludes) must be preserved: the value set by the user in Directory.Build.props
          is evaluated before this file. Assigning without it silently discards their setting, unlike
@@ -25,24 +38,24 @@ Copyright (C) XSharp BV. All rights reserved.
   
   <ItemGroup>
     <!-- App.xaml files need special item type ApplicationDefinition -->
-    <ApplicationDefinition Include="$(AppXamlFiles)">
+    <ApplicationDefinition Include="$(AppXamlFiles)" Exclude="$(XSharpDefaultItemExcludes)">
       <Generator>MSBuild:Compile</Generator>
     </ApplicationDefinition>
     <!-- Add our own definitions for the VOBinary items with calculated dependentupon properti -->
-    <VOBinary Include="$(VOBinaryFiles)"  KeepDuplicates="false">
+    <VOBinary Include="$(VOBinaryFiles)" Exclude="$(XSharpDefaultItemExcludes)" KeepDuplicates="false">
       <ParentName>$([System.Text.RegularExpressions.Regex]::Replace('%(Filename)%(Extension)', '\.[^.]+\%(Extension)$', '.prg'))</ParentName>
       <DependentUpon Condition="Exists('%(ParentName)')">%(ParentName)</DependentUpon>
     </VOBinary>
-    <NativeResource Include="**/*.rc" >
+    <NativeResource Include="**/*.rc" Exclude="$(XSharpDefaultItemExcludes)" >
       <ParentName>$([System.Text.RegularExpressions.Regex]::Replace('%(Filename)%(Extension)', '\.[^.]+\%(Extension)$', '.prg'))</ParentName>
       <DependentUpon Condition="Exists('%(ParentName)')">%(ParentName)</DependentUpon>
     </NativeResource >
-	<Compile Include="**/*.xaml.prg"  KeepDuplicates="false" >
+	<Compile Include="**/*.xaml.prg" Exclude="$(XSharpDefaultItemExcludes)" KeepDuplicates="false" >
 	   <!-- .xaml.prg can depend on xaml -->
       <ParentXamlName>$([System.Text.RegularExpressions.Regex]::Replace('%(Filename)%(Extension)', '.xaml.prg$', '.xaml', System.Text.RegularExpressions.RegexOptions.IgnoreCase))</ParentXamlName>
       <DependentUpon Condition="Exists('%(ParentXamlName)')">%(ParentXamlName)</DependentUpon>
 	</Compile>
-    <Compile Include="**/*.designer.prg"  KeepDuplicates="false" >
+    <Compile Include="**/*.designer.prg" Exclude="$(XSharpDefaultItemExcludes)" KeepDuplicates="false" >
       <!-- Designer.prg can depend on prg, resx or settings -->
       <ParentPrgName>$([System.Text.RegularExpressions.Regex]::Replace('%(Filename)%(Extension)', '.designer.prg$', '.prg', System.Text.RegularExpressions.RegexOptions.IgnoreCase))</ParentPrgName>
       <ParentResxName>$([System.Text.RegularExpressions.Regex]::Replace('%(Filename)%(Extension)', '.designer.prg$', '.resx', System.Text.RegularExpressions.RegexOptions.IgnoreCase))</ParentResxName>
@@ -51,12 +64,12 @@ Copyright (C) XSharp BV. All rights reserved.
       <DependentUpon Condition="Exists('%(ParentResxName)')">%(ParentResxName)</DependentUpon>
       <DependentUpon Condition="Exists('%(ParentSettingsName)')">%(ParentSettingsName)</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="**/*.resx"   KeepDuplicates="false">
+    <EmbeddedResource Include="**/*.resx" Exclude="$(XSharpDefaultItemExcludes)" KeepDuplicates="false">
       <!-- This handles .resx that depends on a prg -->
       <ParentName>$([System.Text.RegularExpressions.Regex]::Replace('%(Filename)%(Extension)', '%(Extension)$', '.prg'))</ParentName>
       <DependentUpon Condition="Exists('%(ParentName)')">%(ParentName)</DependentUpon>
     </EmbeddedResource>
-    <None Include="$(HeaderFiles)"  KeepDuplicates="false">
+    <None Include="$(HeaderFiles)" Exclude="$(XSharpDefaultItemExcludes)" KeepDuplicates="false">
       <!-- This handles header files that depend on a prg -->
       <ParentName>$([System.Text.RegularExpressions.Regex]::Replace('%(Filename)%(Extension)', '%(Extension)$', '.prg'))</ParentName>
       <DependentUpon Condition="Exists('%(ParentName)')">%(ParentName)</DependentUpon>