[Xamarin.Android.Build.Tasks] remove $(UseShortFileNames) (#4946)

jonathanpeppers · web-flow · commit eb89395e672b · 2020-07-22T15:35:25.000-04:00
Setting `$(UseShortFileNames)`=`false` would tell Xamarin.Android's MSBuild targets to use "long" folder names such as: * `obj\Debug\lp` -> `__library_projects__` * `obj\Debug\lp\*\jl` -> `library_project_imports` * `obj\Debug\lp\*\nl` -> `native_library_imports` This was useful when `$(UseShortFileNames)` was a new feature, giving developers a way to "opt out" if they hit a bug. However, `$(UseShortFileNames)` has defaulted to `true` since ~July 2017 to help avoid the [MAX_PATH][0] limit on Windows. I'm finding basically [no usage of `UseShortFileNames=false`][1] on Github, which makes this an easy choice. I have removed all usage of `$(UseShortFileNames)`. The remaining behavior will act as if `$(UseShortFileNames)`=true. [0]: https://docs.microsoft.com/windows/win32/fileio/naming-a-file#maximum-path-length-limitation [1]: https://github.com/search?q=UseShortFileNames+false+extension%3Acsproj&type=Code
diff --git a/Documentation/release-notes/useshortfilenames.md b/Documentation/release-notes/useshortfilenames.md
@@ -0,0 +1,27 @@
+### `UseShortFileNames=false` is no longer supported
+
+In previous versions of Xamarin.Android, you could set
+`$(UseShortFileNames)` in your `.csproj` file:
+
+```xml
+<PropertyGroup>
+  <UseShortFileNames>false</UseShortFileNames>
+</PropertyGroup>
+```
+
+This would tell Xamarin.Android's MSBuild targets to use the "long"
+folder names such as:
+
+* `obj\Debug\lp` -> `__library_projects__`
+* `obj\Debug\lp\*\jl` -> `library_project_imports`
+* `obj\Debug\lp\*\nl` -> `native_library_imports`
+
+This was useful when `$(UseShortFileNames)` was a new feature, giving
+developers a way to "opt out" if they hit a bug. However,
+`$(UseShortFileNames)` has defaulted to `true` since ~July 2017 to
+help the [MAX_PATH][0] limit on Windows.
+
+This functionality has been removed from Xamarin.Android. Short file
+names will be used going forward.
+
+[0]: https://docs.microsoft.com/windows/win32/fileio/naming-a-file#maximum-path-length-limitation
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Aapt.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Aapt.targets
@@ -47,7 +47,6 @@ Copyright (C) 2019  Microsoft Corporation. All rights reserved.
       Condition="'$(_AndroidResourceDesignerFile)' != '' And '$(_AndroidUseAapt2)' != 'True'"
       ImportsDirectory="$(_LibraryProjectImportsDirectoryName)"
       OutputImportDirectory="$(_AndroidLibrayProjectIntermediatePath)"
-      UseShortFileNames="$(UseShortFileNames)"
       JavaPlatformJarPath="$(JavaPlatformJarPath)"
       ManifestFiles="$(ResgenTemporaryDirectory)\AndroidManifest.xml"
       PackageName="$(_AndroidPackage)"
@@ -77,7 +76,6 @@ Copyright (C) 2019  Microsoft Corporation. All rights reserved.
      Condition="'$(_AndroidUseAapt2)' != 'True'"
      ImportsDirectory="$(_LibraryProjectImportsDirectoryName)"
      OutputImportDirectory="$(_AndroidLibrayProjectIntermediatePath)"
-     UseShortFileNames="$(UseShortFileNames)"
      JavaPlatformJarPath="$(JavaPlatformJarPath)"
      ManifestFiles="$(IntermediateOutputPath)android\AndroidManifest.xml"
      ResourceDirectory="$(MonoAndroidResDirIntermediate)"
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Aapt2.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Aapt2.targets
@@ -166,7 +166,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
       ResourceNameCaseMap="$(_AndroidResourceNameCaseMap)"
       AssemblyIdentityMapFile="$(_AndroidLibrayProjectAssemblyMapFile)"
       ImportsDirectory="$(_LibraryProjectImportsDirectoryName)"
-      UseShortFileNames="$(UseShortFileNames)"
       OutputImportDirectory="$(_AndroidLibrayProjectIntermediatePath)"
       OutputFile="$(ResgenTemporaryDirectory)\resources.apk"
       PackageName="$(_AndroidPackage)"
@@ -231,7 +230,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
       ResourceNameCaseMap="$(_AndroidResourceNameCaseMap)"
       ResourceDirectories="$(MonoAndroidResDirIntermediate)"
       AssemblyIdentityMapFile="$(_AndroidLibrayProjectAssemblyMapFile)"
-      UseShortFileNames="$(UseShortFileNames)"
       ImportsDirectory="$(_LibraryProjectImportsDirectoryName)"
       OutputImportDirectory="$(_AndroidLibrayProjectIntermediatePath)"
       OutputFile="$(_PackagedResources)"
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets
@@ -73,7 +73,6 @@ It is shared between "legacy" binding projects and .NET 5 projects.
         TypeMappingReportFile="$(GeneratedOutputPath)type-mapping.txt"
         ToolPath="$(MonoAndroidToolsDirectory)"
         ToolExe="$(BindingsGeneratorToolExe)"
-        UseShortFileNames="$(UseShortGeneratorFileNames)"
         LangVersion="$(LangVersion)"
         EnableInterfaceMembersPreview="$(_EnableInterfaceMembers)"
     />
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs
@@ -73,7 +73,6 @@ public class Aapt : AndroidAsyncTask
 
 		public string ImportsDirectory { get; set; }
 		public string OutputImportDirectory { get; set; }
-		public bool UseShortFileNames { get; set; }
 		public string AssemblyIdentityMapFile { get; set; }
 
 		public string ResourceNameCaseMap { get; set; }
@@ -365,7 +364,7 @@ string ExpandString (string s)
 					return s.Substring (0, st + 1) + ExpandString (s.Substring (st + 1));
 				int ast = st + "${library.imports:".Length;
 				string aname = s.Substring (ast, ed - ast);
-				return s.Substring (0, st) + Path.Combine (OutputImportDirectory, UseShortFileNames ? assemblyMap.GetLibraryImportDirectoryNameForAssembly (aname) : aname, ImportsDirectory) + Path.DirectorySeparatorChar + ExpandString (s.Substring (ed + 1));
+				return s.Substring (0, st) + Path.Combine (OutputImportDirectory, assemblyMap.GetLibraryImportDirectoryNameForAssembly (aname), ImportsDirectory) + Path.DirectorySeparatorChar + ExpandString (s.Substring (ed + 1));
 			}
 			else
 				return s;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2Link.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2Link.cs
@@ -71,8 +71,6 @@ public class Aapt2Link : Aapt2 {
 
 		public string ImportsDirectory { get; set; }
 
-		public bool UseShortFileNames { get; set; }
-
 		public bool NonConstantId { get; set; }
 
 		public bool ProtobufFormat { get; set; }
@@ -296,7 +294,7 @@ string ExpandString (string s)
 					return s.Substring (0, st + 1) + ExpandString (s.Substring (st + 1));
 				int ast = st + "${library.imports:".Length;
 				string aname = s.Substring (ast, ed - ast);
-				return s.Substring (0, st) + Path.Combine (OutputImportDirectory, UseShortFileNames ? assemblyMap.GetLibraryImportDirectoryNameForAssembly (aname) : aname, ImportsDirectory) + Path.DirectorySeparatorChar + ExpandString (s.Substring (ed + 1));
+				return s.Substring (0, st) + Path.Combine (OutputImportDirectory, assemblyMap.GetLibraryImportDirectoryNameForAssembly (aname), ImportsDirectory) + Path.DirectorySeparatorChar + ExpandString (s.Substring (ed + 1));
 			}
 			else
 				return s;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs
@@ -35,9 +35,6 @@ public class ResolveLibraryProjectImports : AndroidTask
 
 		public ITaskItem [] AarLibraries { get; set; }
 
-		[Required]
-		public bool UseShortFileNames { get; set; }
-
 		[Required]
 		public string AssemblyIdentityMapFile { get; set; }
 
@@ -174,10 +171,7 @@ void Extract (
 					continue;
 				}
 				string assemblyFileName = Path.GetFileNameWithoutExtension (assemblyPath);
-				string assemblyIdentName = assemblyFileName;
-				if (UseShortFileNames) {
-					assemblyIdentName = assemblyMap.GetLibraryImportDirectoryNameForAssembly (assemblyFileName);
-				}
+				string assemblyIdentName = assemblyMap.GetLibraryImportDirectoryNameForAssembly (assemblyFileName);
 				string outDirForDll = Path.Combine (OutputImportDirectory, assemblyIdentName);
 				string importsDir = Path.Combine (outDirForDll, ImportsDirectory);
 				string nativeimportsDir = Path.Combine (outDirForDll, NativeImportsDirectory);
@@ -336,9 +330,7 @@ void Extract (
 				if (!File.Exists (aarFile.ItemSpec))
 					continue;
 				string aarIdentityName = Path.GetFileNameWithoutExtension (aarFile.ItemSpec);
-				if (UseShortFileNames) {
-					aarIdentityName = assemblyMap.GetLibraryImportDirectoryNameForAssembly (aarIdentityName);
-				}
+				aarIdentityName = assemblyMap.GetLibraryImportDirectoryNameForAssembly (aarIdentityName);
 				string outDirForDll = Path.Combine (OutputImportDirectory, aarIdentityName);
 				string importsDir = Path.Combine (outDirForDll, ImportsDirectory);
 				string resDir = Path.Combine (importsDir, "res");
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs
@@ -298,7 +298,7 @@ public void BindngFilterUnsupportedNativeAbiLibraries ()
 		}
 
 		[Test]
-		public void BindingCheckHiddenFiles ([Values (true, false)] bool useShortFileNames)
+		public void BindingCheckHiddenFiles ()
 		{
 			var binding = new XamarinAndroidBindingProject () {
 				UseLatestPlatformSdk = true,
@@ -312,13 +312,11 @@ public void BindingCheckHiddenFiles ([Values (true, false)] bool useShortFileNam
 				WebContentFileNameFromAzure = "javaBindingIssue.jar"
 			});
 			var path = Path.Combine ("temp", TestContext.CurrentContext.Test.Name);
-			binding.SetProperty (binding.ActiveConfigurationProperties, "UseShortFileNames", useShortFileNames);
 			using (var bindingBuilder = CreateDllBuilder (Path.Combine (path, "Binding"))) {
 				bindingBuilder.Verbosity = Microsoft.Build.Framework.LoggerVerbosity.Diagnostic;
 				Assert.IsTrue (bindingBuilder.Build (binding), "binding build should have succeeded");
 				var proj = new XamarinAndroidApplicationProject ();
 				proj.OtherBuildItems.Add (new BuildItem ("ProjectReference", "..\\Binding\\UnnamedProject.csproj"));
-				proj.SetProperty (proj.ActiveConfigurationProperties, "UseShortFileNames", useShortFileNames);
 				proj.AndroidManifest = $@"<?xml version=""1.0"" encoding=""utf-8""?>
 <manifest xmlns:android=""http://schemas.android.com/apk/res/android"" xmlns:tools=""http://schemas.android.com/tools"" android:versionCode=""1"" android:versionName=""1.0"" package=""{proj.PackageName}"">
 	<uses-sdk />
@@ -328,21 +326,13 @@ public void BindingCheckHiddenFiles ([Values (true, false)] bool useShortFileNam
 				using (var b = CreateApkBuilder (Path.Combine (path, "App"))) {
 					Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 					var assemblyMap = b.Output.GetIntermediaryPath (Path.Combine ("lp", "map.cache"));
-					if (useShortFileNames)
-						Assert.IsTrue (File.Exists (assemblyMap), $"{assemblyMap} should exist.");
-					else
-						Assert.IsFalse (File.Exists (assemblyMap), $"{assemblyMap} should not exist.");
+					Assert.IsTrue (File.Exists (assemblyMap), $"{assemblyMap} should exist.");
 					var assemblyIdentityMap = new List<string> ();
-					if (useShortFileNames) {
-						foreach (var s in File.ReadLines (assemblyMap)) {
-							assemblyIdentityMap.Add (s);
-						}
+					foreach (var s in File.ReadLines (assemblyMap)) {
+						assemblyIdentityMap.Add (s);
 					}
-					var assmeblyIdentity = useShortFileNames ? assemblyIdentityMap.IndexOf ("UnnamedProject").ToString () : "UnnamedProject";
-					var libaryImportsFolder = useShortFileNames ? "lp" : "__library_projects__";
-					var jlibs = useShortFileNames ? "jl" : "library_project_imports";
-					var dsStorePath = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, libaryImportsFolder,
-						assmeblyIdentity, jlibs);
+					var assemblyIdentity = assemblyIdentityMap.IndexOf ("UnnamedProject").ToString ();
+					var dsStorePath = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "lp", assemblyIdentity, "jl");
 					Assert.IsTrue (Directory.Exists (dsStorePath), "{0} should exist.", dsStorePath);
 					Assert.IsFalse (File.Exists (Path.Combine (dsStorePath, ".DS_Store")), "{0} should NOT exist.",
 						Path.Combine (dsStorePath, ".DS_Store"));
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -2962,7 +2962,7 @@ public void BuildInDesignTimeMode ([Values(false, true)] bool useManagedParser)
 		}
 
 		[Test]
-		public void CheckLibraryImportsUpgrade ([Values(false, true)] bool useShortFileNames)
+		public void CheckLibraryImportsUpgrade ()
 		{
 			var path = Path.Combine ("temp", TestContext.CurrentContext.Test.Name);
 			var libproj = new XamarinAndroidLibraryProject () {
@@ -2975,7 +2975,6 @@ public void CheckLibraryImportsUpgrade ([Values(false, true)] bool useShortFileN
 			};
 			proj.References.Add (new BuildItem ("ProjectReference", $"..\\Library1\\Library1.csproj"));
 			proj.SetProperty ("_AndroidLibrayProjectIntermediatePath", Path.Combine (proj.IntermediateOutputPath, "__library_projects__"));
-			proj.SetProperty (proj.ActiveConfigurationProperties, "UseShortFileNames", useShortFileNames);
 			using (var libb = CreateDllBuilder (Path.Combine (path, libproj.ProjectName), false, false)) {
 				Assert.IsTrue (libb.Build (libproj), "Build should have succeeded.");
 				using (var builder = CreateApkBuilder (Path.Combine (path, proj.ProjectName), false, false)) {
@@ -2985,13 +2984,8 @@ public void CheckLibraryImportsUpgrade ([Values(false, true)] bool useShortFileN
 						"The __library_projects__ directory should exist.");
 					proj.RemoveProperty ("_AndroidLibrayProjectIntermediatePath");
 					Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
-					if (useShortFileNames) {
-						Assert.IsFalse (Directory.Exists (Path.Combine (Root, path, proj.ProjectName, proj.IntermediateOutputPath, "__library_projects__")),
-							"The __library_projects__ directory should not exist, due to IncrementalClean.");
-					} else {
-						Assert.IsTrue (Directory.Exists (Path.Combine (Root, path, proj.ProjectName, proj.IntermediateOutputPath, "__library_projects__")),
-							"The __library_projects__ directory should exist.");
-					}
+					Assert.IsFalse (Directory.Exists (Path.Combine (Root, path, proj.ProjectName, proj.IntermediateOutputPath, "__library_projects__")),
+						"The __library_projects__ directory should not exist, due to IncrementalClean.");
 					Assert.IsTrue (libb.Clean (libproj), "Clean should have succeeded.");
 					Assert.IsTrue (libb.Build (libproj), "Build should have succeeded.");
 					Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
@@ -3000,15 +2994,10 @@ public void CheckLibraryImportsUpgrade ([Values(false, true)] bool useShortFileN
 					using (var zip = ZipHelper.OpenZip (zipFile)) {
 						Assert.IsTrue (zip.ContainsEntry ("library_project_imports/__res_name_case_map.txt"), $"{zipFile} should contain a library_project_imports/__res_name_case_map.txt entry");
 					}
-					if (!useShortFileNames) {
-						Assert.IsTrue (Directory.Exists (Path.Combine (Root, path, proj.ProjectName, proj.IntermediateOutputPath, "__library_projects__")),
-							"The __library_projects__ directory should exist.");
-					} else {
-						Assert.IsFalse (Directory.Exists (Path.Combine (Root, path, proj.ProjectName, proj.IntermediateOutputPath, "__library_projects__")),
-							"The __library_projects__ directory should not exist.");
-						Assert.IsTrue (Directory.Exists (Path.Combine (Root, path, proj.ProjectName, proj.IntermediateOutputPath, "lp")),
-							"The lp directory should exist.");
-					}
+					Assert.IsFalse (Directory.Exists (Path.Combine (Root, path, proj.ProjectName, proj.IntermediateOutputPath, "__library_projects__")),
+						"The __library_projects__ directory should not exist.");
+					Assert.IsTrue (Directory.Exists (Path.Combine (Root, path, proj.ProjectName, proj.IntermediateOutputPath, "lp")),
+						"The lp directory should exist.");
 
 				}
 			}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
@@ -235,7 +235,7 @@ public TestMe createTestMe () {
 
 		[Test]
 		[Category ("dotnet")]
-		public void ResolveNativeLibrariesInManagedReferences ([Values(true, false)] bool useShortFileNames)
+		public void ResolveNativeLibrariesInManagedReferences ()
 		{
 			var lib = new XamarinAndroidLibraryProject () {
 				ProjectName = "Lib",
@@ -263,7 +263,6 @@ public Class1 ()
 					},
 				},
 			};
-			lib.SetProperty (lib.ActiveConfigurationProperties, "UseShortFileNames", useShortFileNames);
 			var so = lib.OtherBuildItems.First (x => x.Include () == "libs/armeabi-v7a/libfoo.so");
 
 			var lib2 = new XamarinAndroidLibraryProject () {
@@ -295,8 +294,7 @@ public Class2 ()
 					},
 				},
 			};
-			lib2.SetProperty (lib.ActiveConfigurationProperties, "UseShortFileNames", useShortFileNames);
-			var path = Path.Combine (Root, "temp", $"ResolveNativeLibrariesInManagedReferences_{useShortFileNames}");
+			var path = Path.Combine (Root, "temp", TestName);
 			using (var libbuilder = CreateDllBuilder (Path.Combine(path, "Lib"))) {
 
 				Assert.IsTrue (libbuilder.Build (lib), "lib 1st. build failed");
@@ -312,7 +310,6 @@ public Class2 ()
 						}
 					};
 					app.SetAndroidSupportedAbis ("armeabi-v7a");
-					app.SetProperty (app.ActiveConfigurationProperties, "UseShortFileNames", useShortFileNames);
 					using (var builder = CreateApkBuilder (Path.Combine (path, "App"))) {
 						builder.Verbosity = LoggerVerbosity.Diagnostic;
 						Assert.IsTrue (builder.Build (app), "app 1st. build failed");
@@ -330,7 +327,7 @@ public Class2 ()
 						Assert.IsNotNull (libfoo, "libfoo.so should exist in the .apk");
 
 						Assert.AreEqual (so.TextContent ().Length, new FileInfo (Path.Combine (Root, libbuilder.ProjectDirectory, lib.IntermediateOutputPath,
-							useShortFileNames ? "nl" : "native_library_imports", "armeabi-v7a", "libfoo.so")).Length,
+							"nl", "armeabi-v7a", "libfoo.so")).Length,
 							"intermediate size mismatch");
 						libfoo = ZipHelper.ReadFileFromZip (Path.Combine (Root, builder.ProjectDirectory, app.OutputPath, app.PackageName + "-Signed.apk"),
 							"lib/armeabi-v7a/libfoo.so");
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
@@ -45,7 +45,6 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved.
     <MonoAndroidVersion>v5.0</MonoAndroidVersion>
     <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == '' And '$(AndroidUseLatestPlatformSdk)' == 'False'">v5.0</TargetFrameworkVersion>
     <MaxSupportedLangVersion Condition=" '$(MaxSupportedLangVersion)' == '' ">8.0</MaxSupportedLangVersion>
-    <UseShortFileNames Condition="'$(UseShortFileNames)' == ''">True</UseShortFileNames>
     <AndroidClassParser Condition=" '$(AndroidClassParser)' == '' ">jar2xml</AndroidClassParser>
     <AndroidCodegenTarget Condition=" '$(AndroidCodegenTarget)' == '' ">XAJavaInterop1</AndroidCodegenTarget>
     <_AndroidIsBindingProject>True</_AndroidIsBindingProject>
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -223,7 +223,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 
 	<BundleAssemblies Condition="'$(BundleAssemblies)' == ''">False</BundleAssemblies>
 	<DeployExternal Condition="'$(DeployExternal)' == ''">False</DeployExternal>
-	<UseShortFileNames Condition="'$(UseShortFileNames)' == ''">True</UseShortFileNames>
 
 	<!-- Obsolete build property: should be removed in the future releases -->
 	<AndroidMultiDexSupportJar></AndroidMultiDexSupportJar>
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.EmbeddedResource.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.EmbeddedResource.targets
@@ -22,14 +22,11 @@ This file is used by all project types, including binding projects.
   <UsingTask TaskName="Xamarin.Android.Tasks.ResolveLibraryProjectImports"        AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 
   <PropertyGroup>
-    <_LibraryProjectImportsDirectoryName Condition=" '$(_LibraryProjectImportsDirectoryName)' == '' And '$(UseShortFileNames)' == 'true' ">jl</_LibraryProjectImportsDirectoryName>
-    <_LibraryProjectImportsDirectoryName Condition=" '$(_LibraryProjectImportsDirectoryName)' == '' ">library_project_imports</_LibraryProjectImportsDirectoryName>
-    <_NativeLibraryImportsDirectoryName  Condition=" '$(_NativeLibraryImportsDirectoryName)' == '' And '$(UseShortFileNames)' == 'true' ">nl</_NativeLibraryImportsDirectoryName>
-    <_NativeLibraryImportsDirectoryName  Condition=" '$(_NativeLibraryImportsDirectoryName)' == '' ">native_library_imports</_NativeLibraryImportsDirectoryName>
+    <_LibraryProjectImportsDirectoryName Condition=" '$(_LibraryProjectImportsDirectoryName)' == '' ">jl</_LibraryProjectImportsDirectoryName>
+    <_NativeLibraryImportsDirectoryName  Condition=" '$(_NativeLibraryImportsDirectoryName)' == '' ">nl</_NativeLibraryImportsDirectoryName>
     <_AndroidLibraryImportsCache>$(IntermediateOutputPath)libraryimports.cache</_AndroidLibraryImportsCache>
     <_AndroidLibraryProjectImportsCache>$(IntermediateOutputPath)libraryprojectimports.cache</_AndroidLibraryProjectImportsCache>
-    <_AndroidLibrayProjectIntermediatePath Condition=" '$(_AndroidLibrayProjectIntermediatePath)' == '' And '$(UseShortFileNames)' == 'true' ">$(IntermediateOutputPath)lp\</_AndroidLibrayProjectIntermediatePath>
-    <_AndroidLibrayProjectIntermediatePath Condition=" '$(_AndroidLibrayProjectIntermediatePath)' == '' ">$(IntermediateOutputPath)__library_projects__\</_AndroidLibrayProjectIntermediatePath>
+    <_AndroidLibrayProjectIntermediatePath Condition=" '$(_AndroidLibrayProjectIntermediatePath)' == '' ">$(IntermediateOutputPath)lp\</_AndroidLibrayProjectIntermediatePath>
     <_AndroidLibrayProjectAssemblyMapFile>$(_AndroidLibrayProjectIntermediatePath)map.cache</_AndroidLibrayProjectAssemblyMapFile>
   </PropertyGroup>
 
@@ -45,7 +42,6 @@ This file is used by all project types, including binding projects.
         AarLibraries="@(AndroidAarLibrary)"
         ImportsDirectory="$(_LibraryProjectImportsDirectoryName)"
         NativeImportsDirectory="$(_NativeLibraryImportsDirectoryName)"
-        UseShortFileNames="$(UseShortFileNames)"
         OutputDirectory="$(IntermediateOutputPath)"
         AssemblyIdentityMapFile="$(_AndroidLibrayProjectAssemblyMapFile)"
         OutputImportDirectory="$(_AndroidLibrayProjectIntermediatePath)"
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj
@@ -11,7 +11,6 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
     <AssemblyName>Xamarin.Android.BindingResolveImportLib2</AssemblyName>
-    <UseShortFileNames>True</UseShortFileNames>
     <AndroidClassParser>class-parse</AndroidClassParser>
   </PropertyGroup>
   <Import Project="..\..\..\Configuration.props" />
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Xamarin.Android.BindingResolveImportLib3.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib3/Xamarin.Android.BindingResolveImportLib3.csproj
diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Xamarin.Android.BindingResolveImports-Tests.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImports-Tests/Xamarin.Android.BindingResolveImports-Tests.csproj
