From ebc78fdb8ac6389ef299960eb8a7d91a111b33ce Mon Sep 17 00:00:00 2001 From: Pratham Date: Tue, 20 Feb 2024 12:33:08 -0800 Subject: [PATCH 1/2] # BugFix: Not trimmer friendly in .NET 8 - Fixed namespace for `AttachmentViewModel`. - Fixed namespace and ClassName for `LoadStatus` property to refernce from `GeoModel` instead of `Map`. - Added warnings `IL2036` and `IL2037` to treat them as errors. --- .../Toolkit.SampleApp.Maui.csproj | 4 +++- .../Toolkit.Maui/OverviewMap/OverviewMap.cs | 2 +- .../AttachmentsPopupElementView.Maui.cs | 20 +++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj index e6f899474..ab3883a34 100644 --- a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj +++ b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj @@ -10,7 +10,9 @@ enable enable - + $(WarningsAsErrors);IL2036;IL2037 + + Toolkit.SampleApp.Maui diff --git a/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs b/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs index cafd13861..e9f75b0dc 100644 --- a/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs +++ b/src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs @@ -33,7 +33,7 @@ public class OverviewMap : TemplatedView private MapView? _overviewMapView; - [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Map.LoadStatus), "Esri.ArcGISRuntime.Mapping.Map", "Esri.ArcGISRuntime")] + [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.GeoModel.LoadStatus), "Esri.ArcGISRuntime.Mapping.GeoModel", "Esri.ArcGISRuntime")] static OverviewMap() { DefaultControlTemplate = new ControlTemplate(() => diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs index 5fb7ffe79..99b5e9fe2 100644 --- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs +++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/AttachmentsPopupElementView.Maui.cs @@ -73,11 +73,11 @@ private static object BuildDefaultTemplate() } - [DynamicDependency(nameof(AttachmentViewModel.Thumbnail), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentViewModel","Esri.ArcGISRuntime")] - [DynamicDependency(nameof(AttachmentViewModel.Name), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentViewModel", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(AttachmentViewModel.Size), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentViewModel", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(AttachmentViewModel.IsDownloadButtonVisible), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentViewModel", "Esri.ArcGISRuntime")] - [DynamicDependency(nameof(AttachmentViewModel.IsDownloading), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentViewModel", "Esri.ArcGISRuntime")] + [DynamicDependency(nameof(AttachmentViewModel.Thumbnail), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] + [DynamicDependency(nameof(AttachmentViewModel.Name), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] + [DynamicDependency(nameof(AttachmentViewModel.Size), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] + [DynamicDependency(nameof(AttachmentViewModel.IsDownloadButtonVisible), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] + [DynamicDependency(nameof(AttachmentViewModel.IsDownloading), "Esri.ArcGISRuntime.Toolkit.Maui.Primitives.AttachmentsPopupElementView.AttachmentViewModel", "Esri.ArcGISRuntime.Toolkit.Maui")] private static object BuildDefaultItemTemplate() { Grid layout = new Grid(); @@ -95,7 +95,7 @@ private static object BuildDefaultItemTemplate() layout.Add(image); image.SetBinding(Image.SourceProperty, new Binding(nameof(AttachmentViewModel.Thumbnail))); Grid.SetRowSpan(image, 2); - + Label name = new Label() { VerticalOptions = LayoutOptions.End }; name.SetBinding(Label.TextProperty, nameof(AttachmentViewModel.Name)); Grid.SetColumn(name, 1); @@ -113,7 +113,7 @@ private static object BuildDefaultItemTemplate() Grid.SetColumn(image2, 2); Grid.SetRowSpan(image2, 2); layout.Add(image2); - + ActivityIndicator indicator = new ActivityIndicator() { WidthRequest = 24, HeightRequest = 24, IsRunning = true }; indicator.SetBinding(ActivityIndicator.IsRunningProperty, new Binding(nameof(AttachmentViewModel.IsDownloading))); Grid.SetColumn(indicator, 2); @@ -210,7 +210,7 @@ public string Size else return $"{Math.Round(size / 1024d / 1024d, 1)} MB"; } - } + } private void Attachment_PropertyChanged(object? sender, PropertyChangedEventArgs e) { @@ -241,9 +241,9 @@ public ImageSource? Thumbnail return _thumbnail; } } - + public bool IsDownloadButtonVisible => !Attachment.IsLocal && Attachment.LoadStatus != LoadStatus.Loaded && Attachment.LoadStatus != LoadStatus.Loading; - + public bool IsDownloading => !Attachment.IsLocal && Attachment.LoadStatus == LoadStatus.Loading; private void CreateThumbnail() From 705d3be04b2a4384687ef0d241939805dc361851 Mon Sep 17 00:00:00 2001 From: Prathamesh Narkhede <55591622+prathameshnarkhede@users.noreply.github.com> Date: Tue, 20 Feb 2024 15:20:21 -0800 Subject: [PATCH 2/2] Update src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj --- .../Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj index ab3883a34..107fc4dc0 100644 --- a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj +++ b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj @@ -10,9 +10,9 @@ enable enable - $(WarningsAsErrors);IL2036;IL2037 + $(WarningsAsErrors);IL2036;IL2037 - + Toolkit.SampleApp.Maui