Skip to content

Commit 75bdac5

Browse files
[build] remove usage of "Facades" directories (#10342)
Context: #10339 In order to complete #10339, I want to refactor & remove the need for having to define `$(_XATargetFrameworkDirectories)` at all. An easy first step is to remove the usage of "Facades" directories because these don't exist in the .NET 6+ world. These are a Mono/.NET framework-ism, which is replaced by "ref" packs in .NET 6+. I also removed the `gen-ProfileAssemblies.sh` script, which was used to generate files specific to Mono & Xamarin.Android, but is no longer needed.
1 parent f20b382 commit 75bdac5

File tree

4 files changed

+3
-77
lines changed

4 files changed

+3
-77
lines changed

build-tools/installers/create-installers.targets

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@
8080
<ItemGroup>
8181
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\Mono.Android.Export.dll" />
8282
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\Mono.Android.Export.pdb" />
83-
<_FrameworkFiles Include="@(MonoFacadeAssembly->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\Facades\%(Identity)')" />
84-
<_FrameworkFiles Include="@(MonoFacadeAssemblySymbol->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\Facades\%(Identity)')" />
8583
<_FrameworkFiles Include="@(MonoProfileAssembly->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" />
8684
<_FrameworkFiles Include="@(MonoProfileAssemblySymbol->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" />
8785
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Java.Interop.dll" />

build-tools/scripts/gen-ProfileAssemblies.sh

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Copyright (C) 2016 Xamarin. All rights reserved.
167167
CaseMapFile="$(_GenerateResourceCaseMapFile)"
168168
DesignTimeBuild="$(DesignTimeBuild)"
169169
Deterministic="$(Deterministic)"
170-
FrameworkDirectories="$(_XATargetFrameworkDirectories);$(_XATargetFrameworkDirectories)Facades"
170+
FrameworkDirectories="$(_XATargetFrameworkDirectories)"
171171
IsApplication="$(AndroidApplication)"
172172
OutputFile="$(_GenerateResourceDesignerAssemblyOutput)"
173173
ProjectDir="$(ProjectDir)"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ because xbuild doesn't support framework reference assemblies.
13131313
Resources="@(AndroidResource);@(AndroidBoundLayout)"
13141314
ResourceDirectory="$(MonoAndroidResourcePrefix)"
13151315
CaseMapFile="$(_GenerateResourceCaseMapFile)"
1316-
FrameworkDirectories="$(_XATargetFrameworkDirectories);$(_XATargetFrameworkDirectories)Facades"
1316+
FrameworkDirectories="$(_XATargetFrameworkDirectories)"
13171317
AdditionalResourceDirectories="@(LibraryResourceDirectories)"
13181318
AssemblyName="$(AssemblyName)"
13191319
>
@@ -1587,7 +1587,7 @@ because xbuild doesn't support framework reference assemblies.
15871587
OutputDirectory="$(IntermediateOutputPath)android"
15881588
PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
15891589
ApplicationJavaClass="$(AndroidApplicationJavaClass)"
1590-
FrameworkDirectories="$(_XATargetFrameworkDirectories);$(_XATargetFrameworkDirectories)Facades"
1590+
FrameworkDirectories="$(_XATargetFrameworkDirectories)"
15911591
SupportedAbis="@(_BuildTargetAbis)"
15921592
EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
15931593
IntermediateOutputDirectory="$(IntermediateOutputPath)"

0 commit comments

Comments
 (0)