Skip to content

Commit 13b7378

Browse files
[Xamarin.Android.Build.Tasks] make designer MSBuild targets a no-op (#9473)
Context: https://developercommunity.visualstudio.com/t/XamarinAndroid-Designer---Replacement/10728132 As the Android designer is no longer supported in Visual Studio, we can remove the MSBuild logic for the following targets: * `GetExtraLibraryLocationsForDesigner` * `SetupDependenciesForDesigner` Since these are public MSBuild target names, we should probably leave them in and "do nothing". This also will simplify things if we ever refactor `<GenerateJavaStubs/>` and friends as this removes a caller. I also removed the `DesignerTests.cs` file that was testing these.
1 parent ea6734f commit 13b7378

File tree

3 files changed

+3
-514
lines changed

3 files changed

+3
-514
lines changed

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

Lines changed: 3 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -16,146 +16,8 @@ Copyright (C) 2016 Xamarin. All rights reserved.
1616

1717
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1818

19-
<Target Name="GetExtraLibraryLocationsForDesigner"
20-
DependsOnTargets="_SetupDesignTimeBuildForCompile"
21-
Returns="ExtraJarLocation;ExtraResourceLocation">
22-
<ReadLibraryProjectImportsCache
23-
Condition="Exists('$(_AndroidLibraryProjectImportsCache)')"
24-
CacheFile="$(_AndroidLibraryProjectImportsCache)">
25-
<Output TaskParameter="ResolvedResourceDirectories" ItemName="_LibraryResourceDirectories" />
26-
<Output TaskParameter="Jars" ItemName="_LibraryJars" />
27-
</ReadLibraryProjectImportsCache>
28-
<ItemGroup>
29-
<ExtraJarLocation Include="@(_LibraryJars)">
30-
<Source>LibraryImport</Source>
31-
</ExtraJarLocation>
32-
<ExtraJarLocation Include="@(AndroidJavaLibrary->'%(FullPath)')">
33-
<Source>AndroidJavaLibrary</Source>
34-
</ExtraJarLocation>
35-
<ExtraResourceLocation Include="@(_LibraryResourceDirectories)">
36-
<Source>LibraryImport</Source>
37-
</ExtraResourceLocation>
38-
</ItemGroup>
39-
</Target>
40-
41-
<Target Name="_CopyAssembliesForDesigner"
42-
Inputs="@(ResolvedAssemblies)"
43-
Outputs="@(ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(Filename)%(Extension)')">
44-
<Copy
45-
SourceFiles="@(ResolvedAssemblies)"
46-
DestinationFiles="@(ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(Filename)%(Extension)')"
47-
/>
48-
</Target>
49-
50-
<Target Name="_PrepareAssembliesForDesigner">
51-
<ItemGroup>
52-
<_ResolvedAssemblies
53-
Include="@(ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(Filename)%(Extension)')"
54-
/>
55-
<_ResolvedUserAssemblies
56-
Include="@(ResolvedUserAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(Filename)%(Extension)')"
57-
/>
58-
<_ResolvedUserMonoAndroidAssembliesForDesigner
59-
Include="@(_ResolvedUserAssemblies)"
60-
Condition="'%(_ResolvedUserAssemblies.TargetFrameworkIdentifier)' == 'MonoAndroid' Or '%(_ResolvedUserAssemblies.HasMonoAndroidReference)' == 'True'"
61-
/>
62-
</ItemGroup>
63-
</Target>
64-
65-
<Target Name="_GeneratePackageManagerJavaForDesigner"
66-
DependsOnTargets="_AddStaticResources;_ResolveAssemblies;_CopyAssembliesForDesigner;_PrepareAssembliesForDesigner;$(BeforeGenerateAndroidManifest)"
67-
Inputs="$(_ResolvedUserAssembliesHashFile);@(ResolvedAssemblies);@(ResolvedUserAssemblies);$(_AndroidManifestAbs);"
68-
Outputs="$(_AndroidIntermediateJavaSourceDirectory)mono\MonoPackageManager_Resources.java;$(_AcwMapFile)">
69-
70-
<PropertyGroup>
71-
<_ManifestOutput Condition=" '$(AndroidManifestMerger)' == 'legacy' ">$(IntermediateOutputPath)android\AndroidManifest.xml</_ManifestOutput>
72-
<_ManifestOutput Condition=" '$(AndroidManifestMerger)' != 'legacy' ">$(IntermediateOutputPath)AndroidManifest.xml</_ManifestOutput>
73-
</PropertyGroup>
74-
<ItemGroup>
75-
<_MergedManifestDocuments Condition=" '$(AndroidManifestMerger)' == 'legacy' " Include="@(ExtractedManifestDocuments)" />
76-
</ItemGroup>
77-
78-
<GenerateJavaStubs
79-
ResolvedAssemblies="@(_ResolvedAssemblies)"
80-
ResolvedUserAssemblies="@(_ResolvedUserMonoAndroidAssembliesForDesigner)"
81-
ManifestTemplate="$(_AndroidManifestAbs)"
82-
MergedManifestDocuments="@(_MergedManifestDocuments)"
83-
Debug="$(AndroidIncludeDebugSymbols)"
84-
NeedsInternet="$(AndroidNeedsInternetPermission)"
85-
AndroidSdkPlatform="$(_AndroidApiLevel)"
86-
AndroidSdkDir="$(_AndroidSdkDirectory)"
87-
PackageName="$(_AndroidPackage)"
88-
VersionName="$(_AndroidVersionName)"
89-
VersionCode="$(_AndroidVersionCode)"
90-
ApplicationLabel="$(_ApplicationLabel)"
91-
OutputDirectory="$(IntermediateOutputPath)android"
92-
TypemapOutputDirectory="$(_NativeAssemblySourceDir)"
93-
GenerateNativeAssembly="false"
94-
MergedAndroidManifestOutput="$(_ManifestOutput)"
95-
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
96-
BundledWearApplicationName="$(BundledWearApplicationPackageName)"
97-
PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
98-
ApplicationJavaClass="$(AndroidApplicationJavaClass)"
99-
FrameworkDirectories="$(_XATargetFrameworkDirectories);$(_XATargetFrameworkDirectories)Facades"
100-
AcwMapFile="$(_AcwMapFile)"
101-
SupportedAbis="$(_BuildTargetAbis)"
102-
SupportedOSPlatformVersion="$(SupportedOSPlatformVersion)">
103-
</GenerateJavaStubs>
104-
<ManifestMerger
105-
Condition=" '$(AndroidManifestMerger)' == 'manifestmerger.jar' "
106-
ToolPath="$(JavaToolPath)"
107-
JavaOptions="$(JavaOptions)"
108-
ManifestMergerJarPath="$(AndroidManifestMergerJarPath)"
109-
AndroidManifest="$(IntermediateOutputPath)AndroidManifest.xml"
110-
OutputManifestFile="$(IntermediateOutputPath)android\AndroidManifest.xml"
111-
LibraryManifestFiles="@(ExtractedManifestDocuments)"
112-
ManifestPlaceholders="$(AndroidManifestPlaceholders)"
113-
/>
114-
<ConvertCustomView
115-
Condition="Exists('$(_CustomViewMapFile)')"
116-
CustomViewMapFile="$(_CustomViewMapFile)"
117-
AcwMapFile="$(_AcwMapFile)"
118-
ResourceDirectories="$(MonoAndroidResDirIntermediate);@(LibraryResourceDirectories)"
119-
/>
120-
<!-- Create java needed for Mono runtime -->
121-
<GeneratePackageManagerJava
122-
ResolvedAssemblies="@(_ResolvedAssemblies)"
123-
ResolvedUserAssemblies="@(_ResolvedUserAssemblies)"
124-
MainAssembly="$(MonoAndroidLinkerInputDir)$(TargetFileName)"
125-
OutputDirectory="$(_AndroidIntermediateJavaSourceDirectory)mono"
126-
EnvironmentOutputDirectory="$(_AndroidIntermediateJavaSourceDirectory)mono\android\app"
127-
TargetFrameworkVersion="$(TargetFrameworkVersion)"
128-
Manifest="$(IntermediateOutputPath)android\AndroidManifest.xml"
129-
Environments="@(AndroidEnvironment);@(LibraryEnvironments)"
130-
AndroidAotMode="$(AndroidAotMode)"
131-
EnableLLVM="$(EnableLLVM)"
132-
HttpClientHandlerType="$(AndroidHttpClientHandlerType)"
133-
TlsProvider="$(AndroidTlsProvider)"
134-
Debug="$(AndroidIncludeDebugSymbols)"
135-
AndroidSequencePointsMode="$(_SequencePointsMode)"
136-
EnableSGenConcurrent="$(AndroidEnableSGenConcurrent)"
137-
SupportedAbis="$(_BuildTargetAbis)"
138-
AndroidPackageName="$(_AndroidPackage)"
139-
EnablePreloadAssembliesDefault="$(_AndroidEnablePreloadAssembliesDefault)">
140-
</GeneratePackageManagerJava>
141-
</Target>
142-
143-
<Target Name="SetupDependenciesForDesigner"
144-
DependsOnTargets="_ResolveMonoAndroidSdks;UpdateAndroidResources;_AdjustJavacVersionArguments;_GeneratePackageManagerJavaForDesigner;_GetMonoPlatformJarPath;_DetermineJavaLibrariesToCompile"
145-
Inputs="@(_AndroidMSBuildAllProjects);$(MonoPlatformJarPath);@(_JavaStubFiles);@(AndroidJavaSource)"
146-
Outputs="$(_AndroidStampDirectory)SetupDependenciesForDesigner.stamp">
147-
<Javac
148-
JavaPlatformJarPath="$(JavaPlatformJarPath)"
149-
ClassesOutputDirectory="$(_AndroidIntermediateJavaClassDirectory)"
150-
StubSourceDirectory="$(_AndroidIntermediateJavaSourceDirectory)"
151-
JavaSourceFiles=""
152-
ToolPath="$(JavacToolPath)"
153-
ToolExe="$(JavacToolExe)"
154-
Jars="@(_JavaLibrariesToCompile);@(_ReferenceJavaLibs)"
155-
JavacTargetVersion="$(JavacTargetVersion)"
156-
JavacSourceVersion="$(JavacSourceVersion)"
157-
/>
158-
<Touch Files="$(_AndroidStampDirectory)SetupDependenciesForDesigner.stamp" AlwaysCreate="true" />
159-
</Target>
19+
<!-- Public targets for the designer are deprecated -->
20+
<Target Name="GetExtraLibraryLocationsForDesigner" />
21+
<Target Name="SetupDependenciesForDesigner" />
16022

16123
</Project>

0 commit comments

Comments
 (0)