From 0f380b43abf1fbfcc620fd170064bd7e35ed3713 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 28 Jan 2025 16:07:57 -0600 Subject: [PATCH 1/3] [build] remove unused Xamarin.Android files Two files cause some confusion by *existing* in the repo: * `Xamarin.Android.Sdk.props` * `Xamarin.Android.Sdk.targets` Neither are shipped in `C:\Program Files\dotnet\packs\Microsoft.Android.Sdk.Windows\`, for example. They are effectively dead code. If we remove them, this means more stuff can be removed: * `@(XATargetsSrcFiles)` item group * `` MSBuild task * `create-vsix` and `create-pkg` projects * `Xamarin.Android.Bindings.Before.targets` and `Xamarin.Android.Bindings.After.targets` * `Xamarin.Android.Common.Before.targets` and `Xamarin.Android.Common.After.targets` Removing these files may improve MSBuild project evaluation time, as they are currently running several `Exists()` checks that always return `false`. In the Xamarin.Android days, the XamarinVS Visual Studio extension layed down custom MSBuild targets files *inside* the Xamarin.Android installation to augment the build. This doesn't happen any more in .NET 6+, as they do not lay down files inside a .NET workload in `C:\Program Files\dotnet\packs`. It wouldn't make sense to do so. Note that I moved `runtime-entitlements.plist` to `build-tools/installers/` as it is still used. --- build-tools/create-pkg/create-pkg.csproj | 18 -- build-tools/create-pkg/create-pkg.targets | 154 ------------------ build-tools/create-pkg/distribution.xml.in | 18 -- build-tools/create-pkg/scripts/preinstall | 11 -- build-tools/create-vsix/.gitignore | 2 - build-tools/create-vsix/AndroidSdkPackage.cs | 10 -- .../Resources/AndroidSdkPackage.ico | Bin 27054 -> 0 bytes build-tools/create-vsix/VSPackage.resx.in | 145 ----------------- .../create-vsix/Xamarin.Android.Sdk.pkgdef.in | 11 -- build-tools/create-vsix/create-vsix.csproj | 72 -------- build-tools/create-vsix/create-vsix.targets | 108 ------------ .../create-vsix/source.extension.vsixmanifest | 21 --- .../create-vsix/symbols/ExternalWhiteList.csv | 10 -- .../symbols/SymbolArchiveWhiteList.csv | 19 --- .../installers/create-installers.targets | 10 +- .../runtime-entitlements.plist | 0 build-tools/scripts/XAVersionInfo.targets | 1 - .../Xamarin.Android.Bindings.After.targets | 20 --- .../Xamarin.Android.Bindings.Before.targets | 21 --- .../Xamarin.Android.Common.After.targets | 23 --- .../Xamarin.Android.Common.Before.targets | 24 --- .../MSBuild/Xamarin/Xamarin.Android.Sdk.props | 54 ------ .../Xamarin/Xamarin.Android.Sdk.targets | 20 --- .../Tasks/SetVsMonoAndroidRegistryKey.cs | 28 ---- .../Xamarin.Android.Bindings.targets | 10 -- .../Xamarin.Android.Build.Tasks.targets | 25 --- .../Xamarin.Android.Common.targets | 10 -- .../Xamarin.Android.FSharp.targets | 9 - .../Xamarin.Android.VisualBasic.targets | 9 - 29 files changed, 1 insertion(+), 862 deletions(-) delete mode 100644 build-tools/create-pkg/create-pkg.csproj delete mode 100644 build-tools/create-pkg/create-pkg.targets delete mode 100644 build-tools/create-pkg/distribution.xml.in delete mode 100755 build-tools/create-pkg/scripts/preinstall delete mode 100644 build-tools/create-vsix/.gitignore delete mode 100644 build-tools/create-vsix/AndroidSdkPackage.cs delete mode 100644 build-tools/create-vsix/Resources/AndroidSdkPackage.ico delete mode 100644 build-tools/create-vsix/VSPackage.resx.in delete mode 100644 build-tools/create-vsix/Xamarin.Android.Sdk.pkgdef.in delete mode 100644 build-tools/create-vsix/create-vsix.csproj delete mode 100644 build-tools/create-vsix/create-vsix.targets delete mode 100644 build-tools/create-vsix/source.extension.vsixmanifest delete mode 100644 build-tools/create-vsix/symbols/ExternalWhiteList.csv delete mode 100644 build-tools/create-vsix/symbols/SymbolArchiveWhiteList.csv rename build-tools/{create-pkg => installers}/runtime-entitlements.plist (100%) delete mode 100644 src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.After.targets delete mode 100644 src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Before.targets delete mode 100644 src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Common.After.targets delete mode 100644 src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Common.Before.targets delete mode 100644 src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.props delete mode 100644 src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.targets delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/SetVsMonoAndroidRegistryKey.cs diff --git a/build-tools/create-pkg/create-pkg.csproj b/build-tools/create-pkg/create-pkg.csproj deleted file mode 100644 index 6e4e85c839a..00000000000 --- a/build-tools/create-pkg/create-pkg.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard2.0 - false - createpkg - create-pkg - ..\..\bin\Build$(Configuration) - - - - - - - - - - diff --git a/build-tools/create-pkg/create-pkg.targets b/build-tools/create-pkg/create-pkg.targets deleted file mode 100644 index 75917cd98c4..00000000000 --- a/build-tools/create-pkg/create-pkg.targets +++ /dev/null @@ -1,154 +0,0 @@ - - - - - ResolveReferences - - - / - /usr - $(OutputPath)\pkg\archive - $(OutputPath)\pkg\packages - $(OutputPath)\pkg\resources - $(OutputPath)\pkg\distribution.xml - $(XamarinAndroidSourcePath)\LICENSE - $(PkgResourcesPath)\en.lproj - $(MSBuildThisFileDirectory)scripts - d1ec039f-f3db-468b-a508-896d7c382999 - - - - - $(PayloadDir)\Library\Frameworks\Xamarin.Android.framework\Versions\$(XAVersion) - $(PayloadDir)\Library\Frameworks\Mono.framework\External - $(XAFrameworkDir)\lib\xamarin.android\xbuild\Xamarin\Android - $(XAFrameworkDir)\lib\xamarin.android\xbuild-frameworks\MonoAndroid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(OutputPath)xamarin.android-$(XAVersion).pkg - $(OutputPath)Xamarin.Android.Sdk-$(XAOSSInstallerSuffix).pkg - - - - - - - - - - - - - - - - - - - - diff --git a/build-tools/create-pkg/distribution.xml.in b/build-tools/create-pkg/distribution.xml.in deleted file mode 100644 index ba991611e99..00000000000 --- a/build-tools/create-pkg/distribution.xml.in +++ /dev/null @@ -1,18 +0,0 @@ - - - - @PACKAGE_TITLE@ - - - - - - - - - - - - - #xamarin.android.pkg - \ No newline at end of file diff --git a/build-tools/create-pkg/scripts/preinstall b/build-tools/create-pkg/scripts/preinstall deleted file mode 100755 index 50ec12e9fb8..00000000000 --- a/build-tools/create-pkg/scripts/preinstall +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -INSTALLATION_ROOT=/Library/Frameworks/Xamarin.Android.framework/Versions -PREVIOUS_VERSION=$(readlink "$INSTALLATION_ROOT/Current") -PREVIOUS_VERSION_PATH="$INSTALLATION_ROOT/$PREVIOUS_VERSION" - -# Ensure previously installed version is removed. -if [ -d "$PREVIOUS_VERSION_PATH" ]; then - rm -rf "$PREVIOUS_VERSION_PATH" -fi - diff --git a/build-tools/create-vsix/.gitignore b/build-tools/create-vsix/.gitignore deleted file mode 100644 index acb646f32b4..00000000000 --- a/build-tools/create-vsix/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Xamarin.Android.Sdk.pkgdef -VSPackage.resx diff --git a/build-tools/create-vsix/AndroidSdkPackage.cs b/build-tools/create-vsix/AndroidSdkPackage.cs deleted file mode 100644 index be9b47d7152..00000000000 --- a/build-tools/create-vsix/AndroidSdkPackage.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Runtime.InteropServices; -using Microsoft.VisualStudio.Shell; - -namespace Xamarin.Android.Sdk -{ - [Guid("d0e8d881-b09d-40bf-923b-b3efddc53c16")] - public class AndroidSdkPackage : Package - { - } -} diff --git a/build-tools/create-vsix/Resources/AndroidSdkPackage.ico b/build-tools/create-vsix/Resources/AndroidSdkPackage.ico deleted file mode 100644 index 7827faac38a020bf02c9b0750be81e78ace6b3d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27054 zcmeHP&yN&U5N=~Uy9Y0xoFhk09?kp%n*9gV{Ra$OO-y#Vn2?aTM}@>0qaKul;z6Sj zHy92g#swpZU}WR~3Gv4$0=sY->udU(RM%E@zwYVX#n7GfzF+mK>Z@1p)qCANn`KXA zPi9L?nWTg4z*AZFe3oT{K~a7t%U+SX;jkz#XW5(2X4wIukuK8XVZ9_-CUm=b-MxEv z`TqU;6S-%>J$>-t!KA^7YAi|K%^|{)i5({Rb@IlXfh$KFGt) z@Nof#sk!449xLD>cQk({(zd*#V_(tQ0$3*pau4Ok`kG&|rv9IROaCZ zc(lP>$cA4={8Q_vZFG=zU<0yG{&FdwUv|#bm9gfZ_~|@#oUbV)4elE25(fgzsvV z4h8mnowRXR^G4ic>_ojSYg**N3z+1t^hIeOfvyfa0~qDlGV66pUljX}JsU{<5VGNO zI&Nzo%v*W3Ogf!{C-~zQSp%yB=Ud8Ni}H}_{fw69<-xnqq2!CA58`9ed|SP6T8l5` z(dNlz9o7W;B4ok_dcN7c3i~k~es;Vh&nsYmLwYZ@^HKDuoNwBLhC|5~y3fxo?2w|3!- zD<3=+_95l!RAi4J-#hma)9B~#t>}3fZKSiQ^0~2=sq=*mD&s%bf1Cq(F(0k}YQBYM zH0psl0UJc~5#x(-u=r3HjlIIYMmbff$PeeEm0MTF9uj!KQ|#rQPpvL`K1RM+Cl~E{ zzKQ%s=UbuQgx=UUwOJFOH_i^=;mtRT*_O30g2w`P<(|{Z)n({_Gn~k-dUg=$2DxMK z&^-HmZ-L$dy#;y;JhT9w6AtBGlY9Q0uu-Ivj{VhJpvD44EMJ#cp6_cG*iS_9-m8bK z)&1TBK!-iT>)9Z$lRe;DHAB>SbMb6xFULE?5Bp;;**VAxhOqg5kGqw>SAHOKZfIrW zOo`_oZO$_(=PgYG8IT2;RuAY_F>IYQ;moDwLXSnxk{Vl+JY+gHC_R7f1h8Tv*biy! z$Vbmtn_y{63maH{#0OTC%AIBPI~>Zy8NRLVUG?Mp7wRPGWH;iX@XVhdQBKPHoUSld z@$q~>bX@Ih;Dr(FDLkjdjjR?uLh-Px zcxT^lUX*XmtnMi^wvR1)YoYkSN*f>OGT!lhhEA>Sx{Y~DlTz*~9*W&|#Jjd@9`WeZ zV$p5PTbh(Ie1Px67!Smc8=VmaJL27Z9YKDPct<=swODi;^Oh#Hyl6b^I^GeFPAwMQ z#=NCzQnqWMjOjRK9T2)5@$RM1-`lZXHPMB5bZYzSHs&o&ld=~N#gA*BfC|k-`+l2v zr}fm|1rt|lIy`lJA-jKf^Ll9x16!33bQSN2pYOC&@p^R8yKl;+9m-BJs|SGxxTsxKinWC6Yy)RcYh{Uc77aOv}?BdUSn7JgYG4HZL9m zyWC?v@0-Ru4`-ySN1Iv~@zfaW@?ZUSr4$c=o!^Pl22IAkN~cs@sdQDc>Tt7NeJ_^V zL9kyWZl+Dwd{6&KSC2NeF5*dSsVQ+rX(}JmdHSQR>nq|(JyKG9x8~q3J>Pkp{9kM_ zk$a?Vf;A$=mZb5<8Esu(5l`xolJa{^;>G%h7{D^qCeJrLoRO{`ZE9V_GX*zj?Aiyc zz>f2fs_*3~ z6K4|c%kjNB%DaU>l0{v-^w{RvIi3Pr_^rIyU`69cKE($-xsO7fx8}*%ALf{QsbDVo z0G=VW!BX{mil+X*{^Pk;I@ovzY#wG^=lMXBct~5pSG&5}JO_MHp4nPo7HmU}HOfoB zk?z|h9uhxN>jP|y?BccS|AoNzy0k9dMYvgCtc4}}rN%?88+<_jwu)`3_|X^t6N3Fx z)0B8etWk;>p?#q3_a3kTf5#Nz_UeHheN!=$&Wm?4o@)`#sJ`%l(ps1j52=SvF^2q& zn}^lbdB4Nb{HpTMQIDJC!*~~AXT8{{s%EHt~?yQ^u8k(#8fh-pL-n(f^0=Y{35+p?#`pJjD2>V5eV$7JXPwNu%eR9;T*s zf_INH!G8t>}t(N#QbgDs_x6YpC8HZigVVu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Xamarin.Android SDK - - - Xamarin.Android Reference Assemblies and MSBuild support. - Mono: @MONO_COMMIT@ - Java.Interop: @JAVA_INTEROP_COMMIT@ - SQLite: @SQLITE_COMMIT@ - Xamarin.Android Tools: @XAMARIN_ANDROID_TOOLS_COMMIT@ - - - - Resources/AndroidSdkPackage.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - diff --git a/build-tools/create-vsix/Xamarin.Android.Sdk.pkgdef.in b/build-tools/create-vsix/Xamarin.Android.Sdk.pkgdef.in deleted file mode 100644 index e8b893d5568..00000000000 --- a/build-tools/create-vsix/Xamarin.Android.Sdk.pkgdef.in +++ /dev/null @@ -1,11 +0,0 @@ -[$RootKey$\InstalledProducts\AndroidSdkPackage] -@="#110" -"Package"="{d0e8d881-b09d-40bf-923b-b3efddc53c16}" -"PID"="@PACKAGE_VERSION@.@PACKAGE_VERSION_BUILD@ (@PACKAGE_HEAD_BRANCH@/@PACKAGE_HEAD_REV@)" -"ProductDetails"="#112" -"LogoID"="#400" -[$RootKey$\Packages\{d0e8d881-b09d-40bf-923b-b3efddc53c16}] -@="AndroidSdkPackage" -"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL" -"Class"="Xamarin.Android.Sdk.AndroidSdkPackage" -"CodeBase"="$PackageFolder$\Xamarin.Android.Sdk.dll" diff --git a/build-tools/create-vsix/create-vsix.csproj b/build-tools/create-vsix/create-vsix.csproj deleted file mode 100644 index e933befa553..00000000000 --- a/build-tools/create-vsix/create-vsix.csproj +++ /dev/null @@ -1,72 +0,0 @@ - - - - netstandard2.0 - Xamarin.Android.Sdk - Xamarin.Android.Sdk - true - True - False - true - False - False - true - false - bin\$(Configuration) - true - - - - - - False - true - True - Normal - <_BuildVsix Condition=" '$(CreateVsixContainer)' == 'True' And Exists ('$(VsSDKInstall)') ">True - <_BuildVsix Condition=" '$(_BuildVsix)' == '' ">False - Xamarin\Xamarin.Android.Sdk - - - - - PreserveNewest - true - - - Always - True - - - - - True - VSPackage - - - - - - - - - - - - - _CreateDependencies; - $(BuildDependsOn); - _CopyToBuildConfiguration - - - - - - _CreateDependencies; - $(BuildDependsOn); - - - - - - diff --git a/build-tools/create-vsix/create-vsix.targets b/build-tools/create-vsix/create-vsix.targets deleted file mode 100644 index a932af31d38..00000000000 --- a/build-tools/create-vsix/create-vsix.targets +++ /dev/null @@ -1,108 +0,0 @@ - - - - - False - - $(PrepareForBuildDependsOn); - AddContent - - - - - True - - MSBuild - - - True - - ReferenceAssemblies - - - True - / - - - - - - - Microsoft/Framework/MonoAndroid/$([System.IO.Path]::GetDirectoryName(%(RelativePath))) - - - - - Xamarin/Android/$([System.IO.Path]::GetDirectoryName(%(RelativePath))) - - - Xamarin/Android/$([System.IO.Path]::GetDirectoryName(%(RelativePath))) - - - Xamarin/ - - - Novell/ - - - Xamarin/Android/ - - - - - - - - - - - $([System.IO.Path]::GetFileName('$(VsixPath)')) - $(OutDir)$(TargetVsixContainerName) - - - - - - - - - - - - - - ..\..\bin\Build$(Configuration)\$(AssemblyName)-$(XAVersion).vsix - ..\..\bin\Build$(Configuration)\$(AssemblyName)-$(XAOSSInstallerSuffix).vsix - <_VsixDir>$([System.IO.Path]::GetDirectoryName ($(VsixPath))) - - - - - - - diff --git a/build-tools/create-vsix/source.extension.vsixmanifest b/build-tools/create-vsix/source.extension.vsixmanifest deleted file mode 100644 index d157beab433..00000000000 --- a/build-tools/create-vsix/source.extension.vsixmanifest +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Xamarin.Android SDK - Xamarin.Android SDK - Resources\AndroidSdkPackage.ico - - - - - amd64 - - - - - - - - - diff --git a/build-tools/create-vsix/symbols/ExternalWhiteList.csv b/build-tools/create-vsix/symbols/ExternalWhiteList.csv deleted file mode 100644 index 402e4a01e0e..00000000000 --- a/build-tools/create-vsix/symbols/ExternalWhiteList.csv +++ /dev/null @@ -1,10 +0,0 @@ -# ------------------------------------------------------------------------------- -# This is the whitelist for all of executable files that won't be symbol archived -# In this format: -# [fileName|FilePattern],comment -# It will also ignore any empty line or lines that begin with '#' -# ------------------------------------------------------------------------------- -# -# Xamarin.Android 3rd party assemblies - pecolli, jopryo -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\INIFileParser.dll -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\Irony.dll diff --git a/build-tools/create-vsix/symbols/SymbolArchiveWhiteList.csv b/build-tools/create-vsix/symbols/SymbolArchiveWhiteList.csv deleted file mode 100644 index 96de1bfcc56..00000000000 --- a/build-tools/create-vsix/symbols/SymbolArchiveWhiteList.csv +++ /dev/null @@ -1,19 +0,0 @@ -# ------------------------------------------------------------------------------- -# This is the whitelist for all of executable files that won't be symbol archived -# In this format: -# [fileName|FilePattern],comment -# It will also ignore any empty line or lines that begin with '#' -# ------------------------------------------------------------------------------- -# -# Xamarin.Android - pecolli, jopryo -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*referenceassemblies\*\facades\*, Facade assemblies. -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\bcl\*, 'Designer profile' assemblies. -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*\System.Runtime.CompilerServices.Unsafe.dll, contains small amount of IL -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*\System.Windows.dll, contains only type forwarders -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*\System.Xml.Serialization.dll, contains only type forwarders -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\ICSharpCode.SharpZipLib.dll, Fails Pdb2Pdb.exe conversion. -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\illinkanalyzer.exe, Fails Pdb2Pdb.exe conversion. -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\Java.Interop.dll, Fails Pdb2Pdb.exe conversion. -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\mdoc.exe, Fails Pdb2Pdb.exe conversion. -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\mkbundle.exe, Fails Pdb2Pdb.exe conversion. -xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\mono-symbolicate.exe, Fails Pdb2Pdb.exe conversion. diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 2101dec82b6..2131682f2eb 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -11,7 +11,7 @@ <_MonoDocOutputPath>$(XamarinAndroidSourcePath)bin\$(Configuration)\lib\monodoc\ $(XAInstallPrefix)xbuild\Xamarin\Android\ $(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\MSBuild\Xamarin\Android - $(MSBuildThisFileDirectory)\..\create-pkg\runtime-entitlements.plist + $(MSBuildThisFileDirectory)runtime-entitlements.plist $(AndroidLatestStableFrameworkVersion) v1.0 dylib @@ -191,11 +191,7 @@ <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.AvailableItems.targets" /> - <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.Bindings.After.targets" /> - <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.Bindings.Before.targets" /> <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.Common\ImportAfter\Microsoft.Cpp.Android.targets" /> - <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.Common.After.targets" /> - <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.Common.Before.targets" /> <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.DefaultOutputPaths.targets" /> @@ -248,10 +244,6 @@ <_MSBuildFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)libZipSharpNative-*.$(LibExtension)" /> <_MSBuildFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)libMono.Unix.$(LibExtension)" /> - - - - diff --git a/build-tools/create-pkg/runtime-entitlements.plist b/build-tools/installers/runtime-entitlements.plist similarity index 100% rename from build-tools/create-pkg/runtime-entitlements.plist rename to build-tools/installers/runtime-entitlements.plist diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets index f63744b88a0..1979349b808 100644 --- a/build-tools/scripts/XAVersionInfo.targets +++ b/build-tools/scripts/XAVersionInfo.targets @@ -10,7 +10,6 @@ <_SubmoduleBranchInfo Include="external/Java.Interop"> _BuildInfo_JavaInteropCommit diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.After.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.After.targets deleted file mode 100644 index 3b37149ebbc..00000000000 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.After.targets +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Xamarin.Android.Sdk.targets'))\Xamarin.Android.Sdk.targets - - - - diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Before.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Before.targets deleted file mode 100644 index 2fb46ab55b9..00000000000 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Before.targets +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Xamarin.Android.Sdk.props'))\Xamarin.Android.Sdk.props - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Common.After.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Common.After.targets deleted file mode 100644 index 62b9671ce6a..00000000000 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Common.After.targets +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Xamarin.Android.Sdk.targets'))\Xamarin.Android.Sdk.targets - - - - diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Common.Before.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Common.Before.targets deleted file mode 100644 index 7101a6d7a6e..00000000000 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Common.Before.targets +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Xamarin.Android.Sdk.props'))\Xamarin.Android.Sdk.props - - - - diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.props b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.props deleted file mode 100644 index bce872f190e..00000000000 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.props +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - $([System.IO.File]::ReadAllText('$(VsInstallRoot)\Common7\IDE\devenv.isolation.ini')) - $(DevEnvIni.IndexOf('InstallationID=')) - $([MSBuild]::Add('$(InstallationIDEqualsIndex)', '15')) - $(DevEnvIni.Substring($(InstallationIDEqualsIndex), 8)) - - - - - $(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ - $(ProgramFiles)\Reference Assemblies\Microsoft\Framework\ - $(MSBuildThisFileDirectory)..\..\xbuild-frameworks\ - - - $(TargetFrameworkRootPath)MonoAndroid\v1.0 - - - - - $(VsInstallRoot)\MSBuild\Xamarin\Android - $(VsInstallRoot)\MSBuild\Xamarin\Android - - - - - - - - - - - - - true - - - - - diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.targets deleted file mode 100644 index 0dd7bc95d08..00000000000 --- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.targets +++ /dev/null @@ -1,20 +0,0 @@ - - - - - true - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/SetVsMonoAndroidRegistryKey.cs b/src/Xamarin.Android.Build.Tasks/Tasks/SetVsMonoAndroidRegistryKey.cs deleted file mode 100644 index 701f5d7216c..00000000000 --- a/src/Xamarin.Android.Build.Tasks/Tasks/SetVsMonoAndroidRegistryKey.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System; -using Microsoft.Android.Build.Tasks; - -namespace Xamarin.Android.Tasks -{ - public class SetVsMonoAndroidRegistryKey : AndroidTask - { - public override string TaskPrefix => "SVM"; - - [Required] - public string InstallationID { get; set; } - - [Required] - public string VisualStudioVersion { get; set; } - - const string EnvironmentVariable = "XAMARIN_ANDROID_REGKEY"; - - public override bool RunTask () - { - string value = $@"SOFTWARE\Xamarin\VisualStudio\{VisualStudioVersion}_{InstallationID}\Android"; - Log.LogDebugMessage ($"Setting %{EnvironmentVariable}%=\"{value}\""); - Environment.SetEnvironmentVariable (EnvironmentVariable, value, EnvironmentVariableTarget.Process); - return !Log.HasLoggedErrors; - } - } -} diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets index 99527343326..3139ef87fdb 100755 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets @@ -170,14 +170,4 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved. - - - diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets index 3fd82ecdc9c..34346c03f3f 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets @@ -79,16 +79,6 @@ PreserveNewest Xamarin.Android.AvailableItems.targets - - PreserveNewest - Xamarin.Android.Common.After.targets - - - PreserveNewest - Xamarin.Android.Common.Before.targets - PreserveNewest @@ -343,21 +333,6 @@ /> - - <_VSExtensionTargets Include="$(MSBuildThisFileDirectory)MSBuild\Xamarin\Xamarin.Android.Sdk.props" /> - <_VSExtensionTargets Include="$(MSBuildThisFileDirectory)MSBuild\Xamarin\Xamarin.Android.Sdk.targets" /> - - - - - - - - diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.FSharp.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.FSharp.targets index db0c2b16fff..b6a77bd2853 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.FSharp.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.FSharp.targets @@ -64,13 +64,4 @@ Copyright (C) 2012 Xamarin. All rights reserved. - - diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.VisualBasic.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.VisualBasic.targets index a7837545417..afd95a346d6 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.VisualBasic.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.VisualBasic.targets @@ -34,13 +34,4 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved. - - From 7bb97b3e66231224d057875b1ca8d04473e3a178 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 28 Jan 2025 16:27:10 -0600 Subject: [PATCH 2/3] Update Xamarin.Android.Build.Tasks.targets --- .../Xamarin.Android.Build.Tasks.targets | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets index 34346c03f3f..f845733bc36 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets @@ -29,11 +29,6 @@ <_SupportLicense Condition="Exists('$(_AndroidSdkLocation)\extras\android\m2repository\m2repository\NOTICE.txt')">$(_AndroidSdkLocation)\extras\android\m2repository\m2repository\NOTICE.txt - - PreserveNewest - Xamarin.Android.Bindings.Before.targets - PreserveNewest From b7aa130ef5ccfc0e403026bc62ab044dd1d7f39c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 29 Jan 2025 08:43:05 -0600 Subject: [PATCH 3/3] Update Xamarin.Android.Build.Tasks.targets --- .../Xamarin.Android.Build.Tasks.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets index f845733bc36..7d5424337b6 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets @@ -20,7 +20,6 @@ _CopyExtraPackageContent; _GenerateBundledVersions; _CopyNetSdkTargets; - _CopyVSExtensionTargets; _WriteVersionFiles; <_AndroidSdkLocation Condition="'$(_AndroidSdkLocation)'==''">$(AndroidSdkDirectory)