From 9d8ca6074b09be7aefad9266b2691fcff2ff5210 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 7 Mar 2024 07:31:46 -1000 Subject: [PATCH 1/3] [templates] Remove redundant "template" from display name. (#8773) Fixes: https://github.com/xamarin/xamarin-android/issues/8626 Removes the word "template" that shows up in the New Item dialog box, as it is unnecessary. The original issue also mentions not having a custom icon, but as we don't have any of those available, the default icon seems good enough. --- .../android-activity/.template.config/template.json | 2 +- .../android-layout/.template.config/template.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.Android.Templates/android-activity/.template.config/template.json b/src/Microsoft.Android.Templates/android-activity/.template.config/template.json index be928b8a921..64e09af7d3b 100644 --- a/src/Microsoft.Android.Templates/android-activity/.template.config/template.json +++ b/src/Microsoft.Android.Templates/android-activity/.template.config/template.json @@ -2,7 +2,7 @@ "$schema": "http://json.schemastore.org/template", "author": "Microsoft", "classifications": [ "Android", "Mobile" ], - "name": "Android Activity template", + "name": "Android Activity", "description": "An Android Activity class", "tags": { "language": "C#", diff --git a/src/Microsoft.Android.Templates/android-layout/.template.config/template.json b/src/Microsoft.Android.Templates/android-layout/.template.config/template.json index c3cea066474..29701a67b6b 100644 --- a/src/Microsoft.Android.Templates/android-layout/.template.config/template.json +++ b/src/Microsoft.Android.Templates/android-layout/.template.config/template.json @@ -2,7 +2,7 @@ "$schema": "http://json.schemastore.org/template", "author": "Microsoft", "classifications": [ "Android", "Mobile" ], - "name": "Android Layout template", + "name": "Android Layout", "description": "An Android layout (XML) file", "tags": { "language": "C#", From ab582f10545535d17011cf29f391886e57b9fc9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 11:58:53 -0400 Subject: [PATCH 2/3] Bump to xamarin/Java.Interop/main@3436a30 (#8799) Changes: https://github.com/xamarin/java.interop/compare/a7e09b7be4dc9dbc1c1a65b5f2c1e8fcf028b209...3436a306bd23eb4755f769ad88d955323138321f * xamarin/java.interop@3436a306: [ci] Build dotnet release branches and PRs against dotnet release branches. (xamarin/java.interop#1204) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index a7e09b7be4d..3436a306bd2 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit a7e09b7be4dc9dbc1c1a65b5f2c1e8fcf028b209 +Subproject commit 3436a306bd23eb4755f769ad88d955323138321f From 4d1fca774756cb24ef2db5402a549ed3ebc2216c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:56:34 -0500 Subject: [PATCH 3/3] Bump to dotnet/installer/main@e911f5c82c 9.0.100-preview.3.24161.2 (#8802) Changes: https://github.com/dotnet/installer/compare/893b762b6e...e911f5c82c Changes: https://github.com/dotnet/runtime/compare/5e603d595e...3eb8c7f108 Changes: https://github.com/dotnet/emsdk/compare/0f3e462442...a5f4de78fc Changes: https://github.com/dotnet/cecil/compare/0d0bc8e0f4...ba53c75483 Updates: * Microsoft.Dotnet.Sdk.Internal: from 9.0.100-preview.3.24153.2 to 9.0.100-preview.3.24161.2 * Microsoft.NETCore.App.Ref: from 9.0.0-preview.3.24129.2 to 9.0.0-preview.3.24160.3 * Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-preview.3.24126.1 to 9.0.0-preview.3.24156.3 * Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.3.24129.2 to 9.0.0-preview.3.24160.3 * Microsoft.DotNet.Cecil: from 0.11.4-alpha.24120.1 to 0.11.4-alpha.24158.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 ca7fbcde99d..e7cec78de4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - 893b762b6e36d558df7ae6fccdfd8034f83a1c2e + e911f5c82cc02aea96e227596e16c830d54cf03a - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb - + https://github.com/dotnet/emsdk - 0f3e462442af5fe65271e3185d5b645ad40a6041 + a5f4de78fca42544771977f8e8e04c4aa83e1d02 - + https://github.com/dotnet/cecil - 0d0bc8e0f47fdae9834e1eac678f364c50946133 + ba53c75483aa4980a332fa48e61076f80adfec40 diff --git a/eng/Versions.props b/eng/Versions.props index 346f1e1fc29..f16fd164c98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 9.0.100-preview.3.24153.2 - 9.0.0-preview.3.24129.2 - 9.0.0-preview.3.24129.2 + 9.0.100-preview.3.24161.2 + 9.0.0-preview.3.24160.3 + 9.0.0-preview.3.24160.3 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 9.0.0-preview.3.24126.1 + 9.0.0-preview.3.24156.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.24120.1 + 0.11.4-alpha.24158.1 $(MicrosoftNETCoreAppRefPackageVersion)