Skip to content

Commit f824e0f

Browse files
committed
Try using the full path
1 parent d5f42b8 commit f824e0f

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ It is shared between "legacy" binding projects and .NET 5 projects.
4343

4444
<Target Name="_CollectGeneratedManagedBindingFiles">
4545
<ItemGroup>
46-
<_GeneratedManagedBindingFiles Include="$(IntermediateOutputPath)generated\**\*.cs" />
46+
<_GeneratedManagedBindingFiles Include="$(GeneratedOutputPath)**\*.cs" />
4747
</ItemGroup>
4848
</Target>
4949

@@ -121,7 +121,7 @@ It is shared between "legacy" binding projects and .NET 5 projects.
121121
<Touch Files="$(_GeneratorStampFile)" AlwaysCreate="true" />
122122

123123
<ItemGroup>
124-
<FileWrites Include="$(IntermediateOutputPath)generated\**\*.cs" />
124+
<FileWrites Include="$(GeneratedOutputPath)**\*.cs" />
125125
<FileWrites Include="$(_GeneratorStampFile)" />
126126
</ItemGroup>
127127

src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System;
22
using System.IO;
33
using System.Linq;
4+
using Xamarin.Android.Tasks.LLVMIR;
5+
using Xamarin.Android.Tools;
46

57
namespace Xamarin.Android.Tasks
68
{
@@ -9,7 +11,6 @@ partial class GenerateLayoutBindings
911
sealed class CSharpBindingGenerator : BindingGenerator
1012
{
1113
const string BindingPartialClassBackingFieldName = "__layout_binding";
12-
1314
protected override string LineCommentString => "//";
1415
protected override string DocCommentString => "///";
1516
public override string LanguageName => "C#";
@@ -239,7 +240,7 @@ protected override void WriteLocationDirective (State state, LayoutWidget widget
239240
if (loc == null)
240241
return;
241242

242-
WriteLineIndent (state, $"#line {loc.Line} \"{loc.FilePath}\"");
243+
WriteLineIndent (state, $"#line {loc.Line} \"{Path.GetFullPath (loc.FilePath)}\"");
243244
state.WriteLine ();
244245
}
245246

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public TestProjectInfo (string projectName, string testName, string rootDirector
124124
ProjectName = projectName;
125125

126126
ObjPath = Path.Combine (rootDirectory, "obj");
127-
GeneratedPath = Path.Combine (ObjPath, XABuildPaths.Configuration, "generated");
127+
GeneratedPath = Path.Combine (ObjPath, XABuildPaths.Configuration, "codebehind");
128128
BinPath = Path.Combine (rootDirectory, "bin", XABuildPaths.Configuration);
129129
ProjectPath = Path.Combine (rootDirectory, $"{projectName}.csproj");
130130

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ because xbuild doesn't support framework reference assemblies.
917917
<MonoAndroidResourcePrefix Condition="'$(MonoAndroidResourcePrefix)' == ''">Resources</MonoAndroidResourcePrefix>
918918
<!-- NOTE: Kept for compatibility, prefer to use $(IntermediateOutputPath) instead -->
919919
<MonoAndroidIntermediate>$(IntermediateOutputPath)</MonoAndroidIntermediate>
920-
<MonoAndroidCodeBehindDir>$(IntermediateOutputPath)generated</MonoAndroidCodeBehindDir>
920+
<MonoAndroidCodeBehindDir>$(IntermediateOutputPath)codebehind</MonoAndroidCodeBehindDir>
921921
<MonoAndroidIntermediateResourceCache>$(IntermediateOutputPath)resourcecache</MonoAndroidIntermediateResourceCache>
922922
<_AndroidIntermediateJavaSourceDirectory>$(IntermediateOutputPath)android\src\</_AndroidIntermediateJavaSourceDirectory>
923923
<_AndroidIntermediateDexOutputDirectory>$(IntermediateOutputPath)android\bin\</_AndroidIntermediateDexOutputDirectory>

0 commit comments

Comments
 (0)