Skip to content

Commit a765bea

Browse files
jonpryordellis1972
authored andcommitted
Fix indentation formatting
1 parent ae8764c commit a765bea

File tree

1 file changed

+82
-82
lines changed

1 file changed

+82
-82
lines changed

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -60,35 +60,35 @@ Copyright (C) 2016 Xamarin. All rights reserved.
6060
Inputs="$(_AndroidResFlagFile);@(_AndroidResourceDest);@(LibraryResourceDirectories->'%(StampFile)')"
6161
Outputs="$(_DesignerIntermediateOutputPath)R.txt"
6262
>
63-
<!-- Generate an R.txt file using the Managed Parser -->
64-
<GenerateRtxt
65-
AdditionalResourceDirectories="@(LibraryResourceDirectories)"
66-
CaseMapFile="$(_GenerateResourceCaseMapFile)"
67-
JavaPlatformJarPath="$(JavaPlatformJarPath)"
68-
ResourceDirectory="$(MonoAndroidResDirIntermediate)"
69-
ResourceFlagFile="$(_AndroidResFlagFile)"
70-
RTxtFile="$(_DesignerIntermediateOutputPath)R.txt"
71-
>
72-
</GenerateRtxt>
63+
<!-- Generate an R.txt file using the Managed Parser -->
64+
<GenerateRtxt
65+
AdditionalResourceDirectories="@(LibraryResourceDirectories)"
66+
CaseMapFile="$(_GenerateResourceCaseMapFile)"
67+
JavaPlatformJarPath="$(JavaPlatformJarPath)"
68+
ResourceDirectory="$(MonoAndroidResDirIntermediate)"
69+
ResourceFlagFile="$(_AndroidResFlagFile)"
70+
RTxtFile="$(_DesignerIntermediateOutputPath)R.txt"
71+
>
72+
</GenerateRtxt>
7373
</Target>
7474

7575
<Target Name="_GenerateResourceCaseMap"
7676
DependsOnTargets="_ComputeAndroidResourcePaths;_SetupDesignerProperties;_GetLibraryImports"
7777
Inputs="@(_AndroidResourceDest);@(LibraryResourceDirectories->'%(StampFile)')"
7878
Outputs="$(_GenerateResourceCaseMapFile)"
7979
>
80-
<!-- Generate a ResourceMap file for the project and its resources -->
81-
<GenerateResourceCaseMap
82-
AdditionalResourceDirectories="@(LibraryResourceDirectories)"
83-
OutputFile="$(_GenerateResourceCaseMapFile)"
84-
ProjectDir="$(ProjectDir)"
85-
ResourceDirectory="$(MonoAndroidResDirIntermediate)"
86-
Resources="@(_AndroidResourceDest)"
87-
/>
88-
<Touch Files="$(_GenerateResourceCaseMapFile)" />
89-
<ItemGroup>
90-
<FileWrites Include="$(_GenerateResourceCaseMapFile)" />
91-
</ItemGroup>
80+
<!-- Generate a ResourceMap file for the project and its resources -->
81+
<GenerateResourceCaseMap
82+
AdditionalResourceDirectories="@(LibraryResourceDirectories)"
83+
OutputFile="$(_GenerateResourceCaseMapFile)"
84+
ProjectDir="$(ProjectDir)"
85+
ResourceDirectory="$(MonoAndroidResDirIntermediate)"
86+
Resources="@(_AndroidResourceDest)"
87+
/>
88+
<Touch Files="$(_GenerateResourceCaseMapFile)" />
89+
<ItemGroup>
90+
<FileWrites Include="$(_GenerateResourceCaseMapFile)" />
91+
</ItemGroup>
9292
</Target>
9393

9494
<Target Name="_GenerateResourceDesignerIntermediateClass"
@@ -99,58 +99,58 @@ Copyright (C) 2016 Xamarin. All rights reserved.
9999
<!-- Creates a Resource.designer.cs file in the Intermediate output path which derives from the
100100
Designer Assembly, for backward compatability.
101101
-->
102-
<GenerateResourceDesignerIntermediateClass
103-
IsApplication="$(AndroidApplication)"
104-
Namespace="$(AndroidResgenNamespace)"
105-
OutputFile="$(_GenerateResourceDesignerClassFile)"
106-
>
107-
</GenerateResourceDesignerIntermediateClass>
108-
<Touch Files="$(_GenerateResourceDesignerClassFile)" />
109-
<ItemGroup>
110-
<FileWrites Include="$(_GenerateResourceDesignerClassFile)" />
111-
</ItemGroup>
102+
<GenerateResourceDesignerIntermediateClass
103+
IsApplication="$(AndroidApplication)"
104+
Namespace="$(AndroidResgenNamespace)"
105+
OutputFile="$(_GenerateResourceDesignerClassFile)"
106+
>
107+
</GenerateResourceDesignerIntermediateClass>
108+
<Touch Files="$(_GenerateResourceDesignerClassFile)" />
109+
<ItemGroup>
110+
<FileWrites Include="$(_GenerateResourceDesignerClassFile)" />
111+
</ItemGroup>
112112
</Target>
113113

114114
<Target Name="_GenerateResourceDesignerAssembly"
115115
Condition=" '$(AndroidUseDesignerAssembly)' == 'True' And '$(DesignTimeBuild)' == 'True' "
116116
DependsOnTargets="_GenerateResourceCaseMap"
117117
Inputs="$(_DesignerIntermediateOutputPath)R.txt"
118118
Outputs="$(_GenerateResourceDesignerAssemblyOutput)">
119-
<GenerateResourceDesignerAssembly
120-
ContinueOnError="$(DesignTimeBuild)"
121-
AdditionalResourceDirectories="@(LibraryResourceDirectories)"
122-
AssemblyName="$(AssemblyName)"
123-
CaseMapFile="$(_GenerateResourceCaseMapFile)"
124-
DesignTimeBuild="$(DesignTimeBuild)"
125-
Deterministic="$(Deterministic)"
126-
FrameworkDirectories="$(_XATargetFrameworkDirectories);$(_XATargetFrameworkDirectories)Facades"
127-
IsApplication="$(AndroidApplication)"
128-
OutputFile="$(_GenerateResourceDesignerAssemblyOutput)"
129-
ProjectDir="$(ProjectDir)"
130-
Resources="@(AndroidResource);@(AndroidBoundLayout)"
131-
ResourceDirectory="$(MonoAndroidResourcePrefix)"
132-
RTxtFile="$(_DesignerIntermediateOutputPath)R.txt"
133-
TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
134-
TargetFrameworkVersion="$(TargetFrameworkVersion)"
135-
>
136-
</GenerateResourceDesignerAssembly>
137-
<ItemGroup>
138-
<FileWrites Include="$(_GenerateResourceDesignerAssemblyOutput)" />
139-
</ItemGroup>
119+
<GenerateResourceDesignerAssembly
120+
ContinueOnError="$(DesignTimeBuild)"
121+
AdditionalResourceDirectories="@(LibraryResourceDirectories)"
122+
AssemblyName="$(AssemblyName)"
123+
CaseMapFile="$(_GenerateResourceCaseMapFile)"
124+
DesignTimeBuild="$(DesignTimeBuild)"
125+
Deterministic="$(Deterministic)"
126+
FrameworkDirectories="$(_XATargetFrameworkDirectories);$(_XATargetFrameworkDirectories)Facades"
127+
IsApplication="$(AndroidApplication)"
128+
OutputFile="$(_GenerateResourceDesignerAssemblyOutput)"
129+
ProjectDir="$(ProjectDir)"
130+
Resources="@(AndroidResource);@(AndroidBoundLayout)"
131+
ResourceDirectory="$(MonoAndroidResourcePrefix)"
132+
RTxtFile="$(_DesignerIntermediateOutputPath)R.txt"
133+
TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
134+
TargetFrameworkVersion="$(TargetFrameworkVersion)"
135+
>
136+
</GenerateResourceDesignerAssembly>
137+
<ItemGroup>
138+
<FileWrites Include="$(_GenerateResourceDesignerAssemblyOutput)" />
139+
</ItemGroup>
140140
</Target>
141141

142142
<Target Name="_CheckForInvalidDesignerConfig"
143143
Condition=" '$(AndroidUseDesignerAssembly)' != 'True' "
144144
DependsOnTargets="_AddAndroidCustomMetaData">
145-
<ItemGroup>
146-
<_ErrorItems Include="@(_MonoAndroidReferencePath)" Condition=" '%(_MonoAndroidReferencePath.HasResourceDesignerAssemblyReference)' == 'True' "/>
147-
<_ErrorItems Include="@(_MonoAndroidReferenceDependencyPaths)" Condition=" '%(_MonoAndroidReferenceDependencyPaths.HasResourceDesignerAssemblyReference)' == 'True' "/>
148-
</ItemGroup>
149-
<AndroidError Code="XA1034"
150-
ResourceName="XA1034"
151-
FormatArguments="%(_ErrorItems.FullPath)"
152-
Condition=" '@(_ErrorItems->Count())' != '0' "
153-
/>
145+
<ItemGroup>
146+
<_ErrorItems Include="@(_MonoAndroidReferencePath)" Condition=" '%(_MonoAndroidReferencePath.HasResourceDesignerAssemblyReference)' == 'True' "/>
147+
<_ErrorItems Include="@(_MonoAndroidReferenceDependencyPaths)" Condition=" '%(_MonoAndroidReferenceDependencyPaths.HasResourceDesignerAssemblyReference)' == 'True' "/>
148+
</ItemGroup>
149+
<AndroidError Code="XA1034"
150+
ResourceName="XA1034"
151+
FormatArguments="%(_ErrorItems.FullPath)"
152+
Condition=" '@(_ErrorItems->Count())' != '0' "
153+
/>
154154
</Target>
155155

156156
<PropertyGroup>
@@ -168,17 +168,17 @@ Copyright (C) 2016 Xamarin. All rights reserved.
168168
Condition=" '$(AndroidUseDesignerAssembly)' == 'True' "
169169
DependsOnTargets="_SetupDesignerProperties"
170170
AfterTargets="GenerateGlobalUsings">
171-
<ItemGroup>
172-
<ReferencePath Include="$(_GenerateResourceDesignerAssemblyOutput)">
173-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
174-
</ReferencePath>
175-
<Compile Remove="$(_AndroidResourceDesignerFile)" />
176-
<Compile Include="$(_GenerateResourceDesignerClassFile)" Condition=" '$(Language)' != 'F#' "/>
177-
<!-- For F# we need to use the CompileBefore ItemGroup so that our type is processed
178-
before all the other types in the build. Otherwise we get weird compiler errors.
179-
-->
180-
<CompileBefore Include="$(_GenerateResourceDesignerClassFile)" Condition=" '$(Language)' == 'F#' "/>
181-
</ItemGroup>
171+
<ItemGroup>
172+
<ReferencePath Include="$(_GenerateResourceDesignerAssemblyOutput)">
173+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
174+
</ReferencePath>
175+
<Compile Remove="$(_AndroidResourceDesignerFile)" />
176+
<Compile Include="$(_GenerateResourceDesignerClassFile)" Condition=" '$(Language)' != 'F#' "/>
177+
<!-- For F# we need to use the CompileBefore ItemGroup so that our type is processed
178+
before all the other types in the build. Otherwise we get weird compiler errors.
179+
-->
180+
<CompileBefore Include="$(_GenerateResourceDesignerClassFile)" Condition=" '$(Language)' == 'F#' "/>
181+
</ItemGroup>
182182
</Target>
183183

184184
<!--
@@ -193,18 +193,18 @@ Copyright (C) 2016 Xamarin. All rights reserved.
193193
Condition=" '$(AndroidUseDesignerAssembly)' == 'True' "
194194
AfterTargets="ComputeResolvedFilesToPublishList"
195195
DependsOnTargets="_SetupDesignerProperties">
196-
<ItemGroup>
197-
<ResolvedFileToPublish Include="$(_GenerateResourceDesignerAssemblyOutput)">
198-
<RelativePath>$(_DesignerAssemblyName).dll</RelativePath>
199-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
200-
<PostprocessAssembly>true</PostprocessAssembly>
201-
<IsTrimmable>true</IsTrimmable>
202-
</ResolvedFileToPublish>
203-
</ItemGroup>
196+
<ItemGroup>
197+
<ResolvedFileToPublish Include="$(_GenerateResourceDesignerAssemblyOutput)">
198+
<RelativePath>$(_DesignerAssemblyName).dll</RelativePath>
199+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
200+
<PostprocessAssembly>true</PostprocessAssembly>
201+
<IsTrimmable>true</IsTrimmable>
202+
</ResolvedFileToPublish>
203+
</ItemGroup>
204204
</Target>
205205

206206
<Target Name="_BuildResourceDesigner"
207207
Condition=" '$(AndroidUseDesignerAssembly)' == 'True' "
208208
DependsOnTargets="$(_BuildResourceDesignerDependsOn)" />
209209

210-
</Project>
210+
</Project>

0 commit comments

Comments
 (0)