From 336ec802edb628bdcd2f44df74652b0af684effc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 11:21:12 -0500 Subject: [PATCH 01/10] Bump to dotnet/installer/release/8.0.1xx@476310d94a 8.0.100-rc.2.23456.6 (#8325) Changes: https://github.com/dotnet/installer/compare/d511823dcc...476310d94a Updates: Microsoft.Dotnet.Sdk.Internal: from 8.0.100-rc.2.23454.1 to 8.0.100-rc.2.23456.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57d5f7cb3bd..90e5d5d8e00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - d511823dcc3ac2a03333d9572625605d2a9929ab + 476310d94a3f821f8413a213472224729bfd43a8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a082c20d25f..c0245d15f41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rc.2.23454.1 + 8.0.100-rc.2.23456.6 8.0.0-rc.2.23431.9 8.0.0-rc.2.23431.9 7.0.0-beta.22103.1 From 903de8a0c5bdd4fa2f590c5cc208bea17d08092b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 10:07:30 -0500 Subject: [PATCH 02/10] Bump to dotnet/installer/release/8.0.1xx@a6b9030047 8.0.100-rc.2.23462.1 (#8327) Changes: https://github.com/dotnet/installer/compare/476310d94a...a6b9030047 Updates: Microsoft.Dotnet.Sdk.Internal: from 8.0.100-rc.2.23456.6 to 8.0.100-rc.2.23462.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90e5d5d8e00..ab6a7e35f0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 476310d94a3f821f8413a213472224729bfd43a8 + a6b903004774fb1b4e638f47c602fc968b43a8c0 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c0245d15f41..f647ec6e128 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rc.2.23456.6 + 8.0.100-rc.2.23462.1 8.0.0-rc.2.23431.9 8.0.0-rc.2.23431.9 7.0.0-beta.22103.1 From 40c609d7ef858facd30693884e953d6d018b5723 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 15 Sep 2023 20:20:16 +0100 Subject: [PATCH 03/10] [Xamarin.Android.Build.Tasks] Improve aapt2 error messages for paths (#7710) Context: https://developercommunity.visualstudio.com/t/MAUI-project-with-non-ASCII-project-name/10247509 Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1714603 Context: https://issuetracker.google.com/issues/188679588 There is a known issue with `aapt2`, `@(AndroidAsset)`, and project paths or names containing non-ASCII characters: `aapt2` has a bug where it cannot correctly traverse a directory which contains non-ASCII characters. We currently have no way to work around this issue. Improve the error messages generated by the `` task to more explicitly mention non-ASCII characters and Windows max path limits: error APT2264: This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. error APT2265: This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details. Add some unit tests to cover this scenario. --- Documentation/guides/messages/README.md | 1 + Documentation/guides/messages/apt2264.md | 15 ++-- Documentation/guides/messages/apt2265.md | 29 +++++++ .../Properties/Resources.Designer.cs | 9 ++ .../Properties/Resources.resx | 6 +- .../Tasks/Aapt2.cs | 86 +++++++++++++++---- .../Xamarin.Android.Build.Tests/AotTests.cs | 32 +++++++ .../Utilities/DeviceTest.cs | 10 ++- .../Tests/InstallAndRunTests.cs | 7 +- 9 files changed, 163 insertions(+), 32 deletions(-) create mode 100644 Documentation/guides/messages/apt2265.md diff --git a/Documentation/guides/messages/README.md b/Documentation/guides/messages/README.md index 6a4feb91b2e..ca0a392aa25 100644 --- a/Documentation/guides/messages/README.md +++ b/Documentation/guides/messages/README.md @@ -31,6 +31,7 @@ ms.date: 01/24/2020 + APT0003: Invalid file name: It must contain only \[^a-zA-Z0-9_.\]+. + APT0004: Invalid file name: It must start with either A-Z or a-z or an underscore. + [APT2264](apt2264.md): The system cannot find the file specified. (2). ++ [APT2265](apt2265.md): The system cannot find the file specified. (2). ## JAVAxxxx: Java Tool diff --git a/Documentation/guides/messages/apt2264.md b/Documentation/guides/messages/apt2264.md index d058a29a74f..2ed5678f511 100644 --- a/Documentation/guides/messages/apt2264.md +++ b/Documentation/guides/messages/apt2264.md @@ -14,22 +14,21 @@ length allowed on windows. ## Solution The best way to avoid this is to ensure that your project is not located -deep in the folder structure. For example if you create all of your -projects in folders such as +deep in the folder structure. +For example if you create all of your projects in folders such as -`C:\Users\shelly\Visual Studio\Android\MyProjects\Com.SomeReallyLongCompanyName.MyBrillantApplication\MyBrilliantApplicaiton.Android\` +`C:\Users\shelly\Visual Studio 2022\Android\MyProjects\Com.SomeReallyLongCompanyName.MyBrillantApplication\MyBrilliantApplicaiton.Android\` you may well encounter problems with not only `aapt2` but also Ahead of Time -compilation. Keeping your project names and folder structures short and -concise will help work around these issues. For example instead of the above -you could use +compilation. Keeping your project names and folder structures short, concise +will help work around these issues. For example instead of the above you could use `C:\Work\Android\MyBrilliantApp` Which is much shorter and much less likely to encounter path issues. -However this is no always possible. Sometimes a project or a environment requires -deep folder structures. In this case enabling long path support in Windows *might* +However this is not always possible. Sometimes a project or a environment requires +deep folder structures. Enabling long path support in Windows *might* be enough to get your project working. Details on how to do this can be found [here](https://learn.microsoft.com/windows/win32/fileio/maximum-file-path-limitation?tabs=registry#enable-long-paths-in-windows-10-version-1607-and-later). diff --git a/Documentation/guides/messages/apt2265.md b/Documentation/guides/messages/apt2265.md new file mode 100644 index 00000000000..1a404d40a09 --- /dev/null +++ b/Documentation/guides/messages/apt2265.md @@ -0,0 +1,29 @@ +--- +title: Xamarin.Android error APT2265 +description: APT2265 error code +ms.date: 12/16/2022 +--- +# Xamarin.Android error APT2265 + +## Issue + +The tool `aapt2` is unable to resolve one of the files it was passed. +This is generally caused by non-ASCII characters in the project name +or the path to the project. + +## Solution + +The best way to avoid this is to ensure that your project does not contain +non-ASCII characters. +For example if you create all of your projects in folders such as + +`C:\Users\shëlly\Visual Studio 2022\Android\MyProjects\Com.SomeReallyLongCompanyName.MyBrillantApplication\MyBrilliantApplicaiton.Android\` + +you may well encounter problems with not only `aapt2` but also Ahead of Time +compilation. Keeping your project names and folder structures short, concise and +ASCII will help work around these issues. For example instead of the above +you could use + +`C:\Work\Android\MyBrilliantApp` + +Which is much shorter, contains no non-ASCII characters and much less likely to encounter issues. diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs index 7fe1bf1c1ae..4f8e7e69711 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs @@ -818,6 +818,15 @@ public static string APT2264 { } } + /// + /// Looks up a localized string similar to This could be caused by the project having non-ASCII characters in it path. + /// + public static string APT2265 { + get { + return ResourceManager.GetString("APT2265", resourceCulture); + } + } + /// /// Looks up a localized string similar to Could not AOT the assembly: {0}. /// diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx index dfb964b4851..c591e39618f 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx @@ -542,7 +542,11 @@ Either change the value in the AndroidManifest.xml to match the $(SupportedOSPla {0} - The assembly name - This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. + This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. + The following are literal names and should not be translated: + + + This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs index e411b66e61e..1c51cb5980e 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs @@ -22,6 +22,8 @@ namespace Xamarin.Android.Tasks { public abstract class Aapt2 : AndroidAsyncTask { + private const int MAX_PATH = 260; + private const int ASCII_MAX_CHAR = 127; private static readonly int DefaultMaxAapt2Daemons = 6; protected Dictionary _resource_name_case_map; @@ -117,9 +119,10 @@ protected bool LogAapt2EventsFromOutput (string singleLine, MessageImportance me return true; var match = AndroidRunToolTask.AndroidErrorRegex.Match (singleLine.Trim ()); + string file = string.Empty; if (match.Success) { - var file = match.Groups ["file"].Value; + file = match.Groups ["file"].Value; int line = 0; if (!string.IsNullOrEmpty (match.Groups ["line"]?.Value)) line = int.Parse (match.Groups ["line"].Value.Trim ()) + 1; @@ -138,22 +141,8 @@ protected bool LogAapt2EventsFromOutput (string singleLine, MessageImportance me LogCodedError ("APT0001", Properties.Resources.APT0001, message.Substring ("unknown option '".Length).TrimEnd ('.', '\'')); return false; } - if (message.Contains ("in APK") && message.Contains ("is compressed.")) { - LogMessage (singleLine, messageImportance); + if (LogNotesOrWarnings (message, singleLine, messageImportance)) return true; - } - if (message.Contains ("fakeLogOpen")) { - LogMessage (singleLine, messageImportance); - return true; - } - if (message.Contains ("note:")) { - LogMessage (singleLine, messageImportance); - return true; - } - if (message.Contains ("warn:")) { - LogCodedWarning (GetErrorCode (singleLine), singleLine); - return true; - } if (level.Contains ("note")) { LogMessage (message, messageImportance); return true; @@ -188,7 +177,7 @@ protected bool LogAapt2EventsFromOutput (string singleLine, MessageImportance me message = message.Substring ("error: ".Length); if (level.Contains ("error") || (line != 0 && !string.IsNullOrEmpty (file))) { - var errorCode = GetErrorCode (message); + var errorCode = GetErrorCodeForFile (message, file); if (manifestError) LogCodedError (errorCode, string.Format (Xamarin.Android.Tasks.Properties.Resources.AAPTManifestError, message.TrimEnd('.')), AndroidManifestFile.ItemSpec, 0); else @@ -199,7 +188,9 @@ protected bool LogAapt2EventsFromOutput (string singleLine, MessageImportance me if (!apptResult) { var message = string.Format ("{0} \"{1}\".", singleLine.Trim (), singleLine.Substring (singleLine.LastIndexOfAny (new char [] { '\\', '/' }) + 1)); - var errorCode = GetErrorCode (message); + if (LogNotesOrWarnings (message, singleLine, messageImportance)) + return true; + var errorCode = GetErrorCodeForFile (message, file); LogCodedError (errorCode, AddAdditionalErrorText (errorCode, message), ToolName); } else { LogCodedWarning (GetErrorCode (singleLine), singleLine); @@ -207,6 +198,46 @@ protected bool LogAapt2EventsFromOutput (string singleLine, MessageImportance me return true; } + bool LogNotesOrWarnings (string message, string singleLine, MessageImportance messageImportance) + { + if (message.Contains ("in APK") && message.Contains ("is compressed.")) { + LogMessage (singleLine, messageImportance); + return true; + } + else if (message.Contains ("fakeLogOpen")) { + LogMessage (singleLine, messageImportance); + return true; + } + else if (message.Contains ("note:")) { + LogMessage (singleLine, messageImportance); + return true; + } + else if (message.Contains ("warn:")) { + LogCodedWarning (GetErrorCode (singleLine), singleLine); + return true; + } + return false; + } + + static bool IsFilePathToLong (string filePath) + { + if (OS.IsWindows && filePath.Length > MAX_PATH) { + return true; + } + return false; + } + + static bool IsPathOnlyASCII (string filePath) + { + if (!OS.IsWindows) + return true; + + foreach (var c in filePath) + if (c > ASCII_MAX_CHAR) // cannot use Char.IsAscii cos we are .netstandard2.0 + return false; + return true; + } + static string AddAdditionalErrorText (string errorCode, string message) { var sb = new StringBuilder (); @@ -216,10 +247,26 @@ static string AddAdditionalErrorText (string errorCode, string message) case "APT2264": sb.AppendLine (Xamarin.Android.Tasks.Properties.Resources.APT2264); break; + case "APT2265": + sb.AppendLine (Xamarin.Android.Tasks.Properties.Resources.APT2265); + break; } return sb.ToString (); } + static string GetErrorCodeForFile (string message, string filePath) + { + var errorCode = GetErrorCode (message); + switch (errorCode) + { + case "APT2265": + if (IsPathOnlyASCII (filePath) && IsFilePathToLong (filePath)) + errorCode = "APT2264"; + break; + } + return errorCode; + } + static string GetErrorCode (string message) { foreach (var tuple in error_codes) @@ -493,7 +540,8 @@ static string GetErrorCode (string message) Tuple.Create ("APT2261", "file failed to compile"), Tuple.Create ("APT2262", "unexpected element found in "), Tuple.Create ("APT2263", "found in "), // unexpected element found in - Tuple.Create ("APT2264", "The system cannot find the file specified. (2)") // Windows Long Path error from aapt2 + Tuple.Create ("APT2264", "The system cannot find the file specified. (2)"), // Windows Long Path error from aapt2 + Tuple.Create ("APT2265", "The system cannot find the file specified. (2)") // Windows non-ASCII characters error from aapt2 }; } } diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs index 20d2a2282f5..c207d49e7e8 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs @@ -112,6 +112,38 @@ public void BuildBasicApplicationReleaseProfiledAotWithoutDefaultProfile () StringAssertEx.DoesNotContainRegex (@$"Using profile data file.*{filename}\.aotprofile", b.LastBuildOutput, "Should not use default AOT profile", RegexOptions.IgnoreCase); } + [Test] + [TestCase ("テスト", false, false, true)] + [TestCase ("テスト", true, true, false)] + [TestCase ("テスト", true, false, true)] + [TestCase ("随机生成器", false, false, true)] + [TestCase ("随机生成器", true, true, false)] + [TestCase ("随机生成器", true, false, true)] + [TestCase ("中国", false, false, true)] + [TestCase ("中国", true, true, false)] + [TestCase ("中国", true, false, true)] + public void BuildAotApplicationWithSpecialCharactersInProject (string testName, bool isRelease, bool aot, bool expectedResult) + { + if (!IsWindows) + expectedResult = true; + var rootPath = Path.Combine (Root, "temp", TestName); + var proj = new XamarinAndroidApplicationProject () { + ProjectName = testName, + IsRelease = isRelease, + AotAssemblies = aot, + }; + proj.SetAndroidSupportedAbis ("armeabi-v7a", "arm64-v8a", "x86", "x86_64"); + using (var builder = CreateApkBuilder (Path.Combine (rootPath, proj.ProjectName))){ + builder.ThrowOnBuildFailure = false; + Assert.AreEqual (expectedResult, builder.Build (proj), "Build should have succeeded."); + if (!expectedResult) { + var aotFailed = builder.LastBuildOutput.ContainsText ("Precompiling failed"); + var aapt2Failed = builder.LastBuildOutput.ContainsText ("APT2265"); + Assert.IsTrue (aotFailed || aapt2Failed, "Error APT2265 or an AOT error should have been raised."); + } + } + } + static object [] AotChecks () => new object [] { new object[] { /* supportedAbis */ "arm64-v8a", diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs index 0184ef1d425..825e77f6735 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs @@ -26,6 +26,11 @@ public class DeviceTest: BaseTest protected static bool IsDeviceAttached (bool refreshCachedValue = false) { if (string.IsNullOrEmpty (_shellEchoOutput) || refreshCachedValue) { + // run this twice as sometimes the first time returns the + // device as "offline". + RunAdbCommand ("devices"); + var devices = RunAdbCommand ("devices"); + TestContext.Out.WriteLine ($"LOG adb devices: {devices}"); _shellEchoOutput = RunAdbCommand ("shell echo OK", timeout: 15); } return _shellEchoOutput.Contains ("OK"); @@ -58,11 +63,14 @@ public void DeviceSetup () DeviceAbi = RunAdbCommand ("shell getprop ro.product.cpu.abilist64").Trim (); if (string.IsNullOrEmpty (DeviceAbi)) - DeviceAbi = RunAdbCommand ("shell getprop ro.product.cpu.abi") ?? RunAdbCommand ("shell getprop ro.product.cpu.abi2"); + DeviceAbi = (RunAdbCommand ("shell getprop ro.product.cpu.abi") ?? RunAdbCommand ("shell getprop ro.product.cpu.abi2")) ?? "x86_64"; if (DeviceAbi.Contains (",")) { DeviceAbi = DeviceAbi.Split (',')[0]; } + } else { + TestContext.Out.WriteLine ($"LOG GetSdkVersion: {DeviceSdkVersion}"); + DeviceAbi = "x86_64"; } } catch (Exception ex) { Console.Error.WriteLine ("Failed to determine whether there is Android target emulator or not: " + ex); diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs index 1672b36b7cb..a6e903cc6dd 100644 --- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs @@ -167,10 +167,11 @@ void Reset () [Test] [Category ("UsesDevice")] - public void SmokeTestBuildAndRunWithSpecialCharacters () + [TestCase ("テスト")] + [TestCase ("随机生成器")] + [TestCase ("中国")] + public void SmokeTestBuildAndRunWithSpecialCharacters (string testName) { - var testName = "テスト"; - var rootPath = Path.Combine (Root, "temp", TestName); var proj = new XamarinFormsAndroidApplicationProject () { ProjectName = testName, From e16c0a4ae76210a142fd4fd4ad8016db97259a10 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Fri, 15 Sep 2023 17:34:44 -0400 Subject: [PATCH 04/10] [ci] Run more MSBuild tests on Linux (#8335) Updates the Linux test job to include everything relevant from BuildTest, PackagingTest, XASdkTests, and AndroidDependenciesTests. --- build-tools/automation/azure-pipelines.yaml | 29 ++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 504a82311af..8d9db7ce126 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -277,10 +277,31 @@ stages: - template: yaml-templates/run-nunit-tests.yaml parameters: - testRunTitle: Xamarin.Android.Build.Tests - Linux .NET 6 Smoke Tests + testRunTitle: Xamarin.Android.Build.Tests - Linux BuildTest testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll - dotNetTestExtraArgs: --filter "TestCategory = SmokeTests" - testResultsFile: TestResult-NETSmokeMSBuildTests-Linux-$(XA.Build.Configuration).xml + dotNetTestExtraArgs: --filter "Name = BuildTest" + testResultsFile: TestResult-BuildTest-Linux-$(XA.Build.Configuration).xml + + - template: yaml-templates/run-nunit-tests.yaml + parameters: + testRunTitle: Xamarin.Android.Build.Tests - Linux PackagingTest + testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll + dotNetTestExtraArgs: --filter "Name = PackagingTest" + testResultsFile: TestResult-PackagingTest-Linux-$(XA.Build.Configuration).xml + + - template: yaml-templates/run-nunit-tests.yaml + parameters: + testRunTitle: Xamarin.Android.Build.Tests - Linux XASdkTests + testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll + dotNetTestExtraArgs: --filter "Name = XASdkTests & Name != XamarinLegacySdk" + testResultsFile: TestResult-XASdkTests-Linux-$(XA.Build.Configuration).xml + + - template: yaml-templates/run-nunit-tests.yaml + parameters: + testRunTitle: Xamarin.Android.Build.Tests - Linux AndroidDependenciesTests + testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll + dotNetTestExtraArgs: --filter "Name = AndroidDependenciesTests" + testResultsFile: TestResult-AndroidDependenciesTests-Linux-$(XA.Build.Configuration).xml - task: ShellScript@2 displayName: Test dotnet-local.sh @@ -291,7 +312,7 @@ stages: - template: yaml-templates/upload-results.yaml parameters: configuration: $(XA.Build.Configuration) - artifactName: Test Results - MSBuild Smoke - Linux + artifactName: Test Results - MSBuild - Linux - template: yaml-templates/fail-on-issue.yaml From 7dfb0276ca34f84131eecf6fac2008f6c26c319b Mon Sep 17 00:00:00 2001 From: "CSIGS@microsoft.com" Date: Sun, 17 Sep 2023 03:35:39 -0700 Subject: [PATCH 05/10] LEGO: Merge pull request 8343 LEGO: Merge pull request 8343 --- .../Properties/Resources.resx.lcl | 14 +++++++++++++- .../Properties/Resources.resx.lcl | 16 ++++++++++++++-- .../Properties/Resources.resx.lcl | 16 ++++++++++++++-- .../Properties/Resources.resx.lcl | 14 +++++++++++++- .../Properties/Resources.resx.lcl | 16 ++++++++++++++-- .../Properties/Resources.resx.lcl | 16 ++++++++++++++-- .../Properties/Resources.resx.lcl | 16 ++++++++++++++-- .../Properties/Resources.resx.lcl | 14 +++++++++++++- .../Properties/Resources.resx.lcl | 14 +++++++++++++- .../Properties/Resources.resx.lcl | 14 +++++++++++++- 10 files changed, 135 insertions(+), 15 deletions(-) diff --git a/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 4e15ea1025b..f94907d61fa 100644 --- a/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,10 +56,22 @@ - + + + + + + + + + + + + + diff --git a/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 25b9669fca9..e63f00d1a22 100644 --- a/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,9 +56,21 @@ - + - + + + + + + + + + + + + + diff --git a/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index b91649117c1..0f09feaab4f 100644 --- a/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,9 +56,21 @@ - + - + + + + + + + + + + + + + diff --git a/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index bd2daf6dfc7..d989e0217f8 100644 --- a/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,10 +56,22 @@ - + + + + + + + + + + + + + diff --git a/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 988babd94d2..be85483ab31 100644 --- a/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,9 +56,21 @@ - + - + + + + + + + + + + + + + diff --git a/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 0eebfa6f2cd..54e9045ba51 100644 --- a/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,9 +56,21 @@ - + - + + + + + + + + + + + + + diff --git a/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 5c85d93d06b..489c35d80b0 100644 --- a/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,9 +56,21 @@ - + - + + + + + + + + + + + + + diff --git a/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index f6ffe829775..e4a3aeaf274 100644 --- a/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,10 +56,22 @@ - + + + + + + + + + + + + + diff --git a/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 984c7b3fe48..89b965f9e8e 100644 --- a/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,10 +56,22 @@ - + + + + + + + + + + + + + diff --git a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index fdd49331251..3c34695d749 100644 --- a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,10 +56,22 @@ - + + + + + + + + + + + + + From cb2d6f4d3979d4f57cabdaa555d8850cbf597362 Mon Sep 17 00:00:00 2001 From: "CSIGS@microsoft.com" Date: Mon, 18 Sep 2023 03:36:18 -0700 Subject: [PATCH 06/10] LEGO: Merge pull request 8344 LEGO: Merge pull request 8344 --- .../Properties/Resources.resx.lcl | 16 ++++++++++++++-- .../Properties/Resources.resx.lcl | 14 +++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 3d6b7d979e0..078081cfbbc 100644 --- a/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,9 +56,21 @@ - + - + + + + + + + + + + + + + diff --git a/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 493b24628eb..6ec4c9ac8eb 100644 --- a/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -56,10 +56,22 @@ - + + + + + + + + + + + + + From d71f5591bbf88be0417cb938da00ad446db42a4f Mon Sep 17 00:00:00 2001 From: VS MobileTools Engineering Service 2 Date: Mon, 18 Sep 2023 06:54:48 -0700 Subject: [PATCH 07/10] Localized file check-in by OneLocBuild Task (#8341) Context: https://aka.ms/onelocbuild Context: https://aka.ms/AllAboutLoc * Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 8405582 * Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 8408554 --- .../Properties/Resources.cs.resx | 4 ++++ .../Properties/Resources.de.resx | 6 +++++- .../Properties/Resources.es.resx | 6 +++++- .../Properties/Resources.fr.resx | 6 +++++- .../Properties/Resources.it.resx | 6 +++++- .../Properties/Resources.ja.resx | 6 +++++- .../Properties/Resources.ko.resx | 4 ++++ .../Properties/Resources.pl.resx | 6 +++++- .../Properties/Resources.pt-BR.resx | 6 +++++- .../Properties/Resources.ru.resx | 6 +++++- .../Properties/Resources.tr.resx | 4 ++++ .../Properties/Resources.zh-Hans.resx | 4 ++++ .../Properties/Resources.zh-Hant.resx | 4 ++++ 13 files changed, 60 insertions(+), 8 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx index f9d9234f648..b3ac4ef0c9a 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx @@ -545,6 +545,10 @@ Buď změňte hodnotu v souboru AndroidManifest.xml tak, aby odpovídala hodnot To je pravděpodobně způsobeno tím, že projekt překračuje omezení maximální délky cesty systému Windows. Podrobnosti najdete v https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. The following are literal names and should not be translated: + + Příčinou může být to, že projekt má v názvu souboru nebo cestě jiné znaky než ASCII. Podrobnosti najdete v https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265. + The following are literal names and should not be translated: + Sestavení se nepovedlo zkompilovat AOT: {0} The abbreviation "AOT" should not be translated. diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx index 79a5ab7901d..434a5033c83 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx @@ -542,7 +542,11 @@ Bitte ändern Sie den Wert in einen Assembly-basierten Typnamen, der von „{1} {0} - The assembly name - Dies ist wahrscheinlich darauf zurückzuführen, dass das Projekt die Beschränkung der maximalen Pfadlänge von Windows überschreitet. Weitere Informationen finden Sie unter https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. + The following are literal names and should not be translated: + + + This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx index d64c8a30f68..3cc5f1a9280 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx @@ -542,7 +542,11 @@ Cambie el valor de AndroidManifest.xml para que coincida con el valor $(Supporte {0} - The assembly name - Esto probablemente se debe a que el proyecto supera la limitación de longitud máxima de la ruta de acceso de Windows. Consulte https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obtener más información. + This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. + The following are literal names and should not be translated: + + + This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx index e07f0601f63..409fdaf0f32 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx @@ -542,7 +542,11 @@ Modifiez la valeur dans AndroidManifest.xml pour qu’elle corresponde à la val {0} - The assembly name - Cela est probablement dû au fait que le projet dépasse la limite de longueur maximale du chemin d’accès Windows. Pour plus d’informations, consultez https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + Cela peut être dû au fait que le projet dépasse la limite de longueur maximale du chemin d’accès Windows. Pour plus d’informations, consultez https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + The following are literal names and should not be translated: + + + Cela peut être dû au fait que le projet contient des caractères non-ASCII dans son nom de fichier ou son chemin d’accès. Pour plus d’informations, consultez https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx index 7dc4fa54346..220cd4b4170 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx @@ -542,7 +542,11 @@ Modificare il valore in AndroidManifest.xml in modo che corrisponda al valore $( {0} - The assembly name - È possibile che il progetto abbia superato la limitazione della lunghezza massima del percorso di Windows. Per i dettagli, vedere https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + Il progetto potrebbe aver superato la limitazione della lunghezza massima del percorso di Windows. Per i dettagli, vedere https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + The following are literal names and should not be translated: + + + Il progetto potrebbe contenere caratteri non ASCII nel nome file o nel percorso. Per i dettagli, vedere https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx index 6f7e030a3bf..9c433918503 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx @@ -543,7 +543,11 @@ $(SupportedOSPlatformVersion) 値に一致するように AndroidManifest.xml {0} - The assembly name - これは、プロジェクトが Windows のパスの最大の長さの制限を超えたことが原因の可能性があります。詳細については、https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 を参照してください。 + This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. + The following are literal names and should not be translated: + + + This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx index 8b05cbeaa2e..1d586b78bb8 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx @@ -545,6 +545,10 @@ AndroidManifest.xml의 값을 $(SupportedOSPlatformVersion) 값에 맞도록 변 프로젝트가 Windows 최대 경로 길이 제한을 초과하여 이러한 상황이 발생했을 수 있습니다. 자세한 내용은 https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264를 참조하세요. The following are literal names and should not be translated: + + 프로젝트의 파일 이름 또는 경로에 ASCII가 아닌 문자가 있기 때문에 이러한 문제가 발생할 수 있습니다. 자세한 내용은 https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265를 참조하세요. + The following are literal names and should not be translated: + 어셈블리를 AOT할 수 없음: {0} The abbreviation "AOT" should not be translated. diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx index b9022b4efef..31bcbfa681d 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx @@ -542,7 +542,11 @@ Zmień wartość w pliku AndroidManifest.xml, aby odpowiadała wartości $(Suppo {0} - The assembly name - Jest to prawdopodobnie spowodowane przez projekt przekraczający ograniczenie maksymalnej długości ścieżki systemu Windows. Aby uzyskać szczegółowe informacje, zobacz https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + Przyczyną może być przekroczenie limitu maksymalnej długości ścieżki systemu Windows przez projekt. Aby uzyskać szczegółowe informacje, zobacz https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + The following are literal names and should not be translated: + + + Może to być spowodowane tym, że projekt zawiera znaki inne niż ASCII w nazwie pliku lub ścieżce. Aby uzyskać szczegółowe informacje, zobacz https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx index 1d8ee7ad7e6..1dd5676c7f7 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx @@ -542,7 +542,11 @@ Altere o valor no AndroidManifest.xml para corresponder ao valor $(SupportedOSPl {0} - The assembly name - Isso provavelmente ocorreu porque o projeto excedeu a limitação de comprimento máximo do caminho do Windows. Consulte https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obter detalhes. + Isso pode ser causado pelo fato de o projeto ter excedido o limite máximo de comprimento do caminho do Windows. Veja https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obter detalhes. + The following are literal names and should not be translated: + + + Isso pode ser causado pelo projeto ter caracteres não-ASCII em seu nome de arquivo ou caminho. Veja https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 para obter detalhes. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx index 3f07654d2c5..9092c451346 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx @@ -542,7 +542,11 @@ In this message, the term "binding" means a piece of generated code that makes i {0} - The assembly name - Возможно, для этого проекта превышена максимальная длина пути в Windows. См. https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + Возможно, для этого проекта превышена максимальная длина пути в Windows. Подробности: https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. + The following are literal names and should not be translated: + + + Возможно, проект содержит в имени файла или пути символы, отличные от ASCII. Подробности: https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx index af0fb20ced1..d194aea0bc5 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx @@ -545,6 +545,10 @@ AndroidManifest.xml dosyasındaki değeri $(SupportedOSPlatformVersion) değeriy Bunun nedeni, projenin Windows yol uzunluğu üst sınırını aşması olabilir. Ayrıntılar için bkz. https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264. The following are literal names and should not be translated: + + Bunun nedeni projenin dosya adında veya yolunda ASCII olmayan karakterler olması olabilir. Ayrıntılar için bkz. https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265. + The following are literal names and should not be translated: + Bütünleştirilmiş koda AOT uygulanamadı: {0} The abbreviation "AOT" should not be translated. diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx index 3430d43522b..b02794b3f15 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx @@ -545,6 +545,10 @@ In this message, the term "binding" means a piece of generated code that makes i 这可能是由超出 Windows 最大路径长度限制的项目引起的。有关详细信息，请参阅 https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264。 The following are literal names and should not be translated: + + 这可能是由于项目的文件名或路径中包含非 ASCII 字符。有关详细信息，请参阅 https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265。 + The following are literal names and should not be translated: + 无法 AOT 程序集: {0} The abbreviation "AOT" should not be translated. diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx index ad3660a905a..a5f5014da91 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx @@ -545,6 +545,10 @@ In this message, the term "binding" means a piece of generated code that makes i 這可能是因為專案超過 Windows 最大路徑長度限制所造成。如需詳細資料，請參閱https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264。 The following are literal names and should not be translated: + + 這可能是因為專案的檔案名或路徑中包含非 ASCII 字元。如需詳細資料，請參閱 https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265。 + The following are literal names and should not be translated: + 無法對組件進行 AOT 編譯: {0} The abbreviation "AOT" should not be translated. From 795cc57bfd2f6fcde15b20533a1aac4fd938a609 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:19:50 -0500 Subject: [PATCH 08/10] Bump to dotnet/installer/release/8.0.1xx@e1fd7d9649 8.0.100-rc.2.23468.1 (#8330) Changes: https://github.com/dotnet/installer/compare/a6b9030047...e1fd7d9649 Changes: https://github.com/dotnet/runtime/compare/3c48925a6c...287c10d253 Changes: https://github.com/dotnet/emsdk/compare/66dbaefff0...1999c8c8ab Changes: https://github.com/dotnet/cecil/compare/fa5acbd2cc...a112f15aa0 Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-rc.2.23462.1 to 8.0.100-rc.2.23468.1 * Microsoft.NETCore.App.Ref: from 8.0.0-rc.2.23431.9 to 8.0.0-rc.2.23466.4 * Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rc.1.23415.5 to 8.0.0-rc.2.23463.1 * Microsoft.NET.ILLink.Tasks: from 8.0.0-rc.2.23431.9 to 8.0.0-rc.2.23466.4 * Microsoft.DotNet.Cecil: from 0.11.4-alpha.23428.2 to 0.11.4-alpha.23461.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab6a7e35f0e..fb02dc87077 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - a6b903004774fb1b4e638f47c602fc968b43a8c0 + e1fd7d964980ed478fa30457cf750e81105caee1 - + https://github.com/dotnet/runtime - 3c48925a6c1ab31865b4438a6cb88242d1a8fe4d + 287c10d2539d47268a1083c4d533cf84124900cf - + https://github.com/dotnet/runtime - 3c48925a6c1ab31865b4438a6cb88242d1a8fe4d + 287c10d2539d47268a1083c4d533cf84124900cf - + https://github.com/dotnet/emsdk - 66dbaefff04250dc72849f0172e0c53bcfb3ab38 + 1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc - + https://github.com/dotnet/cecil - fa5acbd2ccba88c9d46ce0dd8f5310f9d3c5c46d + a112f15aa032c029b7d9c77df3427111d93cf407 diff --git a/eng/Versions.props b/eng/Versions.props index f647ec6e128..5099b035dd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 8.0.100-rc.2.23462.1 - 8.0.0-rc.2.23431.9 - 8.0.0-rc.2.23431.9 + 8.0.100-rc.2.23468.1 + 8.0.0-rc.2.23466.4 + 8.0.0-rc.2.23466.4 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-rc.1.23415.5 + 8.0.0-rc.2.23463.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.23428.2 + 0.11.4-alpha.23461.1 $(MicrosoftNETCoreAppRefPackageVersion) From 554eb9e6dd9944c68707fbe216aa91f2df14fc8a Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 18 Sep 2023 13:09:32 -0400 Subject: [PATCH 09/10] [ci] Install signing plugin after building (#8346) A few of the projects in our submodules are configured to sign output files after build: https://github.com/xamarin/xamarin-android-tools/blob/fa3711b7ddac7cea6850a9c1c67beda1996aafc0/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj#L36 https://github.com/xamarin/androidtools/blob/720fd4e7cc2f018c681843210edfc796c97c1dde/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj#L21 We should skip these sign requests during our build as we perform post build signing for all of our shipping artifacts. --- .../automation/yaml-templates/build-macos.yaml | 8 -------- .../automation/yaml-templates/commercial-build.yaml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/build-tools/automation/yaml-templates/build-macos.yaml b/build-tools/automation/yaml-templates/build-macos.yaml index 919fa4d419e..d0ecd1dc33c 100644 --- a/build-tools/automation/yaml-templates/build-macos.yaml +++ b/build-tools/automation/yaml-templates/build-macos.yaml @@ -45,10 +45,6 @@ stages: path: ${{ parameters.checkoutPath }} persistCredentials: ${{ parameters.checkoutPersistCredentials }} - - template: install-microbuild-tooling.yaml - parameters: - condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real')) - - template: commercial-build.yaml parameters: installerArtifactName: ${{ parameters.installerArtifactName }} @@ -56,10 +52,6 @@ stages: provisionatorChannel: ${{ parameters.provisionatorChannel }} testAssembliesArtifactName: ${{ parameters.testAssembliesArtifactName }} - - template: remove-microbuild-tooling.yaml - parameters: - condition: and(succeededOrFailed(), eq(variables['MicroBuildSignType'], 'Real')) - - powershell: | [IO.Directory]::CreateDirectory("$(Build.StagingDirectory)/empty") [IO.Directory]::CreateDirectory("$(Build.StagingDirectory)/sbom-components") diff --git a/build-tools/automation/yaml-templates/commercial-build.yaml b/build-tools/automation/yaml-templates/commercial-build.yaml index a08ff123743..8ab2c3a041d 100644 --- a/build-tools/automation/yaml-templates/commercial-build.yaml +++ b/build-tools/automation/yaml-templates/commercial-build.yaml @@ -77,9 +77,14 @@ steps: displayName: CodeQL 3000 Finalize condition: and(succeededOrFailed(), eq(variables['Codeql.Enabled'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) +- template: install-microbuild-tooling.yaml + parameters: + condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real')) + # Restore needs to be executed first or MicroBuild targets won't be imported in time - task: MSBuild@1 displayName: msbuild /t:Restore sign-content.proj + condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real')) inputs: solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj configuration: $(XA.Build.Configuration) @@ -87,6 +92,7 @@ steps: - task: MSBuild@1 displayName: PKG signing - add entitlements and sign + condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real')) inputs: solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj configuration: $(XA.Build.Configuration) @@ -98,6 +104,7 @@ steps: - task: MSBuild@1 displayName: PKG signing - sign binutils libraries + condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real')) inputs: solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj configuration: $(XA.Build.Configuration) @@ -109,6 +116,7 @@ steps: - task: MSBuild@1 displayName: PKG signing - sign binutils executables + condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real')) inputs: solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj configuration: $(XA.Build.Configuration) @@ -118,6 +126,10 @@ steps: /p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-ex.binlog +- template: remove-microbuild-tooling.yaml + parameters: + condition: and(succeededOrFailed(), eq(variables['MicroBuildSignType'], 'Real')) + - script: make create-installers CONFIGURATION=$(XA.Build.Configuration) MSBUILD_ARGS='${{ parameters.makeMSBuildArgs }}' workingDirectory: ${{ parameters.xaSourcePath }} displayName: make create-installers From c4208a90a6a6796ba12bad76d97aeb2f833a20bc Mon Sep 17 00:00:00 2001 From: VS MobileTools Engineering Service 2 Date: Tue, 19 Sep 2023 05:17:48 -0700 Subject: [PATCH 10/10] Localized file check-in by OneLocBuild Task (#8350) Context: https://aka.ms/onelocbuild Context: https://aka.ms/AllAboutLoc Build definition ID 17928: Build ID 8414944 --- src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx | 4 ++-- src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx index 3cc5f1a9280..49188ee7da4 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx @@ -542,11 +542,11 @@ Cambie el valor de AndroidManifest.xml para que coincida con el valor $(Supporte {0} - The assembly name - This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. + Esto puede deberse a que el proyecto supera la limitación de longitud máxima de la ruta de acceso de Windows. Vea https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obtener más información. The following are literal names and should not be translated: - This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details. + Esto puede deberse a que el proyecto tiene caracteres que no son ASCII en su nombre de archivo o ruta de acceso. Vea https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 para obtener más información. The following are literal names and should not be translated: diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx index 9c433918503..49be2825bbb 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx @@ -543,11 +543,11 @@ $(SupportedOSPlatformVersion) 値に一致するように AndroidManifest.xml {0} - The assembly name - This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. + これは、プロジェクトが Windows のパスの最大の長さの制限を超えたことが原因の可能性があります。詳細については、https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 を参照してください。 The following are literal names and should not be translated: - This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details. + これは、プロジェクトのファイル名またはパスに ASCII 以外の文字が含まれている場合に発生する可能性があります。詳細については、「https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265」を参照してください。 The following are literal names and should not be translated: