From e2ae3f0c49279d3b0e03e74220706bf0a6721d22 Mon Sep 17 00:00:00 2001
From: kmuthukumar3032 <mkdmuthu@gmail.com>
Date: Sat, 4 May 2019 21:39:24 +0530
Subject: [PATCH 1/3] config(EJ2-26156): commit for update the github samples
 with .NET Core preview4

---
 README.md                                     |  16 +-
 ej2-blazor-samples/App.cshtml                 |   5 -
 ej2-blazor-samples/App.razor                  |   1 +
 .../{ButtonGroup.cshtml => ButtonGroup.razor} |   0
 .../{CheckBox.cshtml => CheckBox.razor}       |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...DownButton.cshtml => DropDownButton.razor} |   0
 ...ressButton.cshtml => ProgressButton.razor} |   0
 .../{RadioButton.cshtml => RadioButton.razor} |   0
 .../{SplitButton.cshtml => SplitButton.razor} |   0
 .../Button/{Switch.cshtml => Switch.razor}    |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../Pages/Buttons/SampleList.cs               |  18 +-
 .../{DateRange.cshtml => DateRange.razor}     |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...iSelection.cshtml => MultiSelection.razor} |   0
 .../{DateRange.cshtml => DateRange.razor}     |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Format.cshtml => Format.razor}           |   0
 .../{DateRange.cshtml => DateRange.razor}     |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Format.cshtml => Format.razor}           |   0
 ...teTimeRange.cshtml => DateTimeRange.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Format.cshtml => Format.razor}           |   0
 .../Pages/Calendars/SampleList.cs             |  28 +--
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Format.cshtml => Format.razor}           |   0
 .../Charts/Chart/{Bar.cshtml => Bar.razor}    |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../Charts/Chart/{Pie.cshtml => Pie.razor}    |   0
 .../Chart/{Polar.cshtml => Polar.razor}       |   0
 .../{Trackball.cshtml => Trackball.razor}     |   0
 .../{LightWeight.cshtml => LightWeight.razor} |   0
 ...eNavigator.cshtml => RangeNavigator.razor} |   0
 ej2-blazor-samples/Pages/Charts/SampleList.cs |  26 +--
 ...stomization.cshtml => Customization.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{SeriesType.cshtml => SeriesType.razor}   |   0
 ...HideSelector.cshtml => HideSelector.razor} |   0
 .../{StockChart.cshtml => StockChart.razor}   |   0
 .../{Compass.cshtml => Compass.razor}         |   0
 ...stomization.cshtml => Customization.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...PointerImage.cshtml => PointerImage.razor} |   0
 .../{Tooltip.cshtml => Tooltip.razor}         |   0
 .../{labels.cshtml => labels.razor}           |   0
 .../Pages/CircularGauge/SampleList.cs         |  10 +-
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...alModel.cshtml => HierarchicalModel.razor} |   0
 ...onModel.cshtml => OrganizationModel.razor} |   0
 .../Diagram/{Shapes.cshtml => Shapes.razor}   |   0
 .../Pages/Diagrams/SampleList.cs              |   8 +-
 ...ering.cshtml => BulletsAndNumbering.razor} |   0
 ...terFormat.cshtml => CharacterFormat.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...Footers.cshtml => HeadersAndFooters.razor} |   0
 ...ks.cshtml => HyperlinksAndBookmarks.razor} |   0
 ...aphFormat.cshtml => ParagraphFormat.razor} |   0
 ...ctionFormat.cshtml => SectionFormat.razor} |   0
 .../{Styles.cshtml => Styles.razor}           |   0
 .../{TableFormat.cshtml => TableFormat.razor} |   0
 ...fContents.cshtml => TableOfContents.razor} |   0
 .../Pages/DocumentEditor/SampleList.cs        |  20 +-
 .../{DataBinding.cshtml => DataBinding.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{DataBinding.cshtml => DataBinding.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Filtering.cshtml => Filtering.razor}     |   0
 .../{DataBinding.cshtml => DataBinding.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Filtering.cshtml => Filtering.razor}     |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{DataBinding.cshtml => DataBinding.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Filtering.cshtml => Filtering.razor}     |   0
 .../Pages/DropDowns/SampleList.cs             |  24 +--
 ...onents.cshtml => DropDownComponents.razor} |   0
 .../{Overview.cshtml => Overview.razor}       |   0
 .../Pages/Editors/SampleList.cs               |   6 +-
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ej2-blazor-samples/Pages/Forms/SampleList.cs  |   2 +-
 .../Gantt/{Baseline.cshtml => Baseline.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../Gantt/{Editing.cshtml => Editing.razor}   |   0
 ej2-blazor-samples/Pages/Gantt/SampleList.cs  |   6 +-
 ...lection.cshtml => CheckboxSelection.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Filtering.cshtml => Filtering.razor}     |   0
 ...lineEditing.cshtml => InlineEditing.razor} |   0
 .../{Sorting.cshtml => Sorting.razor}         |   0
 ej2-blazor-samples/Pages/Grid/SampleList.cs   |  10 +-
 ej2-blazor-samples/Pages/Grids/SampleList.cs  |   8 +-
 ...kboxColumn.cshtml => CheckboxColumn.razor} |   0
 ...iltering.cshtml => DefaultFiltering.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Editing.cshtml => Editing.razor}         |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Emptypoints.cshtml => Emptypoints.razor} |   0
 .../Pages/HeatMapChart/SampleList.cs          |   4 +-
 .../Pages/{Index.cshtml => Index.razor}       |   3 +-
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{CustomMask.cshtml => CustomMask.razor}   |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...CustomFormat.cshtml => CustomFormat.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...Decimals.cshtml => RestrictDecimals.razor} |   0
 ej2-blazor-samples/Pages/Inputs/SampleList.cs |  24 +--
 .../Slider/{Default.cshtml => Default.razor}  |   0
 .../Slider/{Ticks.cshtml => Ticks.razor}      |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{ChunkUpload.cshtml => ChunkUpload.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...Validation.cshtml => FileValidation.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Draggable.cshtml => Draggable.razor}     |   0
 .../{Resizable.cshtml => Resizable.razor}     |   0
 ej2-blazor-samples/Pages/Layout/SampleList.cs |  10 +-
 .../{Default.cshtml => Default.razor}         |   0
 ...ollapse.cshtml => ExpandandCollapse.razor} |   0
 .../Avatar/{Default.cshtml => Default.razor}  |   0
 .../Avatar/{Types.cshtml => Types.razor}      |   0
 .../{BasicCard.cshtml => BasicCard.razor}     |   0
 ...zontalCard.cshtml => HorizontalCard.razor} |   0
 ...VerticalCard.cshtml => VerticalCard.razor} |   0
 .../{Default.cshtml => Default.razor}         |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../Pages/Layouts/SampleList.cs               |  14 +-
 .../{Container.cshtml => Container.razor}     |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../LinearGauge/LinearGauge/samplelist.cs     |   4 +-
 .../Maps/Maps/{Bubble.cshtml => Bubble.razor} |   2 +
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Multilayer.cshtml => Multilayer.razor}   |   0
 .../{Projection.cshtml => Projection.razor}   |   0
 .../Maps/{Tooltip.cshtml => Tooltip.razor}    |   0
 .../Maps/Maps/{marker.cshtml => marker.razor} |   0
 ...enStreetMap.cshtml => openStreetMap.razor} |   0
 ej2-blazor-samples/Pages/Maps/SampleList.cs   |  21 +--
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../Accordion/{Icons.cshtml => Icons.razor}   |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...Thumbnail.cshtml => CustomThumbnail.razor} |   0
 .../{Overview.cshtml => Overview.razor}       |   0
 .../{DataBinding.cshtml => DataBinding.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../Pages/Navigations/SampleList.cs           |  34 ++--
 .../Sidebar/{API.cshtml => API.razor}         |   0
 .../Sidebar/{Default.cshtml => Default.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../Sidebar/{Dock.cshtml => Dock.razor}       |   0
 ...nsive.cshtml => PanelWithResponsive.razor} |   0
 ...sivePanel.cshtml => ResponsivePanel.razor} |   0
 .../{SidebarAPI.cshtml => SidebarAPI.razor}   |   0
 .../{SidebarDock.cshtml => SidebarDock.razor} |   0
 .../{SidebarList.cshtml => SidebarList.razor} |   0
 .../{SidebarMenu.cshtml => SidebarMenu.razor} |   0
 ...tView.cshtml => SidebarWithListView.razor} |   0
 ...rWithMenu.cshtml => SidebarWithMenu.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |  10 +-
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../Toolbar/{Popup.cshtml => Popup.razor}     |   0
 .../{CheckBox.cshtml => CheckBox.razor}       |   2 -
 ...es.cshtml => DefaultFunctionalities.razor} |   2 -
 .../Badge/{Default.cshtml => Default.razor}   |   0
 .../Badge/{Types.cshtml => Types.razor}       |   0
 .../Pages/Notifications/SampleList.cs         |   6 +-
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...iltering.cshtml => AdvanceFiltering.razor} |   0
 .../PivotTable/{Chart.cshtml => Chart.razor}  |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{Editing.cshtml => Editing.razor}         |   0
 ...teraction.cshtml => UserInteraction.razor} |   0
 .../Pages/PivotView/SampleList.cs             |  10 +-
 ej2-blazor-samples/Pages/Popups/SampleList.cs |   4 +-
 .../Tooltip/{Default.cshtml => Default.razor} |   0
 ...HtmlTemplate.cshtml => HtmlTemplate.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 ...es.cshtml => Iframe-Functionalities.razor} |   0
 .../{Inline.cshtml => Inline.razor}           |   0
 ...verview.cshtml => Markdown-Overview.razor} |   0
 .../Pages/RichTextEditor/SampleList.cs        |   8 +-
 .../Pages/Schedule/SampleList.cs              |  10 +-
 .../Schedule/{Agenda.cshtml => Agenda.razor}  |   0
 .../{Default.cshtml => Default.razor}         |   0
 .../Schedule/{Group.cshtml => Group.razor}    |   0
 .../{Timeline.cshtml => Timeline.razor}       |   0
 ...oup.cshtml => TimelineResourceGroup.razor} |   0
 .../Pages/TreeMap/SampleList.cs               |  47 +----
 ...ColorMapping.cshtml => ColorMapping.razor} |   0
 ...stomization.cshtml => Customization.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../TreeMap/{Index.cshtml => Index.razor}     |   0
 .../TreeMap/{Legend.cshtml => Legend.razor}   |   0
 .../TreeMap/{Tooltip.cshtml => Tooltip.razor} |   0
 ...TreeMapLabel.cshtml => TreeMapLabel.razor} |   0
 .../{layerData.cshtml => layerData.razor}     |   0
 .../TreeMap/{print.cshtml => print.razor}     |   0
 .../{selection.cshtml => selection.razor}     |   0
 .../TreeMap/{test.cshtml => test.razor}       |   0
 ...stomToolbar.cshtml => CustomToolbar.razor} |   0
 ...es.cshtml => DefaultFunctionalities.razor} |   0
 .../{RightToLeft.cshtml => RightToLeft.razor} |   0
 ej2-blazor-samples/Pages/Viewer/SampleList.cs |   6 +-
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 ej2-blazor-samples/Program.cs                 |   6 +-
 .../PublishProfiles/FolderProfile.pubxml      |  19 --
 .../PublishProfiles/FolderProfile.pubxml.user |  11 --
 .../Properties/launchSettings.json            |   7 +-
 .../{MainLayout.cshtml => MainLayout.razor}   |  24 +--
 ej2-blazor-samples/Shared/NavMenu.cshtml      | 171 -----------------
 ej2-blazor-samples/Shared/NavMenu.razor       | 173 ++++++++++++++++++
 ej2-blazor-samples/Shared/SurveyPrompt.razor  |  15 ++
 ej2-blazor-samples/Startup.cs                 |   7 -
 .../{_ViewImports.cshtml => _Imports.razor}   |   4 +-
 ej2-blazor-samples/ej2-blazor-samples.csproj  |  25 ++-
 ej2-blazor-samples/wwwroot/index.html         |   2 +-
 ej2-blazor-samples/wwwroot/styles/index.css   |   3 -
 219 files changed, 396 insertions(+), 480 deletions(-)
 delete mode 100644 ej2-blazor-samples/App.cshtml
 create mode 100644 ej2-blazor-samples/App.razor
 rename ej2-blazor-samples/Pages/Buttons/Button/{ButtonGroup.cshtml => ButtonGroup.razor} (100%)
 rename ej2-blazor-samples/Pages/Buttons/Button/{CheckBox.cshtml => CheckBox.razor} (100%)
 rename ej2-blazor-samples/Pages/Buttons/Button/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Buttons/Button/{DropDownButton.cshtml => DropDownButton.razor} (100%)
 rename ej2-blazor-samples/Pages/Buttons/Button/{ProgressButton.cshtml => ProgressButton.razor} (100%)
 rename ej2-blazor-samples/Pages/Buttons/Button/{RadioButton.cshtml => RadioButton.razor} (100%)
 rename ej2-blazor-samples/Pages/Buttons/Button/{SplitButton.cshtml => SplitButton.razor} (100%)
 rename ej2-blazor-samples/Pages/Buttons/Button/{Switch.cshtml => Switch.razor} (100%)
 rename ej2-blazor-samples/Pages/Buttons/Chips/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/Calendar/{DateRange.cshtml => DateRange.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/Calendar/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/Calendar/{MultiSelection.cshtml => MultiSelection.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DatePicker/{DateRange.cshtml => DateRange.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DatePicker/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DatePicker/{Format.cshtml => Format.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DateRangePicker/{DateRange.cshtml => DateRange.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DateRangePicker/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DateRangePicker/{Format.cshtml => Format.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DateTimePicker/{DateTimeRange.cshtml => DateTimeRange.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DateTimePicker/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/DateTimePicker/{Format.cshtml => Format.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/TimePicker/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Calendars/TimePicker/{Format.cshtml => Format.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/Chart/{Bar.cshtml => Bar.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/Chart/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/Chart/{Pie.cshtml => Pie.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/Chart/{Polar.cshtml => Polar.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/Chart/{Trackball.cshtml => Trackball.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/RangeNavigator/{LightWeight.cshtml => LightWeight.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/RangeNavigator/{RangeNavigator.cshtml => RangeNavigator.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/SmithChart/{Customization.cshtml => Customization.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/SmithChart/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/Sparkline/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/Sparkline/{SeriesType.cshtml => SeriesType.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/StockChart/{HideSelector.cshtml => HideSelector.razor} (100%)
 rename ej2-blazor-samples/Pages/Charts/StockChart/{StockChart.cshtml => StockChart.razor} (100%)
 rename ej2-blazor-samples/Pages/CircularGauge/CircularGauge/{Compass.cshtml => Compass.razor} (100%)
 rename ej2-blazor-samples/Pages/CircularGauge/CircularGauge/{Customization.cshtml => Customization.razor} (100%)
 rename ej2-blazor-samples/Pages/CircularGauge/CircularGauge/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/CircularGauge/CircularGauge/{PointerImage.cshtml => PointerImage.razor} (100%)
 rename ej2-blazor-samples/Pages/CircularGauge/CircularGauge/{Tooltip.cshtml => Tooltip.razor} (100%)
 rename ej2-blazor-samples/Pages/CircularGauge/CircularGauge/{labels.cshtml => labels.razor} (100%)
 rename ej2-blazor-samples/Pages/Diagrams/Diagram/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Diagrams/Diagram/{HierarchicalModel.cshtml => HierarchicalModel.razor} (100%)
 rename ej2-blazor-samples/Pages/Diagrams/Diagram/{OrganizationModel.cshtml => OrganizationModel.razor} (100%)
 rename ej2-blazor-samples/Pages/Diagrams/Diagram/{Shapes.cshtml => Shapes.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{BulletsAndNumbering.cshtml => BulletsAndNumbering.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{CharacterFormat.cshtml => CharacterFormat.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{HeadersAndFooters.cshtml => HeadersAndFooters.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{HyperlinksAndBookmarks.cshtml => HyperlinksAndBookmarks.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{ParagraphFormat.cshtml => ParagraphFormat.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{SectionFormat.cshtml => SectionFormat.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{Styles.cshtml => Styles.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{TableFormat.cshtml => TableFormat.razor} (100%)
 rename ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/{TableOfContents.cshtml => TableOfContents.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/AutoComplete/{DataBinding.cshtml => DataBinding.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/AutoComplete/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/ComboBox/{DataBinding.cshtml => DataBinding.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/ComboBox/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/ComboBox/{Filtering.cshtml => Filtering.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/DropDownList/{DataBinding.cshtml => DataBinding.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/DropDownList/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/DropDownList/{Filtering.cshtml => Filtering.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/ListBox/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/MultiSelect/{DataBinding.cshtml => DataBinding.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/MultiSelect/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/DropDowns/MultiSelect/{Filtering.cshtml => Filtering.razor} (100%)
 rename ej2-blazor-samples/Pages/Editors/InPlaceEditor/{DropDownComponents.cshtml => DropDownComponents.razor} (100%)
 rename ej2-blazor-samples/Pages/Editors/InPlaceEditor/{Overview.cshtml => Overview.razor} (100%)
 rename ej2-blazor-samples/Pages/Forms/QueryBuilder/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Gantt/Gantt/{Baseline.cshtml => Baseline.razor} (100%)
 rename ej2-blazor-samples/Pages/Gantt/Gantt/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Gantt/Gantt/{Editing.cshtml => Editing.razor} (100%)
 rename ej2-blazor-samples/Pages/Grid/DataGrid/{CheckboxSelection.cshtml => CheckboxSelection.razor} (100%)
 rename ej2-blazor-samples/Pages/Grid/DataGrid/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Grid/DataGrid/{Filtering.cshtml => Filtering.razor} (100%)
 rename ej2-blazor-samples/Pages/Grid/DataGrid/{InlineEditing.cshtml => InlineEditing.razor} (100%)
 rename ej2-blazor-samples/Pages/Grid/DataGrid/{Sorting.cshtml => Sorting.razor} (100%)
 rename ej2-blazor-samples/Pages/Grids/TreeGrid/{CheckboxColumn.cshtml => CheckboxColumn.razor} (100%)
 rename ej2-blazor-samples/Pages/Grids/TreeGrid/{DefaultFiltering.cshtml => DefaultFiltering.razor} (100%)
 rename ej2-blazor-samples/Pages/Grids/TreeGrid/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Grids/TreeGrid/{Editing.cshtml => Editing.razor} (100%)
 rename ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/{Emptypoints.cshtml => Emptypoints.razor} (100%)
 rename ej2-blazor-samples/Pages/{Index.cshtml => Index.razor} (77%)
 rename ej2-blazor-samples/Pages/Inputs/ColorPicker/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/MaskedTextBox/{CustomMask.cshtml => CustomMask.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/MaskedTextBox/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/NumericTextBox/{CustomFormat.cshtml => CustomFormat.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/NumericTextBox/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/NumericTextBox/{RestrictDecimals.cshtml => RestrictDecimals.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/Slider/{Default.cshtml => Default.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/Slider/{Ticks.cshtml => Ticks.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/TextBox/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/Uploader/{ChunkUpload.cshtml => ChunkUpload.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/Uploader/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Inputs/Uploader/{FileValidation.cshtml => FileValidation.razor} (100%)
 rename ej2-blazor-samples/Pages/Layout/Dialog/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Layout/Dialog/{Draggable.cshtml => Draggable.razor} (100%)
 rename ej2-blazor-samples/Pages/Layout/Dialog/{Resizable.cshtml => Resizable.razor} (100%)
 rename ej2-blazor-samples/Pages/Layout/Splitter/{Default.cshtml => Default.razor} (100%)
 rename ej2-blazor-samples/Pages/Layout/Splitter/{ExpandandCollapse.cshtml => ExpandandCollapse.razor} (100%)
 rename ej2-blazor-samples/Pages/Layouts/Avatar/{Default.cshtml => Default.razor} (100%)
 rename ej2-blazor-samples/Pages/Layouts/Avatar/{Types.cshtml => Types.razor} (100%)
 rename ej2-blazor-samples/Pages/Layouts/Card/{BasicCard.cshtml => BasicCard.razor} (100%)
 rename ej2-blazor-samples/Pages/Layouts/Card/{HorizontalCard.cshtml => HorizontalCard.razor} (100%)
 rename ej2-blazor-samples/Pages/Layouts/Card/{VerticalCard.cshtml => VerticalCard.razor} (100%)
 rename ej2-blazor-samples/Pages/Layouts/DashboardLayout/{Default.cshtml => Default.razor} (100%)
 rename ej2-blazor-samples/Pages/Layouts/Listview/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/LinearGauge/LinearGauge/{Container.cshtml => Container.razor} (100%)
 rename ej2-blazor-samples/Pages/LinearGauge/LinearGauge/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Maps/Maps/{Bubble.cshtml => Bubble.razor} (99%)
 rename ej2-blazor-samples/Pages/Maps/Maps/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Maps/Maps/{Multilayer.cshtml => Multilayer.razor} (100%)
 rename ej2-blazor-samples/Pages/Maps/Maps/{Projection.cshtml => Projection.razor} (100%)
 rename ej2-blazor-samples/Pages/Maps/Maps/{Tooltip.cshtml => Tooltip.razor} (100%)
 rename ej2-blazor-samples/Pages/Maps/Maps/{marker.cshtml => marker.razor} (100%)
 rename ej2-blazor-samples/Pages/Maps/Maps/{openStreetMap.cshtml => openStreetMap.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Accordion/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Accordion/{Icons.cshtml => Icons.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/ContextMenu/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/FileManager/{CustomThumbnail.cshtml => CustomThumbnail.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/FileManager/{Overview.cshtml => Overview.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/MenuBar/{DataBinding.cshtml => DataBinding.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/MenuBar/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{API.cshtml => API.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{Default.cshtml => Default.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{Dock.cshtml => Dock.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{PanelWithResponsive.cshtml => PanelWithResponsive.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{ResponsivePanel.cshtml => ResponsivePanel.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{SidebarAPI.cshtml => SidebarAPI.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{SidebarDock.cshtml => SidebarDock.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{SidebarList.cshtml => SidebarList.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{SidebarMenu.cshtml => SidebarMenu.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{SidebarWithListView.cshtml => SidebarWithListView.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Sidebar/{SidebarWithMenu.cshtml => SidebarWithMenu.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Tab/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (98%)
 rename ej2-blazor-samples/Pages/Navigations/Toolbar/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/Toolbar/{Popup.cshtml => Popup.razor} (100%)
 rename ej2-blazor-samples/Pages/Navigations/TreeView/{CheckBox.cshtml => CheckBox.razor} (99%)
 rename ej2-blazor-samples/Pages/Navigations/TreeView/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (99%)
 rename ej2-blazor-samples/Pages/Notifications/Badge/{Default.cshtml => Default.razor} (100%)
 rename ej2-blazor-samples/Pages/Notifications/Badge/{Types.cshtml => Types.razor} (100%)
 rename ej2-blazor-samples/Pages/Notifications/Toast/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/PivotView/PivotTable/{AdvanceFiltering.cshtml => AdvanceFiltering.razor} (100%)
 rename ej2-blazor-samples/Pages/PivotView/PivotTable/{Chart.cshtml => Chart.razor} (100%)
 rename ej2-blazor-samples/Pages/PivotView/PivotTable/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/PivotView/PivotTable/{Editing.cshtml => Editing.razor} (100%)
 rename ej2-blazor-samples/Pages/PivotView/PivotTable/{UserInteraction.cshtml => UserInteraction.razor} (100%)
 rename ej2-blazor-samples/Pages/Popups/Tooltip/{Default.cshtml => Default.razor} (100%)
 rename ej2-blazor-samples/Pages/Popups/Tooltip/{HtmlTemplate.cshtml => HtmlTemplate.razor} (100%)
 rename ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/{Iframe-Functionalities.cshtml => Iframe-Functionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/{Inline.cshtml => Inline.razor} (100%)
 rename ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/{Markdown-Overview.cshtml => Markdown-Overview.razor} (100%)
 rename ej2-blazor-samples/Pages/Schedule/Schedule/{Agenda.cshtml => Agenda.razor} (100%)
 rename ej2-blazor-samples/Pages/Schedule/Schedule/{Default.cshtml => Default.razor} (100%)
 rename ej2-blazor-samples/Pages/Schedule/Schedule/{Group.cshtml => Group.razor} (100%)
 rename ej2-blazor-samples/Pages/Schedule/Schedule/{Timeline.cshtml => Timeline.razor} (100%)
 rename ej2-blazor-samples/Pages/Schedule/Schedule/{TimelineResourceGroup.cshtml => TimelineResourceGroup.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{ColorMapping.cshtml => ColorMapping.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{Customization.cshtml => Customization.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{Index.cshtml => Index.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{Legend.cshtml => Legend.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{Tooltip.cshtml => Tooltip.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{TreeMapLabel.cshtml => TreeMapLabel.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{layerData.cshtml => layerData.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{print.cshtml => print.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{selection.cshtml => selection.razor} (100%)
 rename ej2-blazor-samples/Pages/TreeMap/TreeMap/{test.cshtml => test.razor} (100%)
 rename ej2-blazor-samples/Pages/Viewer/PdfViewer/{CustomToolbar.cshtml => CustomToolbar.razor} (100%)
 rename ej2-blazor-samples/Pages/Viewer/PdfViewer/{DefaultFunctionalities.cshtml => DefaultFunctionalities.razor} (100%)
 rename ej2-blazor-samples/Pages/Viewer/PdfViewer/{RightToLeft.cshtml => RightToLeft.razor} (100%)
 rename ej2-blazor-samples/Pages/{_ViewImports.cshtml => _Imports.razor} (100%)
 delete mode 100644 ej2-blazor-samples/Properties/PublishProfiles/FolderProfile.pubxml
 delete mode 100644 ej2-blazor-samples/Properties/PublishProfiles/FolderProfile.pubxml.user
 rename ej2-blazor-samples/Shared/{MainLayout.cshtml => MainLayout.razor} (94%)
 delete mode 100644 ej2-blazor-samples/Shared/NavMenu.cshtml
 create mode 100644 ej2-blazor-samples/Shared/NavMenu.razor
 create mode 100644 ej2-blazor-samples/Shared/SurveyPrompt.razor
 rename ej2-blazor-samples/{_ViewImports.cshtml => _Imports.razor} (69%)

diff --git a/README.md b/README.md
index 7d73233b1..a583a6e25 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ The below topics can help you to use the Syncfusion ASP.NET Core Razor Component
 The samples requires the below requirements to run.
 
 * [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#2019rc)
-* [.NET Core SDK 3.0 Preview3](https://dotnet.microsoft.com/download/dotnet-core/3.0)
+* [.NET Core SDK 3.0 Preview4](https://dotnet.microsoft.com/download/dotnet-core/3.0)
 
 ## Using the samples
 
@@ -155,18 +155,18 @@ The Syncfusion license that contains the terms and conditions can be found at
             <a href="ej2-blazor-samples/Pages/Buttons">Button</a>
         </td>
         <td>
-            <a href="ej2-blazor-samples/Pages/Buttons/Button/ButtonGroup.cshtml">Button Group</a>
+            <a href="ej2-blazor-samples/Pages/Buttons/Button/ButtonGroup.razor">Button Group</a>
         </td>
         <td>
-            <a href="ej2-blazor-samples/Pages/Buttons/Button/DropDownButton.cshtml">Dropdown Menu</a>
+            <a href="ej2-blazor-samples/Pages/Buttons/Button/DropDownButton.razor">Dropdown Menu</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a href="ej2-blazor-samples/Pages/Buttons/Button/ProgressButton.cshtml">Progress Button</a>
+            <a href="ej2-blazor-samples/Pages/Buttons/Button/ProgressButton.razor">Progress Button</a>
         </td>
         <td>
-            <a href="ej2-blazor-samples/Pages/Buttons/Button/SplitButton.cshtml">Split Button</a>
+            <a href="ej2-blazor-samples/Pages/Buttons/Button/SplitButton.razor">Split Button</a>
         </td>
         <td></td>
     </tr>
@@ -245,10 +245,10 @@ The Syncfusion license that contains the terms and conditions can be found at
     </tr>
     <tr>
         <td>
-            <a href="ej2-blazor-samples/Pages/Buttons/Button/RadioButton.cshtml">Radio Button</a>
+            <a href="ej2-blazor-samples/Pages/Buttons/Button/RadioButton.razor">Radio Button</a>
         </td>
         <td>
-            <a href="ej2-blazor-samples/Pages/Buttons/Button/CheckBox.cshtml">Checkbox</a>
+            <a href="ej2-blazor-samples/Pages/Buttons/Button/CheckBox.razor">Checkbox</a>
         </td>
         <td>
             <a href="ej2-blazor-samples/Pages/Inputs/ColorPicker">Color Picker</a>
@@ -262,7 +262,7 @@ The Syncfusion license that contains the terms and conditions can be found at
             <a href="ej2-blazor-samples/Pages/Inputs/Slider">Range Slider</a>
         </td>
         <td>
-            <a href="ej2-blazor-samples/Pages/Buttons/Button/Switch.cshtml">Toggle Switch Button</a>
+            <a href="ej2-blazor-samples/Pages/Buttons/Button/Switch.razor">Toggle Switch Button</a>
         </td>
     </tr>
     <tr>
diff --git a/ej2-blazor-samples/App.cshtml b/ej2-blazor-samples/App.cshtml
deleted file mode 100644
index 59be8326e..000000000
--- a/ej2-blazor-samples/App.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!--
-    Configuring this here is temporary. Later we'll move the app config
-    into Program.cs, and it won't be necessary to specify AppAssembly.
--->
-<Router AppAssembly=typeof(Program).Assembly />
diff --git a/ej2-blazor-samples/App.razor b/ej2-blazor-samples/App.razor
new file mode 100644
index 000000000..80fb77867
--- /dev/null
+++ b/ej2-blazor-samples/App.razor
@@ -0,0 +1 @@
+<Router AppAssembly="typeof(Program).Assembly" />
diff --git a/ej2-blazor-samples/Pages/Buttons/Button/ButtonGroup.cshtml b/ej2-blazor-samples/Pages/Buttons/Button/ButtonGroup.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Button/ButtonGroup.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Button/ButtonGroup.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/Button/CheckBox.cshtml b/ej2-blazor-samples/Pages/Buttons/Button/CheckBox.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Button/CheckBox.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Button/CheckBox.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/Button/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Buttons/Button/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Button/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Button/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/Button/DropDownButton.cshtml b/ej2-blazor-samples/Pages/Buttons/Button/DropDownButton.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Button/DropDownButton.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Button/DropDownButton.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/Button/ProgressButton.cshtml b/ej2-blazor-samples/Pages/Buttons/Button/ProgressButton.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Button/ProgressButton.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Button/ProgressButton.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/Button/RadioButton.cshtml b/ej2-blazor-samples/Pages/Buttons/Button/RadioButton.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Button/RadioButton.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Button/RadioButton.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/Button/SplitButton.cshtml b/ej2-blazor-samples/Pages/Buttons/Button/SplitButton.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Button/SplitButton.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Button/SplitButton.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/Button/Switch.cshtml b/ej2-blazor-samples/Pages/Buttons/Button/Switch.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Button/Switch.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Button/Switch.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/Chips/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Buttons/Chips/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Buttons/Chips/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Buttons/Chips/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Buttons/SampleList.cs b/ej2-blazor-samples/Pages/Buttons/SampleList.cs
index 1d35ac248..07f82d46d 100644
--- a/ej2-blazor-samples/Pages/Buttons/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Buttons/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Button",
                 Directory = "Buttons/Button",
                 Url = "Buttons/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml"
+                FileName = "DefaultFunctionalities.razor"
             },
            new Sample
             {
@@ -22,7 +22,7 @@ internal partial class SampleConfig
                 Category = "Button",
                 Directory = "Buttons/Button",
                 Url = "Buttons/ButtonGroup",
-                FileName = "ButtonGroup.cshtml"
+                FileName = "ButtonGroup.razor"
             },
            new Sample
             {
@@ -30,7 +30,7 @@ internal partial class SampleConfig
                 Category = "Button",
                 Directory = "Buttons/Button",
                 Url = "Buttons/CheckBox",
-                FileName = "CheckBox.cshtml"
+                FileName = "CheckBox.razor"
             },
            new Sample
             {
@@ -38,7 +38,7 @@ internal partial class SampleConfig
                 Category = "Button",
                 Directory = "Buttons/Button",
                 Url = "Buttons/RadioButton",
-                FileName = "RadioButton.cshtml"
+                FileName = "RadioButton.razor"
             },
            new Sample
             {
@@ -46,7 +46,7 @@ internal partial class SampleConfig
                 Category = "Button",
                 Directory = "Buttons/Button",
                 Url = "Buttons/DropDownButton",
-                FileName = "DropDownButton.cshtml"
+                FileName = "DropDownButton.razor"
             },
            new Sample
             {
@@ -54,7 +54,7 @@ internal partial class SampleConfig
                 Category = "Button",
                 Directory = "Buttons/Button",
                 Url = "Buttons/SplitButton",
-                FileName = "SplitButton.cshtml"
+                FileName = "SplitButton.razor"
             },
            new Sample
             {
@@ -62,7 +62,7 @@ internal partial class SampleConfig
                 Category = "Button",
                 Directory = "Buttons/Button",
                 Url = "Buttons/Switch",
-                FileName = "Switch.cshtml"
+                FileName = "Switch.razor"
             },
            new Sample
             {
@@ -70,7 +70,7 @@ internal partial class SampleConfig
                 Category = "Button",
                 Directory = "Buttons/Button",
                 Url = "Buttons/ProgressButton",
-                FileName = "ProgressButton.cshtml"
+                FileName = "ProgressButton.razor"
             },
         };
         public List<Sample> Chips { get; set; } = new List<Sample>{
@@ -80,7 +80,7 @@ internal partial class SampleConfig
                 Category = "Chips",
                 Directory = "Buttons/Chips",
                 Url = "Chips/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             }
 
diff --git a/ej2-blazor-samples/Pages/Calendars/Calendar/DateRange.cshtml b/ej2-blazor-samples/Pages/Calendars/Calendar/DateRange.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/Calendar/DateRange.cshtml
rename to ej2-blazor-samples/Pages/Calendars/Calendar/DateRange.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/Calendar/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Calendars/Calendar/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/Calendar/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Calendars/Calendar/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/Calendar/MultiSelection.cshtml b/ej2-blazor-samples/Pages/Calendars/Calendar/MultiSelection.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/Calendar/MultiSelection.cshtml
rename to ej2-blazor-samples/Pages/Calendars/Calendar/MultiSelection.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DatePicker/DateRange.cshtml b/ej2-blazor-samples/Pages/Calendars/DatePicker/DateRange.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DatePicker/DateRange.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DatePicker/DateRange.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DatePicker/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Calendars/DatePicker/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DatePicker/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DatePicker/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DatePicker/Format.cshtml b/ej2-blazor-samples/Pages/Calendars/DatePicker/Format.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DatePicker/Format.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DatePicker/Format.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DateRangePicker/DateRange.cshtml b/ej2-blazor-samples/Pages/Calendars/DateRangePicker/DateRange.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DateRangePicker/DateRange.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DateRangePicker/DateRange.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DateRangePicker/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Calendars/DateRangePicker/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DateRangePicker/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DateRangePicker/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DateRangePicker/Format.cshtml b/ej2-blazor-samples/Pages/Calendars/DateRangePicker/Format.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DateRangePicker/Format.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DateRangePicker/Format.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DateTimePicker/DateTimeRange.cshtml b/ej2-blazor-samples/Pages/Calendars/DateTimePicker/DateTimeRange.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DateTimePicker/DateTimeRange.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DateTimePicker/DateTimeRange.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DateTimePicker/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Calendars/DateTimePicker/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DateTimePicker/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DateTimePicker/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/DateTimePicker/Format.cshtml b/ej2-blazor-samples/Pages/Calendars/DateTimePicker/Format.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/DateTimePicker/Format.cshtml
rename to ej2-blazor-samples/Pages/Calendars/DateTimePicker/Format.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/SampleList.cs b/ej2-blazor-samples/Pages/Calendars/SampleList.cs
index bd36b6c48..d6f64e2df 100644
--- a/ej2-blazor-samples/Pages/Calendars/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Calendars/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Calendar",
                 Directory = "Calendars/Calendar",
                 Url = "Calendar/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
              new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "Calendar",
                 Directory = "Calendars/Calendar",
                 Url = "Calendar/DateRange",
-                FileName = "DateRange.cshtml",
+                FileName = "DateRange.razor",
                 Type = SampleType.New,
             },
               new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "Calendar",
                 Directory = "Calendars/Calendar",
                 Url = "Calendar/MultiSelection",
-                FileName = "MultiSelection.cshtml",
+                FileName = "MultiSelection.razor",
                 Type = SampleType.New,
             }
         };
@@ -44,7 +44,7 @@ internal partial class SampleConfig
                 Category = "DatePicker",
                 Directory = "Calendars/DatePicker",
                 Url = "DatePicker/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -53,7 +53,7 @@ internal partial class SampleConfig
                 Category = "DatePicker",
                 Directory = "Calendars/DatePicker",
                 Url = "DatePicker/DateRange",
-                FileName = "DateRange.cshtml",
+                FileName = "DateRange.razor",
                 Type = SampleType.New,
             },
              new Sample
@@ -62,7 +62,7 @@ internal partial class SampleConfig
                 Category = "DatePicker",
                 Directory = "Calendars/DatePicker",
                 Url = "DatePicker/Format",
-                FileName = "Format.cshtml",
+                FileName = "Format.razor",
                 Type = SampleType.New,
             }
         };
@@ -74,7 +74,7 @@ internal partial class SampleConfig
                 Category = "DateTimePicker",
                 Directory = "Calendars/DateTimePicker",
                 Url = "DateTimePicker/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -83,7 +83,7 @@ internal partial class SampleConfig
                 Category = "DateTimePicker",
                 Directory = "Calendars/DateTimePicker",
                 Url = "DateTimePicker/DateTimeRange",
-                FileName = "DateTimeRange.cshtml",
+                FileName = "DateTimeRange.razor",
                 Type = SampleType.New,
             },
              new Sample
@@ -92,7 +92,7 @@ internal partial class SampleConfig
                 Category = "DateTimePicker",
                 Directory = "Calendars/DateTimePicker",
                 Url = "DateTimePicker/Format",
-                FileName = "Format.cshtml",
+                FileName = "Format.razor",
                 Type = SampleType.New,
             },
         };
@@ -105,7 +105,7 @@ internal partial class SampleConfig
                 Category = "TimePicker",
                 Directory = "Calendars/TimePicker",
                 Url = "TimePicker/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
              new Sample
@@ -114,7 +114,7 @@ internal partial class SampleConfig
                 Category = "TimePicker",
                 Directory = "Calendars/TimePicker",
                 Url = "TimePicker/Format",
-                FileName = "Format.cshtml",
+                FileName = "Format.razor",
                 Type = SampleType.New,
             }
         };
@@ -127,7 +127,7 @@ internal partial class SampleConfig
                 Category = "DateRangePicker",
                 Directory = "Calendars/DateRangePicker",
                 Url = "DateRangePicker/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -136,7 +136,7 @@ internal partial class SampleConfig
                 Category = "DateRangePicker",
                 Directory = "Calendars/DateRangePicker",
                 Url = "DateRangePicker/DateRange",
-                FileName = "DateRange.cshtml",
+                FileName = "DateRange.razor",
                 Type = SampleType.New,
             },
              new Sample
@@ -145,7 +145,7 @@ internal partial class SampleConfig
                 Category = "DateRangePicker",
                 Directory = "Calendars/DateRangePicker",
                 Url = "DateRangePicker/Format",
-                FileName = "Format.cshtml",
+                FileName = "Format.razor",
                 Type = SampleType.New,
             }
         };
diff --git a/ej2-blazor-samples/Pages/Calendars/TimePicker/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Calendars/TimePicker/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/TimePicker/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Calendars/TimePicker/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Calendars/TimePicker/Format.cshtml b/ej2-blazor-samples/Pages/Calendars/TimePicker/Format.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Calendars/TimePicker/Format.cshtml
rename to ej2-blazor-samples/Pages/Calendars/TimePicker/Format.razor
diff --git a/ej2-blazor-samples/Pages/Charts/Chart/Bar.cshtml b/ej2-blazor-samples/Pages/Charts/Chart/Bar.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/Chart/Bar.cshtml
rename to ej2-blazor-samples/Pages/Charts/Chart/Bar.razor
diff --git a/ej2-blazor-samples/Pages/Charts/Chart/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Charts/Chart/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/Chart/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Charts/Chart/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Charts/Chart/Pie.cshtml b/ej2-blazor-samples/Pages/Charts/Chart/Pie.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/Chart/Pie.cshtml
rename to ej2-blazor-samples/Pages/Charts/Chart/Pie.razor
diff --git a/ej2-blazor-samples/Pages/Charts/Chart/Polar.cshtml b/ej2-blazor-samples/Pages/Charts/Chart/Polar.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/Chart/Polar.cshtml
rename to ej2-blazor-samples/Pages/Charts/Chart/Polar.razor
diff --git a/ej2-blazor-samples/Pages/Charts/Chart/Trackball.cshtml b/ej2-blazor-samples/Pages/Charts/Chart/Trackball.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/Chart/Trackball.cshtml
rename to ej2-blazor-samples/Pages/Charts/Chart/Trackball.razor
diff --git a/ej2-blazor-samples/Pages/Charts/RangeNavigator/LightWeight.cshtml b/ej2-blazor-samples/Pages/Charts/RangeNavigator/LightWeight.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/RangeNavigator/LightWeight.cshtml
rename to ej2-blazor-samples/Pages/Charts/RangeNavigator/LightWeight.razor
diff --git a/ej2-blazor-samples/Pages/Charts/RangeNavigator/RangeNavigator.cshtml b/ej2-blazor-samples/Pages/Charts/RangeNavigator/RangeNavigator.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/RangeNavigator/RangeNavigator.cshtml
rename to ej2-blazor-samples/Pages/Charts/RangeNavigator/RangeNavigator.razor
diff --git a/ej2-blazor-samples/Pages/Charts/SampleList.cs b/ej2-blazor-samples/Pages/Charts/SampleList.cs
index 7ad09f1ce..b5b8736e0 100644
--- a/ej2-blazor-samples/Pages/Charts/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Charts/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Chart",
                 Directory = "Charts/Chart",
                 Url = "Charts/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "Chart",
                 Directory = "Charts/Chart",
                 Url = "Charts/bar",
-                FileName = "Bar.cshtml",
+                FileName = "Bar.razor",
                 Type = SampleType.New
             },
              new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "Chart",
                 Directory = "Charts/Chart",
                 Url = "Charts/Pie",
-                FileName = "Pie.cshtml",
+                FileName = "Pie.razor",
                 Type = SampleType.New
             },
               new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "Chart",
                 Directory = "Charts/Chart",
                 Url = "Charts/polar",
-                FileName = "Polar.cshtml",
+                FileName = "Polar.razor",
                 Type = SampleType.New
             },
                new Sample
@@ -50,7 +50,7 @@ internal partial class SampleConfig
                 Category = "Chart",
                 Directory = "Charts/Chart",
                 Url = "Charts/Trackball",
-                FileName = "Trackball.cshtml",
+                FileName = "Trackball.razor",
                 Type = SampleType.New
             }
         };
@@ -62,7 +62,7 @@ internal partial class SampleConfig
                 Category = "Range Navigator",
                 Directory = "Charts/RangeNavigator",
                 Url = "Charts/RangeNavigator",
-                FileName = "RangeNavigator.cshtml",
+                FileName = "RangeNavigator.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -71,7 +71,7 @@ internal partial class SampleConfig
                 Category = "Range Navigator",
                 Directory = "Charts/RangeNavigator",
                 Url = "Charts/LightWeight",
-                FileName = "LightWeight.cshtml",
+                FileName = "LightWeight.razor",
                 Type = SampleType.New
             }
         };
@@ -83,7 +83,7 @@ internal partial class SampleConfig
                 Category = "Sparkline",
                 Directory = "Charts/Sparkline",
                 Url = "Sparkline/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -92,7 +92,7 @@ internal partial class SampleConfig
                 Category = "Sparkline",
                 Directory = "Charts/Sparkline",
                 Url = "Sparkline/SeriesType",
-                FileName = "SeriesType.cshtml",
+                FileName = "SeriesType.razor",
                 Type = SampleType.New,
             }
         };
@@ -104,7 +104,7 @@ internal partial class SampleConfig
                 Category = "SmithChart",
                 Directory = "Charts/SmithChart",
                 Url = "SmithChart/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -113,7 +113,7 @@ internal partial class SampleConfig
                 Category = "SmithChart",
                 Directory = "Charts/SmithChart",
                 Url = "SmithChart/Customization",
-                FileName = "Customization.cshtml",
+                FileName = "Customization.razor",
                 Type = SampleType.New
             }
         };
@@ -125,7 +125,7 @@ internal partial class SampleConfig
                 Category = "Stock Chart",
                 Directory = "Charts/StockChart",
                 Url = "Charts/StockChart",
-                FileName = "StockChart.cshtml",
+                FileName = "StockChart.razor",
                 Type = SampleType.New
             },
              new Sample
@@ -134,7 +134,7 @@ internal partial class SampleConfig
                 Category = "Stock Chart",
                 Directory = "Charts/StockChart",
                 Url = "Charts/HideSelector",
-                FileName = "HideSelector.cshtml",
+                FileName = "HideSelector.razor",
                 Type = SampleType.New
             }
         };		
diff --git a/ej2-blazor-samples/Pages/Charts/SmithChart/Customization.cshtml b/ej2-blazor-samples/Pages/Charts/SmithChart/Customization.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/SmithChart/Customization.cshtml
rename to ej2-blazor-samples/Pages/Charts/SmithChart/Customization.razor
diff --git a/ej2-blazor-samples/Pages/Charts/SmithChart/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Charts/SmithChart/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/SmithChart/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Charts/SmithChart/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Charts/Sparkline/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Charts/Sparkline/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/Sparkline/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Charts/Sparkline/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Charts/Sparkline/SeriesType.cshtml b/ej2-blazor-samples/Pages/Charts/Sparkline/SeriesType.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/Sparkline/SeriesType.cshtml
rename to ej2-blazor-samples/Pages/Charts/Sparkline/SeriesType.razor
diff --git a/ej2-blazor-samples/Pages/Charts/StockChart/HideSelector.cshtml b/ej2-blazor-samples/Pages/Charts/StockChart/HideSelector.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/StockChart/HideSelector.cshtml
rename to ej2-blazor-samples/Pages/Charts/StockChart/HideSelector.razor
diff --git a/ej2-blazor-samples/Pages/Charts/StockChart/StockChart.cshtml b/ej2-blazor-samples/Pages/Charts/StockChart/StockChart.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Charts/StockChart/StockChart.cshtml
rename to ej2-blazor-samples/Pages/Charts/StockChart/StockChart.razor
diff --git a/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Compass.cshtml b/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Compass.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Compass.cshtml
rename to ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Compass.razor
diff --git a/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Customization.cshtml b/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Customization.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Customization.cshtml
rename to ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Customization.razor
diff --git a/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/CircularGauge/CircularGauge/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/CircularGauge/CircularGauge/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/PointerImage.cshtml b/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/PointerImage.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/CircularGauge/CircularGauge/PointerImage.cshtml
rename to ej2-blazor-samples/Pages/CircularGauge/CircularGauge/PointerImage.razor
diff --git a/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Tooltip.cshtml b/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Tooltip.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Tooltip.cshtml
rename to ej2-blazor-samples/Pages/CircularGauge/CircularGauge/Tooltip.razor
diff --git a/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/labels.cshtml b/ej2-blazor-samples/Pages/CircularGauge/CircularGauge/labels.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/CircularGauge/CircularGauge/labels.cshtml
rename to ej2-blazor-samples/Pages/CircularGauge/CircularGauge/labels.razor
diff --git a/ej2-blazor-samples/Pages/CircularGauge/SampleList.cs b/ej2-blazor-samples/Pages/CircularGauge/SampleList.cs
index ce5b016b4..ea237ae41 100644
--- a/ej2-blazor-samples/Pages/CircularGauge/SampleList.cs
+++ b/ej2-blazor-samples/Pages/CircularGauge/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "CircularGauge",
                 Directory = "CircularGauge/CircularGauge",
                 Url = "CircularGauge/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "CircularGauge",
                 Directory = "CircularGauge/CircularGauge",
                 Url = "CircularGauge/Labels",
-                FileName = "Labels.cshtml",
+                FileName = "Labels.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "CircularGauge",
                 Directory = "CircularGauge/CircularGauge",
                 Url = "CircularGauge/Customization",
-                FileName = "Customization.cshtml",
+                FileName = "Customization.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "CircularGauge",
                 Directory = "CircularGauge/CircularGauge",
                 Url = "CircularGauge/PointerImage",
-                FileName = "PointerImage.cshtml",
+                FileName = "PointerImage.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -50,7 +50,7 @@ internal partial class SampleConfig
                 Category = "CircularGauge",
                 Directory = "CircularGauge/CircularGauge",
                 Url = "CircularGauge/Tooltip",
-                FileName = "Tooltip.cshtml",
+                FileName = "Tooltip.razor",
                 Type = SampleType.New
             }
         };      
diff --git a/ej2-blazor-samples/Pages/Diagrams/Diagram/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Diagrams/Diagram/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Diagrams/Diagram/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Diagrams/Diagram/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Diagrams/Diagram/HierarchicalModel.cshtml b/ej2-blazor-samples/Pages/Diagrams/Diagram/HierarchicalModel.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Diagrams/Diagram/HierarchicalModel.cshtml
rename to ej2-blazor-samples/Pages/Diagrams/Diagram/HierarchicalModel.razor
diff --git a/ej2-blazor-samples/Pages/Diagrams/Diagram/OrganizationModel.cshtml b/ej2-blazor-samples/Pages/Diagrams/Diagram/OrganizationModel.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Diagrams/Diagram/OrganizationModel.cshtml
rename to ej2-blazor-samples/Pages/Diagrams/Diagram/OrganizationModel.razor
diff --git a/ej2-blazor-samples/Pages/Diagrams/Diagram/Shapes.cshtml b/ej2-blazor-samples/Pages/Diagrams/Diagram/Shapes.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Diagrams/Diagram/Shapes.cshtml
rename to ej2-blazor-samples/Pages/Diagrams/Diagram/Shapes.razor
diff --git a/ej2-blazor-samples/Pages/Diagrams/SampleList.cs b/ej2-blazor-samples/Pages/Diagrams/SampleList.cs
index e40798707..318502443 100644
--- a/ej2-blazor-samples/Pages/Diagrams/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Diagrams/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Diagram",
                 Directory = "Diagrams/Diagram",
                 Url = "Diagrams/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
              new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "Diagram",
                 Directory = "Diagrams/Diagram",
                 Url = "Diagrams/Shapes",
-                FileName = "Shapes.cshtml",
+                FileName = "Shapes.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "Diagram",
                 Directory = "Diagrams/Diagram",
                 Url = "Diagrams/HierarchicalModel",
-                FileName = "HierarchicalModel.cshtml",
+                FileName = "HierarchicalModel.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "Diagram",
                 Directory = "Diagrams/Diagram",
                 Url = "Diagrams/OrganizationModel",
-                FileName = "OrganizationModel.cshtml",
+                FileName = "OrganizationModel.razor",
                 Type = SampleType.New
             }
         };      
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/BulletsAndNumbering.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/BulletsAndNumbering.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/BulletsAndNumbering.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/BulletsAndNumbering.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/CharacterFormat.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/CharacterFormat.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/CharacterFormat.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/CharacterFormat.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/HeadersAndFooters.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/HeadersAndFooters.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/HeadersAndFooters.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/HeadersAndFooters.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/HyperlinksAndBookmarks.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/HyperlinksAndBookmarks.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/HyperlinksAndBookmarks.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/HyperlinksAndBookmarks.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/ParagraphFormat.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/ParagraphFormat.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/ParagraphFormat.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/ParagraphFormat.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/SectionFormat.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/SectionFormat.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/SectionFormat.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/SectionFormat.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/Styles.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/Styles.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/Styles.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/Styles.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/TableFormat.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/TableFormat.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/TableFormat.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/TableFormat.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/TableOfContents.cshtml b/ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/TableOfContents.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/TableOfContents.cshtml
rename to ej2-blazor-samples/Pages/DocumentEditor/DocumentEditor/TableOfContents.razor
diff --git a/ej2-blazor-samples/Pages/DocumentEditor/SampleList.cs b/ej2-blazor-samples/Pages/DocumentEditor/SampleList.cs
index 17ea04d1e..b0293d306 100644
--- a/ej2-blazor-samples/Pages/DocumentEditor/SampleList.cs
+++ b/ej2-blazor-samples/Pages/DocumentEditor/SampleList.cs
@@ -15,7 +15,7 @@ internal partial class SampleConfig
                 Category = "DocumentEditor",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -24,7 +24,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/CharacterFormat",
-                FileName = "CharacterFormat.cshtml",
+                FileName = "CharacterFormat.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -33,7 +33,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/ParagraphFormat",
-                FileName = "ParagraphFormat.cshtml",
+                FileName = "ParagraphFormat.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -42,7 +42,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/Styles",
-                FileName = "Styles.cshtml",
+                FileName = "Styles.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -51,7 +51,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/BulletsAndNumbering",
-                FileName = "BulletsAndNumbering.cshtml",
+                FileName = "BulletsAndNumbering.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -60,7 +60,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/HyperlinksAndBookmarks",
-                FileName = "HyperlinksAndBookmarks.cshtml",
+                FileName = "HyperlinksAndBookmarks.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -69,7 +69,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/TableFormat",
-                FileName = "TableFormat.cshtml",
+                FileName = "TableFormat.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -78,7 +78,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/SectionFormat",
-                FileName = "SectionFormat.cshtml",
+                FileName = "SectionFormat.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -87,7 +87,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/HeadersAndFooters",
-                FileName = "HeadersAndFooters.cshtml",
+                FileName = "HeadersAndFooters.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -96,7 +96,7 @@ internal partial class SampleConfig
                 Category = "Editing Features",
                 Directory = "DocumentEditor/DocumentEditor",
                 Url = "DocumentEditor/TableOfContents",
-                FileName = "TableOfContents.cshtml",
+                FileName = "TableOfContents.razor",
                 Type = SampleType.New
             }
 
diff --git a/ej2-blazor-samples/Pages/DropDowns/AutoComplete/DataBinding.cshtml b/ej2-blazor-samples/Pages/DropDowns/AutoComplete/DataBinding.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/AutoComplete/DataBinding.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/AutoComplete/DataBinding.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/AutoComplete/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/DropDowns/AutoComplete/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/AutoComplete/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/AutoComplete/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/ComboBox/DataBinding.cshtml b/ej2-blazor-samples/Pages/DropDowns/ComboBox/DataBinding.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/ComboBox/DataBinding.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/ComboBox/DataBinding.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/ComboBox/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/DropDowns/ComboBox/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/ComboBox/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/ComboBox/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/ComboBox/Filtering.cshtml b/ej2-blazor-samples/Pages/DropDowns/ComboBox/Filtering.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/ComboBox/Filtering.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/ComboBox/Filtering.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/DropDownList/DataBinding.cshtml b/ej2-blazor-samples/Pages/DropDowns/DropDownList/DataBinding.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/DropDownList/DataBinding.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/DropDownList/DataBinding.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/DropDownList/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/DropDowns/DropDownList/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/DropDownList/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/DropDownList/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/DropDownList/Filtering.cshtml b/ej2-blazor-samples/Pages/DropDowns/DropDownList/Filtering.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/DropDownList/Filtering.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/DropDownList/Filtering.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/ListBox/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/DropDowns/ListBox/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/ListBox/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/ListBox/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/MultiSelect/DataBinding.cshtml b/ej2-blazor-samples/Pages/DropDowns/MultiSelect/DataBinding.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/MultiSelect/DataBinding.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/MultiSelect/DataBinding.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/MultiSelect/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/DropDowns/MultiSelect/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/MultiSelect/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/MultiSelect/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/MultiSelect/Filtering.cshtml b/ej2-blazor-samples/Pages/DropDowns/MultiSelect/Filtering.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/DropDowns/MultiSelect/Filtering.cshtml
rename to ej2-blazor-samples/Pages/DropDowns/MultiSelect/Filtering.razor
diff --git a/ej2-blazor-samples/Pages/DropDowns/SampleList.cs b/ej2-blazor-samples/Pages/DropDowns/SampleList.cs
index 1cba9eae5..598d0bf41 100644
--- a/ej2-blazor-samples/Pages/DropDowns/SampleList.cs
+++ b/ej2-blazor-samples/Pages/DropDowns/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "DropDownList",
                 Directory = "DropDowns/DropDownList",
                 Url = "DropDownList/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "DropDownList",
                 Directory = "DropDowns/DropDownList",
                 Url = "DropDownList/DataBinding",
-                FileName = "DataBinding.cshtml",
+                FileName = "DataBinding.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "DropDownList",
                 Directory = "DropDowns/DropDownList",
                 Url = "DropDownList/Filtering",
-                FileName = "Filtering.cshtml",
+                FileName = "Filtering.razor",
                 Type = SampleType.New,
             }
         };
@@ -44,7 +44,7 @@ internal partial class SampleConfig
                 Category = "ComboBox",
                 Directory = "DropDowns/ComboBox",
                 Url = "ComboBox/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
               new Sample
@@ -53,7 +53,7 @@ internal partial class SampleConfig
                 Category = "ComboBox",
                 Directory = "DropDowns/ComboBox",
                 Url = "ComboBox/DataBinding",
-                FileName = "DataBinding.cshtml",
+                FileName = "DataBinding.razor",
                 Type = SampleType.New,
             },
              new Sample
@@ -62,7 +62,7 @@ internal partial class SampleConfig
                 Category = "ComboBox",
                 Directory = "DropDowns/ComboBox",
                 Url = "ComboBox/Filtering",
-                FileName = "Filtering.cshtml",
+                FileName = "Filtering.razor",
                 Type = SampleType.New,
             }
         };
@@ -74,7 +74,7 @@ internal partial class SampleConfig
                 Category = "AutoComplete",
                 Directory = "DropDowns/AutoComplete",
                 Url = "AutoComplete/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -83,7 +83,7 @@ internal partial class SampleConfig
                 Category = "AutoComplete",
                 Directory = "DropDowns/AutoComplete",
                 Url = "AutoComplete/DataBinding",
-                FileName = "DataBinding.cshtml",
+                FileName = "DataBinding.razor",
                 Type = SampleType.New,
             }
         };
@@ -95,7 +95,7 @@ internal partial class SampleConfig
                 Category = "MultiSelect",
                 Directory = "DropDowns/MultiSelect",
                 Url = "MultiSelect/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -104,7 +104,7 @@ internal partial class SampleConfig
                 Category = "MultiSelect",
                 Directory = "DropDowns/MultiSelect",
                 Url = "MultiSelect/DataBinding",
-                FileName = "DataBinding.cshtml",
+                FileName = "DataBinding.razor",
                 Type = SampleType.New,
             },
              new Sample
@@ -113,7 +113,7 @@ internal partial class SampleConfig
                 Category = "MultiSelect",
                 Directory = "DropDowns/MultiSelect",
                 Url = "MultiSelect/Filtering",
-                FileName = "Filtering.cshtml",
+                FileName = "Filtering.razor",
                 Type = SampleType.New,
             }
         };
@@ -125,7 +125,7 @@ internal partial class SampleConfig
                 Category = "ListBox",
                 Directory = "DropDowns/ListBox",
                 Url = "ListBox/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
         };
diff --git a/ej2-blazor-samples/Pages/Editors/InPlaceEditor/DropDownComponents.cshtml b/ej2-blazor-samples/Pages/Editors/InPlaceEditor/DropDownComponents.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Editors/InPlaceEditor/DropDownComponents.cshtml
rename to ej2-blazor-samples/Pages/Editors/InPlaceEditor/DropDownComponents.razor
diff --git a/ej2-blazor-samples/Pages/Editors/InPlaceEditor/Overview.cshtml b/ej2-blazor-samples/Pages/Editors/InPlaceEditor/Overview.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Editors/InPlaceEditor/Overview.cshtml
rename to ej2-blazor-samples/Pages/Editors/InPlaceEditor/Overview.razor
diff --git a/ej2-blazor-samples/Pages/Editors/SampleList.cs b/ej2-blazor-samples/Pages/Editors/SampleList.cs
index 202df5dc1..7e5391ee9 100644
--- a/ej2-blazor-samples/Pages/Editors/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Editors/SampleList.cs
@@ -14,16 +14,16 @@ internal partial class SampleConfig
                 Category = "InPlaceEditor",
                 Directory = "Editors/InPlaceEditor",
                 Url = "Editors/Overview",
-                FileName = "Overview.cshtml",
+                FileName = "Overview.razor",
                 Type = SampleType.New
             },
             new Sample
             {
-                Name = "Dropdown components",
+                Name = "DropDownComponents",
                 Category = "InPlaceEditor",
                 Directory = "Editors/InPlaceEditor",
                 Url = "Editors/DropDownComponents",
-                FileName = "DropDownComponents.cshtml",
+                FileName = "DropDownComponents.razor",
                 Type = SampleType.New
             }
         };
diff --git a/ej2-blazor-samples/Pages/Forms/QueryBuilder/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Forms/QueryBuilder/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Forms/QueryBuilder/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Forms/QueryBuilder/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Forms/SampleList.cs b/ej2-blazor-samples/Pages/Forms/SampleList.cs
index c70b539fc..764de30fc 100644
--- a/ej2-blazor-samples/Pages/Forms/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Forms/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "QueryBuilder",
                 Directory = "Forms/QueryBuilder",
                 Url = "QueryBuilder/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml"
+                FileName = "DefaultFunctionalities.razor"
             }
         };
     }
diff --git a/ej2-blazor-samples/Pages/Gantt/Gantt/Baseline.cshtml b/ej2-blazor-samples/Pages/Gantt/Gantt/Baseline.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Gantt/Gantt/Baseline.cshtml
rename to ej2-blazor-samples/Pages/Gantt/Gantt/Baseline.razor
diff --git a/ej2-blazor-samples/Pages/Gantt/Gantt/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Gantt/Gantt/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Gantt/Gantt/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Gantt/Gantt/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Gantt/Gantt/Editing.cshtml b/ej2-blazor-samples/Pages/Gantt/Gantt/Editing.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Gantt/Gantt/Editing.cshtml
rename to ej2-blazor-samples/Pages/Gantt/Gantt/Editing.razor
diff --git a/ej2-blazor-samples/Pages/Gantt/SampleList.cs b/ej2-blazor-samples/Pages/Gantt/SampleList.cs
index ae61ca883..1f3930f37 100644
--- a/ej2-blazor-samples/Pages/Gantt/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Gantt/SampleList.cs
@@ -15,7 +15,7 @@ internal partial class SampleConfig
                 Category = "Gantt",
                 Directory = "Gantt/Gantt",
                 Url = "Gantt/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -24,7 +24,7 @@ internal partial class SampleConfig
                 Category = "Gantt",
                 Directory = "Gantt/Editing",
                 Url = "Gantt/Editing",
-                FileName = "Editing.cshtml",
+                FileName = "Editing.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -33,7 +33,7 @@ internal partial class SampleConfig
                 Category = "Gantt",
                 Directory = "Gantt/Gantt",
                 Url = "Gantt/Baseline",
-                FileName = "FilBaselinetering.cshtml",
+                FileName = "FilBaselinetering.razor",
                 Type = SampleType.New
             }
         };
diff --git a/ej2-blazor-samples/Pages/Grid/DataGrid/CheckboxSelection.cshtml b/ej2-blazor-samples/Pages/Grid/DataGrid/CheckboxSelection.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grid/DataGrid/CheckboxSelection.cshtml
rename to ej2-blazor-samples/Pages/Grid/DataGrid/CheckboxSelection.razor
diff --git a/ej2-blazor-samples/Pages/Grid/DataGrid/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Grid/DataGrid/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grid/DataGrid/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Grid/DataGrid/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Grid/DataGrid/Filtering.cshtml b/ej2-blazor-samples/Pages/Grid/DataGrid/Filtering.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grid/DataGrid/Filtering.cshtml
rename to ej2-blazor-samples/Pages/Grid/DataGrid/Filtering.razor
diff --git a/ej2-blazor-samples/Pages/Grid/DataGrid/InlineEditing.cshtml b/ej2-blazor-samples/Pages/Grid/DataGrid/InlineEditing.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grid/DataGrid/InlineEditing.cshtml
rename to ej2-blazor-samples/Pages/Grid/DataGrid/InlineEditing.razor
diff --git a/ej2-blazor-samples/Pages/Grid/DataGrid/Sorting.cshtml b/ej2-blazor-samples/Pages/Grid/DataGrid/Sorting.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grid/DataGrid/Sorting.cshtml
rename to ej2-blazor-samples/Pages/Grid/DataGrid/Sorting.razor
diff --git a/ej2-blazor-samples/Pages/Grid/SampleList.cs b/ej2-blazor-samples/Pages/Grid/SampleList.cs
index 105c85f16..ac97f4234 100644
--- a/ej2-blazor-samples/Pages/Grid/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Grid/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "DataGrid",
                 Directory = "Grid/DataGrid",
                 Url = "Grid/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "DataGrid",
                 Directory = "Grid/DataGrid",
                 Url = "Grid/Sorting",
-                FileName = "Sorting.cshtml",
+                FileName = "Sorting.razor",
                 Type = SampleType.New
             },              
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "DataGrid",
                 Directory = "Grid/DataGrid",
                 Url = "Grid/Filtering",
-                FileName = "Filtering.cshtml",
+                FileName = "Filtering.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "DataGrid",
                 Directory = "Grid/DataGrid",
                 Url = "Grid/InlineEditing",
-                FileName = "InlineEditing.cshtml",
+                FileName = "InlineEditing.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -50,7 +50,7 @@ internal partial class SampleConfig
                 Category = "DataGrid",
                 Directory = "Grid/DataGrid",
                 Url = "Grid/CheckboxSelection",
-                FileName = "CheckboxSelection.cshtml",
+                FileName = "CheckboxSelection.razor",
                 Type = SampleType.New
             }
         };      
diff --git a/ej2-blazor-samples/Pages/Grids/SampleList.cs b/ej2-blazor-samples/Pages/Grids/SampleList.cs
index 478b58cc9..188e3f994 100644
--- a/ej2-blazor-samples/Pages/Grids/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Grids/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "TreeGrid",
                 Directory = "Grids/TreeGrid",
                 Url = "TreeGrid/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "TreeGrid",
                 Directory = "Grids/TreeGrid",
                 Url = "TreeGrid/DefaultFiltering",
-                FileName = "DefaultFiltering.cshtml",
+                FileName = "DefaultFiltering.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "TreeGrid",
                 Directory = "Grids/TreeGrid",
                 Url = "TreeGrid/Editing",
-                FileName = "Editing.cshtml",
+                FileName = "Editing.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "TreeGrid",
                 Directory = "Grids/TreeGrid",
                 Url = "TreeGrid/CheckboxColumn",
-                FileName = "CheckboxColumn.cshtml",
+                FileName = "CheckboxColumn.razor",
                 Type = SampleType.New,
             }
         };
diff --git a/ej2-blazor-samples/Pages/Grids/TreeGrid/CheckboxColumn.cshtml b/ej2-blazor-samples/Pages/Grids/TreeGrid/CheckboxColumn.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grids/TreeGrid/CheckboxColumn.cshtml
rename to ej2-blazor-samples/Pages/Grids/TreeGrid/CheckboxColumn.razor
diff --git a/ej2-blazor-samples/Pages/Grids/TreeGrid/DefaultFiltering.cshtml b/ej2-blazor-samples/Pages/Grids/TreeGrid/DefaultFiltering.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grids/TreeGrid/DefaultFiltering.cshtml
rename to ej2-blazor-samples/Pages/Grids/TreeGrid/DefaultFiltering.razor
diff --git a/ej2-blazor-samples/Pages/Grids/TreeGrid/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Grids/TreeGrid/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grids/TreeGrid/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Grids/TreeGrid/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Grids/TreeGrid/Editing.cshtml b/ej2-blazor-samples/Pages/Grids/TreeGrid/Editing.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Grids/TreeGrid/Editing.cshtml
rename to ej2-blazor-samples/Pages/Grids/TreeGrid/Editing.razor
diff --git a/ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/Emptypoints.cshtml b/ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/Emptypoints.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/Emptypoints.cshtml
rename to ej2-blazor-samples/Pages/HeatMapChart/HeatMapChart/Emptypoints.razor
diff --git a/ej2-blazor-samples/Pages/HeatMapChart/SampleList.cs b/ej2-blazor-samples/Pages/HeatMapChart/SampleList.cs
index 117d62d52..c9d4ac507 100644
--- a/ej2-blazor-samples/Pages/HeatMapChart/SampleList.cs
+++ b/ej2-blazor-samples/Pages/HeatMapChart/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "HeatMapChart",
                 Directory = "HeatMapChart/HeatMapChart",
                 Url = "HeatMapChart/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "HeatMapChart",
                 Directory = "HeatMapChart/HeatMapChart",
                 Url = "HeatMapChart/Emptypoints",
-                FileName = "Emptypoints.cshtml",
+                FileName = "Emptypoints.razor",
                 Type = SampleType.New
             }
         };    
diff --git a/ej2-blazor-samples/Pages/Index.cshtml b/ej2-blazor-samples/Pages/Index.razor
similarity index 77%
rename from ej2-blazor-samples/Pages/Index.cshtml
rename to ej2-blazor-samples/Pages/Index.razor
index 73bca795c..d17b1817b 100644
--- a/ej2-blazor-samples/Pages/Index.cshtml
+++ b/ej2-blazor-samples/Pages/Index.razor
@@ -2,8 +2,9 @@
 
 @using ej2_blazor_samples
 @using Newtonsoft.Json
+@using Microsoft.AspNetCore.Components
 
-@inject Microsoft.AspNetCore.Components.Services.IUriHelper UriHelper
+@inject Microsoft.AspNetCore.Components.IUriHelper UriHelper
 
 <div class="sb-loading">
     <svg class="circular" height="40" width="40">
diff --git a/ej2-blazor-samples/Pages/Inputs/ColorPicker/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Inputs/ColorPicker/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/ColorPicker/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Inputs/ColorPicker/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/MaskedTextBox/CustomMask.cshtml b/ej2-blazor-samples/Pages/Inputs/MaskedTextBox/CustomMask.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/MaskedTextBox/CustomMask.cshtml
rename to ej2-blazor-samples/Pages/Inputs/MaskedTextBox/CustomMask.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/MaskedTextBox/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Inputs/MaskedTextBox/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/MaskedTextBox/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Inputs/MaskedTextBox/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/NumericTextBox/CustomFormat.cshtml b/ej2-blazor-samples/Pages/Inputs/NumericTextBox/CustomFormat.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/NumericTextBox/CustomFormat.cshtml
rename to ej2-blazor-samples/Pages/Inputs/NumericTextBox/CustomFormat.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/NumericTextBox/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Inputs/NumericTextBox/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/NumericTextBox/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Inputs/NumericTextBox/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/NumericTextBox/RestrictDecimals.cshtml b/ej2-blazor-samples/Pages/Inputs/NumericTextBox/RestrictDecimals.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/NumericTextBox/RestrictDecimals.cshtml
rename to ej2-blazor-samples/Pages/Inputs/NumericTextBox/RestrictDecimals.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/SampleList.cs b/ej2-blazor-samples/Pages/Inputs/SampleList.cs
index 130a84ee7..d3e172d30 100644
--- a/ej2-blazor-samples/Pages/Inputs/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Inputs/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "TextBox",
                 Directory = "Inputs/TextBox",
                 Url = "TextBox/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml"
+                FileName = "DefaultFunctionalities.razor"
             }
         };
 
@@ -26,7 +26,7 @@ internal partial class SampleConfig
                 Category = "ColorPicker",
                 Directory = "Inputs/ColorPicker",
                 Url = "ColorPicker/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml"
+                FileName = "DefaultFunctionalities.razor"
             }
         };
 
@@ -37,7 +37,7 @@ internal partial class SampleConfig
                 Category = "MaskedTextBox",
                 Directory = "Inputs/MaskedTextBox",
                 Url = "MaskedTextBox/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml"
+                FileName = "DefaultFunctionalities.razor"
             },
              new Sample
             {
@@ -45,7 +45,7 @@ internal partial class SampleConfig
                 Category = "MaskedTextBox",
                 Directory = "Inputs/MaskedTextBox",
                 Url = "MaskedTextBox/CustomMask",
-                FileName = "CustomMask.cshtml"
+                FileName = "CustomMask.razor"
             }
         };
 
@@ -56,7 +56,7 @@ internal partial class SampleConfig
                 Category = "NumericTextBox",
                 Directory = "Inputs/NumericTextBox",
                 Url = "NumericTextBox/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml"
+                FileName = "DefaultFunctionalities.razor"
             },
             new Sample
             {
@@ -64,7 +64,7 @@ internal partial class SampleConfig
                 Category = "NumericTextBox",
                 Directory = "Inputs/NumericTextBox",
                 Url = "NumericTextBox/CustomFormat",
-                FileName = "CustomFormat.cshtml"
+                FileName = "CustomFormat.razor"
             },
             new Sample
             {
@@ -72,7 +72,7 @@ internal partial class SampleConfig
                 Category = "NumericTextBox",
                 Directory = "Inputs/NumericTextBox",
                 Url = "NumericTextBox/RestrictDecimals",
-                FileName = "RestrictDecimals.cshtml"
+                FileName = "RestrictDecimals.razor"
             }
         };
         public List<Sample> FileUpload { get; set; } = new List<Sample>{
@@ -82,7 +82,7 @@ internal partial class SampleConfig
                 Category = "FileUpload",
                 Directory = "Inputs/Uploader",
                 Url = "Uploader/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml"
+                FileName = "DefaultFunctionalities.razor"
             },
              new Sample
             {
@@ -90,7 +90,7 @@ internal partial class SampleConfig
                 Category = "FileUpload",
                 Directory = "Inputs/Uploader",
                 Url = "Uploader/ChunkUpload",
-                FileName = "ChunkUpload.cshtml"
+                FileName = "ChunkUpload.razor"
             },
                new Sample
             {
@@ -98,7 +98,7 @@ internal partial class SampleConfig
                 Category = "FileUpload",
                 Directory = "Inputs/Uploader",
                 Url = "Uploader/FileValidation",
-                FileName = "FileValidation.cshtml"
+                FileName = "FileValidation.razor"
             }
         };
         public List<Sample> Slider { get; set; } = new List<Sample>{
@@ -108,7 +108,7 @@ internal partial class SampleConfig
                 Category = "Slider",
                 Directory = "Inputs/Slider",
                 Url = "Slider/Default",
-                FileName = "Default.cshtml"
+                FileName = "Default.razor"
             },
             new Sample
             {
@@ -116,7 +116,7 @@ internal partial class SampleConfig
                 Category = "Slider",
                 Directory = "Inputs/Slider",
                 Url = "Slider/Ticks",
-                FileName = "Ticks.cshtml"
+                FileName = "Ticks.razor"
             },
         };
     }
diff --git a/ej2-blazor-samples/Pages/Inputs/Slider/Default.cshtml b/ej2-blazor-samples/Pages/Inputs/Slider/Default.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/Slider/Default.cshtml
rename to ej2-blazor-samples/Pages/Inputs/Slider/Default.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/Slider/Ticks.cshtml b/ej2-blazor-samples/Pages/Inputs/Slider/Ticks.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/Slider/Ticks.cshtml
rename to ej2-blazor-samples/Pages/Inputs/Slider/Ticks.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/TextBox/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Inputs/TextBox/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/TextBox/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Inputs/TextBox/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/Uploader/ChunkUpload.cshtml b/ej2-blazor-samples/Pages/Inputs/Uploader/ChunkUpload.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/Uploader/ChunkUpload.cshtml
rename to ej2-blazor-samples/Pages/Inputs/Uploader/ChunkUpload.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/Uploader/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Inputs/Uploader/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/Uploader/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Inputs/Uploader/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Inputs/Uploader/FileValidation.cshtml b/ej2-blazor-samples/Pages/Inputs/Uploader/FileValidation.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Inputs/Uploader/FileValidation.cshtml
rename to ej2-blazor-samples/Pages/Inputs/Uploader/FileValidation.razor
diff --git a/ej2-blazor-samples/Pages/Layout/Dialog/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Layout/Dialog/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layout/Dialog/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Layout/Dialog/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Layout/Dialog/Draggable.cshtml b/ej2-blazor-samples/Pages/Layout/Dialog/Draggable.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layout/Dialog/Draggable.cshtml
rename to ej2-blazor-samples/Pages/Layout/Dialog/Draggable.razor
diff --git a/ej2-blazor-samples/Pages/Layout/Dialog/Resizable.cshtml b/ej2-blazor-samples/Pages/Layout/Dialog/Resizable.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layout/Dialog/Resizable.cshtml
rename to ej2-blazor-samples/Pages/Layout/Dialog/Resizable.razor
diff --git a/ej2-blazor-samples/Pages/Layout/SampleList.cs b/ej2-blazor-samples/Pages/Layout/SampleList.cs
index 5d5f3ef4d..28669dfde 100644
--- a/ej2-blazor-samples/Pages/Layout/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Layout/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Dialog",
                 Directory = "Layout/Dialog",
                 Url = "Layout/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "Dialog",
                 Directory = "Layout/Dialog",
                 Url = "Layout/Draggable",
-                FileName = "Draggable.cshtml",
+                FileName = "Draggable.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "Dialog",
                 Directory = "Layout/Dialog",
                 Url = "Layout/Resizable",
-                FileName = "Resizable.cshtml",
+                FileName = "Resizable.razor",
                 Type = SampleType.New
             }
         };
@@ -43,7 +43,7 @@ internal partial class SampleConfig
                 Category = "Splitter",
                 Directory = "Layout/Splitter",
                 Url = "Layout/Default",
-                FileName = "Default.cshtml",
+                FileName = "Default.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -52,7 +52,7 @@ internal partial class SampleConfig
                 Category = "Splitter",
                 Directory = "Layout/Splitter",
                 Url = "Layout/ExpandandCollapse",
-                FileName = "ExpandandCollapse.cshtml",
+                FileName = "ExpandandCollapse.razor",
                 Type = SampleType.New
             },
         };
diff --git a/ej2-blazor-samples/Pages/Layout/Splitter/Default.cshtml b/ej2-blazor-samples/Pages/Layout/Splitter/Default.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layout/Splitter/Default.cshtml
rename to ej2-blazor-samples/Pages/Layout/Splitter/Default.razor
diff --git a/ej2-blazor-samples/Pages/Layout/Splitter/ExpandandCollapse.cshtml b/ej2-blazor-samples/Pages/Layout/Splitter/ExpandandCollapse.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layout/Splitter/ExpandandCollapse.cshtml
rename to ej2-blazor-samples/Pages/Layout/Splitter/ExpandandCollapse.razor
diff --git a/ej2-blazor-samples/Pages/Layouts/Avatar/Default.cshtml b/ej2-blazor-samples/Pages/Layouts/Avatar/Default.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layouts/Avatar/Default.cshtml
rename to ej2-blazor-samples/Pages/Layouts/Avatar/Default.razor
diff --git a/ej2-blazor-samples/Pages/Layouts/Avatar/Types.cshtml b/ej2-blazor-samples/Pages/Layouts/Avatar/Types.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layouts/Avatar/Types.cshtml
rename to ej2-blazor-samples/Pages/Layouts/Avatar/Types.razor
diff --git a/ej2-blazor-samples/Pages/Layouts/Card/BasicCard.cshtml b/ej2-blazor-samples/Pages/Layouts/Card/BasicCard.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layouts/Card/BasicCard.cshtml
rename to ej2-blazor-samples/Pages/Layouts/Card/BasicCard.razor
diff --git a/ej2-blazor-samples/Pages/Layouts/Card/HorizontalCard.cshtml b/ej2-blazor-samples/Pages/Layouts/Card/HorizontalCard.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layouts/Card/HorizontalCard.cshtml
rename to ej2-blazor-samples/Pages/Layouts/Card/HorizontalCard.razor
diff --git a/ej2-blazor-samples/Pages/Layouts/Card/VerticalCard.cshtml b/ej2-blazor-samples/Pages/Layouts/Card/VerticalCard.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layouts/Card/VerticalCard.cshtml
rename to ej2-blazor-samples/Pages/Layouts/Card/VerticalCard.razor
diff --git a/ej2-blazor-samples/Pages/Layouts/DashboardLayout/Default.cshtml b/ej2-blazor-samples/Pages/Layouts/DashboardLayout/Default.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layouts/DashboardLayout/Default.cshtml
rename to ej2-blazor-samples/Pages/Layouts/DashboardLayout/Default.razor
diff --git a/ej2-blazor-samples/Pages/Layouts/Listview/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Layouts/Listview/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Layouts/Listview/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Layouts/Listview/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Layouts/SampleList.cs b/ej2-blazor-samples/Pages/Layouts/SampleList.cs
index cee312205..cab2a5976 100644
--- a/ej2-blazor-samples/Pages/Layouts/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Layouts/SampleList.cs
@@ -13,7 +13,7 @@ internal partial class SampleConfig
                 Name = "BasicCard",
                 Category = "Card",
                 Directory = "Layouts/Card",
-                FileName = "BasicCard.cshtml",
+                FileName = "BasicCard.razor",
                 Url = "Card/BasicCard",
                 Type = SampleType.New
             },
@@ -22,7 +22,7 @@ internal partial class SampleConfig
                 Name = "VerticalCard",
                 Category = "Card",
                 Directory = "Layouts/Card",
-                FileName = "VerticalCard.cshtml",
+                FileName = "VerticalCard.razor",
                 Url = "Card/VerticalCard",
                 Type = SampleType.New
             },
@@ -31,7 +31,7 @@ internal partial class SampleConfig
                 Name = "HorizontalCard",
                 Category = "Card",
                 Directory = "Layouts/Card",
-                FileName = "HorizontalCard.cshtml",
+                FileName = "HorizontalCard.razor",
                 Url = "Card/HorizontalCard",
                 Type = SampleType.New
             },
@@ -43,7 +43,7 @@ internal partial class SampleConfig
                 Category = "Listview",
                 Directory = "Layouts/Listview",
                 Url = "Listview/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             }
         };
@@ -54,7 +54,7 @@ internal partial class SampleConfig
                 Category = "Avatar",
                 Directory = "Layouts/Avatar",
                 Url = "Avatar/Default",
-                FileName = "Default.cshtml",
+                FileName = "Default.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -63,7 +63,7 @@ internal partial class SampleConfig
                 Category = "Avatar",
                 Directory = "Layouts/Avatar",
                 Url = "Avatar/Types",
-                FileName = "Types.cshtml",
+                FileName = "Types.razor",
                 Type = SampleType.New,
             }
         };
@@ -74,7 +74,7 @@ internal partial class SampleConfig
                 Category = "Dashboard Layout",
                 Directory = "Layouts/DashboardLayout",
                 Url = "DashboardLayout/Default",
-                FileName = "Default.cshtml",
+                FileName = "Default.razor",
                 Type = SampleType.New
             }
         };
diff --git a/ej2-blazor-samples/Pages/LinearGauge/LinearGauge/Container.cshtml b/ej2-blazor-samples/Pages/LinearGauge/LinearGauge/Container.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/LinearGauge/LinearGauge/Container.cshtml
rename to ej2-blazor-samples/Pages/LinearGauge/LinearGauge/Container.razor
diff --git a/ej2-blazor-samples/Pages/LinearGauge/LinearGauge/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/LinearGauge/LinearGauge/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/LinearGauge/LinearGauge/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/LinearGauge/LinearGauge/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/LinearGauge/LinearGauge/samplelist.cs b/ej2-blazor-samples/Pages/LinearGauge/LinearGauge/samplelist.cs
index 18921c5bb..8ec72451f 100644
--- a/ej2-blazor-samples/Pages/LinearGauge/LinearGauge/samplelist.cs
+++ b/ej2-blazor-samples/Pages/LinearGauge/LinearGauge/samplelist.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "LinearGauge",
                 Directory = "LinearGauge/LinearGauge",
                 Url = "LinearGauge/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "LinearGauge",
                 Directory = "LinearGauge/LinearGauge",
                 Url = "LinearGauge/Container",
-                FileName = "Container.cshtml",
+                FileName = "Container.razor",
                 Type = SampleType.New
             }
 
diff --git a/ej2-blazor-samples/Pages/Maps/Maps/Bubble.cshtml b/ej2-blazor-samples/Pages/Maps/Maps/Bubble.razor
similarity index 99%
rename from ej2-blazor-samples/Pages/Maps/Maps/Bubble.cshtml
rename to ej2-blazor-samples/Pages/Maps/Maps/Bubble.razor
index 3a59f5f71..f73ee671b 100644
--- a/ej2-blazor-samples/Pages/Maps/Maps/Bubble.cshtml
+++ b/ej2-blazor-samples/Pages/Maps/Maps/Bubble.razor
@@ -137,7 +137,9 @@
         double minBox = 3 * 3 * 2 * Math.PI;
         double box = (value - min) / (max - min) * (maxBox - minBox) + minBox;
         if (box < minBox)
+        {
             box = minBox;
+        }
         return Math.Sqrt(box / (Math.PI * 2)) / 2;
     }
 
diff --git a/ej2-blazor-samples/Pages/Maps/Maps/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Maps/Maps/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Maps/Maps/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Maps/Maps/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Maps/Maps/Multilayer.cshtml b/ej2-blazor-samples/Pages/Maps/Maps/Multilayer.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Maps/Maps/Multilayer.cshtml
rename to ej2-blazor-samples/Pages/Maps/Maps/Multilayer.razor
diff --git a/ej2-blazor-samples/Pages/Maps/Maps/Projection.cshtml b/ej2-blazor-samples/Pages/Maps/Maps/Projection.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Maps/Maps/Projection.cshtml
rename to ej2-blazor-samples/Pages/Maps/Maps/Projection.razor
diff --git a/ej2-blazor-samples/Pages/Maps/Maps/Tooltip.cshtml b/ej2-blazor-samples/Pages/Maps/Maps/Tooltip.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Maps/Maps/Tooltip.cshtml
rename to ej2-blazor-samples/Pages/Maps/Maps/Tooltip.razor
diff --git a/ej2-blazor-samples/Pages/Maps/Maps/marker.cshtml b/ej2-blazor-samples/Pages/Maps/Maps/marker.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Maps/Maps/marker.cshtml
rename to ej2-blazor-samples/Pages/Maps/Maps/marker.razor
diff --git a/ej2-blazor-samples/Pages/Maps/Maps/openStreetMap.cshtml b/ej2-blazor-samples/Pages/Maps/Maps/openStreetMap.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Maps/Maps/openStreetMap.cshtml
rename to ej2-blazor-samples/Pages/Maps/Maps/openStreetMap.razor
diff --git a/ej2-blazor-samples/Pages/Maps/SampleList.cs b/ej2-blazor-samples/Pages/Maps/SampleList.cs
index 3dd56b1a6..6564a6626 100644
--- a/ej2-blazor-samples/Pages/Maps/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Maps/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Maps",
                 Directory = "Maps/Maps",
                 Url = "Maps/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "Maps",
                 Directory = "Maps/Maps",
                 Url = "Maps/Multilayer",
-                FileName = "Multilayer.cshtml",
+                FileName = "Multilayer.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "Maps",
                 Directory = "Maps/Maps",
                 Url = "Maps/marker",
-                FileName = "marker.cshtml",
+                FileName = "marker.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "Maps",
                 Directory = "Maps/Maps",
                 Url = "Maps/Tooltip",
-                FileName = "Tooltip.cshtml",
+                FileName = "Tooltip.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -50,20 +50,9 @@ internal partial class SampleConfig
                 Category = "Maps",
                 Directory = "Maps/Maps",
                 Url = "Maps/OpenStreetMap",
-                FileName = "OpenStreetMap.cshtml",
-                Type = SampleType.New
-            },
-             new Sample
-            {
-                Name = "Projection",
-                Category = "Maps",
-                Directory = "Maps/Maps",
-                Url = "Maps/Projection",
-                FileName = "Projection.cshtml",
+                FileName = "OpenStreetMap.razor",
                 Type = SampleType.New
             }
-             
-
         };      
     }
 
diff --git a/ej2-blazor-samples/Pages/Navigations/Accordion/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Navigations/Accordion/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Accordion/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Accordion/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Accordion/Icons.cshtml b/ej2-blazor-samples/Pages/Navigations/Accordion/Icons.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Accordion/Icons.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Accordion/Icons.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/ContextMenu/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Navigations/ContextMenu/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/ContextMenu/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Navigations/ContextMenu/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/FileManager/CustomThumbnail.cshtml b/ej2-blazor-samples/Pages/Navigations/FileManager/CustomThumbnail.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/FileManager/CustomThumbnail.cshtml
rename to ej2-blazor-samples/Pages/Navigations/FileManager/CustomThumbnail.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/FileManager/Overview.cshtml b/ej2-blazor-samples/Pages/Navigations/FileManager/Overview.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/FileManager/Overview.cshtml
rename to ej2-blazor-samples/Pages/Navigations/FileManager/Overview.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/MenuBar/DataBinding.cshtml b/ej2-blazor-samples/Pages/Navigations/MenuBar/DataBinding.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/MenuBar/DataBinding.cshtml
rename to ej2-blazor-samples/Pages/Navigations/MenuBar/DataBinding.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/MenuBar/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Navigations/MenuBar/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/MenuBar/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Navigations/MenuBar/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/SampleList.cs b/ej2-blazor-samples/Pages/Navigations/SampleList.cs
index 11cfc97db..5a97369b7 100644
--- a/ej2-blazor-samples/Pages/Navigations/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Navigations/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Sidebar",
                 Directory = "Navigations/Sidebar",
                 Url = "Sidebar/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },                      
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "Sidebar",
                 Directory = "Navigations/Sidebar",
                 Url = "Sidebar/Dock",
-                FileName = "Dock.cshtml",
+                FileName = "Dock.razor",
                 Type = SampleType.New
             },          
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "Sidebar",
                 Directory = "Navigations/Sidebar",
                 Url = "Sidebar/SidebarWithListView",
-                FileName = "SidebarWithListView.cshtml",
+                FileName = "SidebarWithListView.razor",
                 Type = SampleType.New
             },         
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "Sidebar",
                 Directory = "Navigations/Sidebar",
                 Url = "Sidebar/SidebarWithMenu",
-                FileName = "SidebarWithMenu.cshtml",
+                FileName = "SidebarWithMenu.razor",
                 Type = SampleType.New
             },           
             new Sample
@@ -50,7 +50,7 @@ internal partial class SampleConfig
                 Category = "Sidebar",
                 Directory = "Navigations/Sidebar",
                 Url = "Sidebar/PanelWithResponsive",
-                FileName = "PanelWithResponsive.cshtml",
+                FileName = "PanelWithResponsive.razor",
                 Type = SampleType.New
             }           
         };
@@ -62,7 +62,7 @@ internal partial class SampleConfig
                 Name = "Default Functionalities",
                 Category = "ContextMenu",
                 Directory = "Navigations/ContextMenu",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Url = "ContextMenu/DefaultFunctionalities"
             }
         };
@@ -73,7 +73,7 @@ internal partial class SampleConfig
                 Name = "Default Functionalities",
                 Category = "Menu Bar",
                 Directory = "Navigations/MenuBar",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Url = "MenuBar/DefaultFunctionalities"
             },
             new Sample
@@ -81,7 +81,7 @@ internal partial class SampleConfig
                 Name = "Data Binding",
                 Category = "Menu Bar",
                 Directory = "Navigations/MenuBar",
-                FileName = "DataBinding.cshtml",
+                FileName = "DataBinding.razor",
                 Url = "MenuBar/DataBinding"
             }
         };
@@ -92,7 +92,7 @@ internal partial class SampleConfig
                 Name = "Default Functionalities",
                 Category = "Accordion",
                 Directory = "Navigations/Accordion",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                  Url = "Accordion/DefaultFunctionalities",
                 Type = SampleType.New
             },
@@ -101,7 +101,7 @@ internal partial class SampleConfig
                 Name = "Icons",
                 Category = "Accordion",
                 Directory = "Navigations/Accordion",
-                FileName = "Icons.cshtml",
+                FileName = "Icons.razor",
                  Url = "Accordion/Icons",
                 Type = SampleType.New
             }
@@ -113,7 +113,7 @@ internal partial class SampleConfig
                 Name = "Default Functionalities",
                 Category = "Toolbar",
                 Directory = "Navigations/Toolbar",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
                 Url = "Toolbar/DefaultFunctionalities"
             },
@@ -122,7 +122,7 @@ internal partial class SampleConfig
                 Name = "Popup",
                 Category = "Toolbar",
                 Directory = "Navigations/Toolbar",
-                FileName = "Popup.cshtml",
+                FileName = "Popup.razor",
                 Type = SampleType.New,
                 Url = "Toolbar/Popup"
             }
@@ -134,7 +134,7 @@ internal partial class SampleConfig
                 Name = "Default Functionalities",
                 Category = "Tab",
                 Directory = "Navigations/Tab",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New,
                  Url = "Tab/DefaultFunctionalities"
             }
@@ -146,7 +146,7 @@ internal partial class SampleConfig
                 Category = "TreeView",
                 Directory = "Navigations/TreeView",
                 Url = "TreeView/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -155,7 +155,7 @@ internal partial class SampleConfig
                 Category = "TreeView",
                 Directory = "Navigations/TreeView",
                 Url = "TreeView/CheckBox",
-                FileName = "CheckBox.cshtml",
+                FileName = "CheckBox.razor",
                 Type = SampleType.New
             }
         };
@@ -166,7 +166,7 @@ internal partial class SampleConfig
                 Category = "FileManager",
                 Directory = "Navigations/FileManager",
                 Url = "FileManager/Overview",
-                FileName = "Overview.cshtml",
+                FileName = "Overview.razor",
                 Type = SampleType.New
             },
              new Sample
@@ -175,7 +175,7 @@ internal partial class SampleConfig
                 Category = "FileManager",
                 Directory = "Navigations/FileManager",
                 Url = "FileManager/CustomThumbnail",
-                FileName = "CustomThumbnail.cshtml",
+                FileName = "CustomThumbnail.razor",
                 Type = SampleType.New
             }
         };
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/API.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/API.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/API.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/API.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/Default.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/Default.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/Default.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/Default.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/Dock.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/Dock.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/Dock.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/Dock.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/PanelWithResponsive.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/PanelWithResponsive.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/PanelWithResponsive.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/PanelWithResponsive.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/ResponsivePanel.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/ResponsivePanel.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/ResponsivePanel.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/ResponsivePanel.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarAPI.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarAPI.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarAPI.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarAPI.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarDock.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarDock.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarDock.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarDock.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarList.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarList.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarList.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarList.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarMenu.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarMenu.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarMenu.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarMenu.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarWithListView.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarWithListView.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarWithListView.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarWithListView.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarWithMenu.cshtml b/ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarWithMenu.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarWithMenu.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Sidebar/SidebarWithMenu.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Tab/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Navigations/Tab/DefaultFunctionalities.razor
similarity index 98%
rename from ej2-blazor-samples/Pages/Navigations/Tab/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Tab/DefaultFunctionalities.razor
index b4f08a72e..61f2a5c6f 100644
--- a/ej2-blazor-samples/Pages/Navigations/Tab/DefaultFunctionalities.cshtml
+++ b/ej2-blazor-samples/Pages/Navigations/Tab/DefaultFunctionalities.razor
@@ -30,11 +30,11 @@
         @*<EjsTab id="defaultTab" Items="@TabItems">
             </EjsTab>*@
         <EjsTab ID="defaultTab">
-            <TabTabItems>
-                <TabTabItem Header="@header1" Content="@content1"></TabTabItem>
-                <TabTabItem Header="@header2" Content="@content2"></TabTabItem>
-                <TabTabItem Header="@header3" Content="@content3"></TabTabItem>
-            </TabTabItems>
+            <TabItems>
+                <TabItem Header="@header1" Content="@content1"></TabItem>
+                <TabItem Header="@header2" Content="@content2"></TabItem>
+                <TabItem Header="@header3" Content="@content3"></TabItem>
+            </TabItems>
         </EjsTab>
     </div>
 </div>
diff --git a/ej2-blazor-samples/Pages/Navigations/Toolbar/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Navigations/Toolbar/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Toolbar/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Toolbar/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/Toolbar/Popup.cshtml b/ej2-blazor-samples/Pages/Navigations/Toolbar/Popup.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Navigations/Toolbar/Popup.cshtml
rename to ej2-blazor-samples/Pages/Navigations/Toolbar/Popup.razor
diff --git a/ej2-blazor-samples/Pages/Navigations/TreeView/CheckBox.cshtml b/ej2-blazor-samples/Pages/Navigations/TreeView/CheckBox.razor
similarity index 99%
rename from ej2-blazor-samples/Pages/Navigations/TreeView/CheckBox.cshtml
rename to ej2-blazor-samples/Pages/Navigations/TreeView/CheckBox.razor
index b0a522b6f..c854860ab 100644
--- a/ej2-blazor-samples/Pages/Navigations/TreeView/CheckBox.cshtml
+++ b/ej2-blazor-samples/Pages/Navigations/TreeView/CheckBox.razor
@@ -20,8 +20,6 @@
     <p>For more information, you can refer to the <a href='https://ej2.syncfusion.com/documentation/treeview/check-box/' target='_blank'>Checkboxes</a> section from the documentation.</p>"
     };
 }
-@*End:Hidden*@
-
 @using Syncfusion.EJ2
 <div class="control-section">
     <div class="control_wrapper">
diff --git a/ej2-blazor-samples/Pages/Navigations/TreeView/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Navigations/TreeView/DefaultFunctionalities.razor
similarity index 99%
rename from ej2-blazor-samples/Pages/Navigations/TreeView/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Navigations/TreeView/DefaultFunctionalities.razor
index 91dd90ac7..a83f39072 100644
--- a/ej2-blazor-samples/Pages/Navigations/TreeView/DefaultFunctionalities.cshtml
+++ b/ej2-blazor-samples/Pages/Navigations/TreeView/DefaultFunctionalities.razor
@@ -19,8 +19,6 @@
     <p>More information on the TreeView instantiation can be found in the <a href='https://ej2.syncfusion.com/documentation/treeview/getting-started/' target='_blank'>documentation section</a>.</p>"
     };
 }
-@*End:Hidden*@
-
 @using Syncfusion.EJ2
 <div class="control-section">
     <div class="control_wrapper">
diff --git a/ej2-blazor-samples/Pages/Notifications/Badge/Default.cshtml b/ej2-blazor-samples/Pages/Notifications/Badge/Default.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Notifications/Badge/Default.cshtml
rename to ej2-blazor-samples/Pages/Notifications/Badge/Default.razor
diff --git a/ej2-blazor-samples/Pages/Notifications/Badge/Types.cshtml b/ej2-blazor-samples/Pages/Notifications/Badge/Types.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Notifications/Badge/Types.cshtml
rename to ej2-blazor-samples/Pages/Notifications/Badge/Types.razor
diff --git a/ej2-blazor-samples/Pages/Notifications/SampleList.cs b/ej2-blazor-samples/Pages/Notifications/SampleList.cs
index 8bb05405d..141a17ec6 100644
--- a/ej2-blazor-samples/Pages/Notifications/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Notifications/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Toast",
                 Directory = "Notifications/Toast",
                 Url = "Notifications/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             }
         };
@@ -25,7 +25,7 @@ internal partial class SampleConfig
                 Category = "Badge",
                 Directory = "Notifications/Badge",
                 Url = "Badge/Default",
-                FileName = "Default.cshtml",
+                FileName = "Default.razor",
                 Type = SampleType.New,
             },
              new Sample
@@ -34,7 +34,7 @@ internal partial class SampleConfig
                 Category = "Badge",
                 Directory = "Notifications/Badge",
                 Url = "Badge/Types",
-                FileName = "Types.cshtml",
+                FileName = "Types.razor",
                 Type = SampleType.New,
             }
         };
diff --git a/ej2-blazor-samples/Pages/Notifications/Toast/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Notifications/Toast/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Notifications/Toast/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Notifications/Toast/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/PivotView/PivotTable/AdvanceFiltering.cshtml b/ej2-blazor-samples/Pages/PivotView/PivotTable/AdvanceFiltering.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/PivotView/PivotTable/AdvanceFiltering.cshtml
rename to ej2-blazor-samples/Pages/PivotView/PivotTable/AdvanceFiltering.razor
diff --git a/ej2-blazor-samples/Pages/PivotView/PivotTable/Chart.cshtml b/ej2-blazor-samples/Pages/PivotView/PivotTable/Chart.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/PivotView/PivotTable/Chart.cshtml
rename to ej2-blazor-samples/Pages/PivotView/PivotTable/Chart.razor
diff --git a/ej2-blazor-samples/Pages/PivotView/PivotTable/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/PivotView/PivotTable/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/PivotView/PivotTable/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/PivotView/PivotTable/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/PivotView/PivotTable/Editing.cshtml b/ej2-blazor-samples/Pages/PivotView/PivotTable/Editing.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/PivotView/PivotTable/Editing.cshtml
rename to ej2-blazor-samples/Pages/PivotView/PivotTable/Editing.razor
diff --git a/ej2-blazor-samples/Pages/PivotView/PivotTable/UserInteraction.cshtml b/ej2-blazor-samples/Pages/PivotView/PivotTable/UserInteraction.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/PivotView/PivotTable/UserInteraction.cshtml
rename to ej2-blazor-samples/Pages/PivotView/PivotTable/UserInteraction.razor
diff --git a/ej2-blazor-samples/Pages/PivotView/SampleList.cs b/ej2-blazor-samples/Pages/PivotView/SampleList.cs
index ba7fa6cc8..947dee964 100644
--- a/ej2-blazor-samples/Pages/PivotView/SampleList.cs
+++ b/ej2-blazor-samples/Pages/PivotView/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "PivotTable",
                 Directory = "PivotView/PivotTable",
                 Url = "PivotView/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "PivotTable",
                 Directory = "PivotView/PivotTable",
                 Url = "PivotView/UserInteraction",
-                FileName = "UserInteraction.cshtml",
+                FileName = "UserInteraction.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "PivotTable",
                 Directory = "PivotView/PivotTable",
                 Url = "PivotView/AdvanceFiltering",
-                FileName = "AdvanceFiltering.cshtml",
+                FileName = "AdvanceFiltering.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "PivotTable",
                 Directory = "PivotView/PivotTable",
                 Url = "PivotView/Chart",
-                FileName = "Chart.cshtml",
+                FileName = "Chart.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -50,7 +50,7 @@ internal partial class SampleConfig
                 Category = "PivotTable",
                 Directory = "PivotView/PivotTable",
                 Url = "PivotView/Editing",
-                FileName = "Editing.cshtml",
+                FileName = "Editing.razor",
                 Type = SampleType.New
             }
         };
diff --git a/ej2-blazor-samples/Pages/Popups/SampleList.cs b/ej2-blazor-samples/Pages/Popups/SampleList.cs
index c4d49f5f3..194714ce7 100644
--- a/ej2-blazor-samples/Pages/Popups/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Popups/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Tooltip",
                 Directory = "Popups/Tooltip",
                 Url = "Tooltip/Default",
-                FileName = "Default.cshtml",
+                FileName = "Default.razor",
                 Type = SampleType.New,
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "Tooltip",
                 Directory = "Popups/Tooltip",
                 Url = "Tooltip/HtmlTemplate",
-                FileName = "HtmlTemplate.cshtml",
+                FileName = "HtmlTemplate.razor",
                 Type = SampleType.New,
             },
         };   
diff --git a/ej2-blazor-samples/Pages/Popups/Tooltip/Default.cshtml b/ej2-blazor-samples/Pages/Popups/Tooltip/Default.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Popups/Tooltip/Default.cshtml
rename to ej2-blazor-samples/Pages/Popups/Tooltip/Default.razor
diff --git a/ej2-blazor-samples/Pages/Popups/Tooltip/HtmlTemplate.cshtml b/ej2-blazor-samples/Pages/Popups/Tooltip/HtmlTemplate.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Popups/Tooltip/HtmlTemplate.cshtml
rename to ej2-blazor-samples/Pages/Popups/Tooltip/HtmlTemplate.razor
diff --git a/ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Iframe-Functionalities.cshtml b/ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Iframe-Functionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Iframe-Functionalities.cshtml
rename to ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Iframe-Functionalities.razor
diff --git a/ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Inline.cshtml b/ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Inline.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Inline.cshtml
rename to ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Inline.razor
diff --git a/ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Markdown-Overview.cshtml b/ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Markdown-Overview.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Markdown-Overview.cshtml
rename to ej2-blazor-samples/Pages/RichTextEditor/RichTextEditor/Markdown-Overview.razor
diff --git a/ej2-blazor-samples/Pages/RichTextEditor/SampleList.cs b/ej2-blazor-samples/Pages/RichTextEditor/SampleList.cs
index e7c3e04e6..3a2d25164 100644
--- a/ej2-blazor-samples/Pages/RichTextEditor/SampleList.cs
+++ b/ej2-blazor-samples/Pages/RichTextEditor/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "RichTextEditor",
                 Directory = "RichTextEditor/RichTextEditor",
                 Url = "RichTextEditor/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "RichTextEditor",
                 Directory = "RichTextEditor/RichTextEditor",
                 Url = "RichTextEditor/Inline",
-                FileName = "Inline.cshtml",
+                FileName = "Inline.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "RichTextEditor",
                 Directory = "RichTextEditor/RichTextEditor",
                 Url = "RichTextEditor/Iframe-Functionalities",
-                FileName = "Iframe-Functionalities.cshtml",
+                FileName = "Iframe-Functionalities.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "RichTextEditor",
                 Directory = "RichTextEditor/RichTextEditor",
                 Url = "RichTextEditor/Markdown-Overview",
-                FileName = "Markdown-Overview.cshtml",
+                FileName = "Markdown-Overview.razor",
                 Type = SampleType.New
             }
         };      
diff --git a/ej2-blazor-samples/Pages/Schedule/SampleList.cs b/ej2-blazor-samples/Pages/Schedule/SampleList.cs
index 03616e82a..4307dfa08 100644
--- a/ej2-blazor-samples/Pages/Schedule/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Schedule/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "Scheduler",
                 Directory = "Schedule/Schedule",
                 Url = "Schedule/Default",
-                FileName = "Default.cshtml",
+                FileName = "Default.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "Scheduler",
                 Directory = "Schedule/Schedule",
                 Url = "Schedule/Agenda",
-                FileName = "Agenda.cshtml",
+                FileName = "Agenda.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "Scheduler",
                 Directory = "Schedule/Schedule",
                 Url = "Schedule/Timeline",
-                FileName = "Timeline.cshtml",
+                FileName = "Timeline.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "Scheduler",
                 Directory = "Schedule/Schedule",
                 Url = "Schedule/TimelineResourceGroup",
-                FileName = "TimelineResourceGroup.cshtml",
+                FileName = "TimelineResourceGroup.razor",
                 Type = SampleType.New
             },
             new Sample
@@ -50,7 +50,7 @@ internal partial class SampleConfig
                 Category = "Scheduler",
                 Directory = "Schedule/Schedule",
                 Url = "Schedule/Group",
-                FileName = "Group.cshtml",
+                FileName = "Group.razor",
                 Type = SampleType.New
             }
         };
diff --git a/ej2-blazor-samples/Pages/Schedule/Schedule/Agenda.cshtml b/ej2-blazor-samples/Pages/Schedule/Schedule/Agenda.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Schedule/Schedule/Agenda.cshtml
rename to ej2-blazor-samples/Pages/Schedule/Schedule/Agenda.razor
diff --git a/ej2-blazor-samples/Pages/Schedule/Schedule/Default.cshtml b/ej2-blazor-samples/Pages/Schedule/Schedule/Default.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Schedule/Schedule/Default.cshtml
rename to ej2-blazor-samples/Pages/Schedule/Schedule/Default.razor
diff --git a/ej2-blazor-samples/Pages/Schedule/Schedule/Group.cshtml b/ej2-blazor-samples/Pages/Schedule/Schedule/Group.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Schedule/Schedule/Group.cshtml
rename to ej2-blazor-samples/Pages/Schedule/Schedule/Group.razor
diff --git a/ej2-blazor-samples/Pages/Schedule/Schedule/Timeline.cshtml b/ej2-blazor-samples/Pages/Schedule/Schedule/Timeline.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Schedule/Schedule/Timeline.cshtml
rename to ej2-blazor-samples/Pages/Schedule/Schedule/Timeline.razor
diff --git a/ej2-blazor-samples/Pages/Schedule/Schedule/TimelineResourceGroup.cshtml b/ej2-blazor-samples/Pages/Schedule/Schedule/TimelineResourceGroup.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Schedule/Schedule/TimelineResourceGroup.cshtml
rename to ej2-blazor-samples/Pages/Schedule/Schedule/TimelineResourceGroup.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/SampleList.cs b/ej2-blazor-samples/Pages/TreeMap/SampleList.cs
index 9467c4d33..ed11d3e5a 100644
--- a/ej2-blazor-samples/Pages/TreeMap/SampleList.cs
+++ b/ej2-blazor-samples/Pages/TreeMap/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "TreeMap",
                 Directory = "TreeMap/TreeMap",
                 Url = "TreeMap/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
              new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "TreeMap",
                 Directory = "TreeMap/TreeMap",
                 Url = "TreeMap/Customization",
-                FileName = "Customization.cshtml",
+                FileName = "Customization.razor",
                 Type = SampleType.New
             },
              new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "TreeMap",
                 Directory = "TreeMap/TreeMap",
                 Url = "TreeMap/Label",
-                FileName = "TreeMapLabel.cshtml",
+                FileName = "TreeMapLabel.razor",
                 Type = SampleType.New
             },
               new Sample
@@ -41,7 +41,7 @@ internal partial class SampleConfig
                 Category = "TreeMap",
                 Directory = "TreeMap/TreeMap",
                 Url = "TreeMap/Tooltip",
-                FileName = "Tooltip.cshtml",
+                FileName = "Tooltip.razor",
                 Type = SampleType.New
             },
                new Sample
@@ -50,46 +50,9 @@ internal partial class SampleConfig
                 Category = "TreeMap",
                 Directory = "TreeMap/TreeMap",
                 Url = "TreeMap/Legend",
-                FileName = "Legend.cshtml",
-                Type = SampleType.New
-            },
-            new Sample
-            {
-                Name = "ColorMapping",
-                Category = "TreeMap",
-                Directory = "TreeMap/TreeMap",
-                Url = "TreeMap/ColorMapping",
-                FileName = "ColorMapping.cshtml",
-                Type = SampleType.New
-            },
-            new Sample
-            {
-                Name = "Layout",
-                Category = "TreeMap",
-                Directory = "TreeMap/TreeMap",
-                Url = "TreeMap/layerData",
-                FileName = "layerData.cshtml",
-                Type = SampleType.New
-            },
-             new Sample
-            {
-                Name = "Print",
-                Category = "TreeMap",
-                Directory = "TreeMap/TreeMap",
-                Url = "TreeMap/Print",
-                FileName = "print.cshtml",
-                Type = SampleType.New
-            },
-            new Sample
-            {
-                Name = "Selection",
-                Category = "TreeMap",
-                Directory = "TreeMap/TreeMap",
-                Url = "TreeMap/Selection",
-                FileName = "selection.cshtml",
+                FileName = "Legend.razor",
                 Type = SampleType.New
             }
-
         };      
     }
 
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/ColorMapping.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/ColorMapping.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/ColorMapping.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/ColorMapping.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/Customization.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/Customization.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/Customization.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/Customization.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/Index.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/Index.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/Index.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/Index.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/Legend.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/Legend.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/Legend.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/Legend.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/Tooltip.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/Tooltip.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/Tooltip.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/Tooltip.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/TreeMapLabel.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/TreeMapLabel.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/TreeMapLabel.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/TreeMapLabel.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/layerData.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/layerData.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/layerData.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/layerData.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/print.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/print.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/print.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/print.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/selection.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/selection.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/selection.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/selection.razor
diff --git a/ej2-blazor-samples/Pages/TreeMap/TreeMap/test.cshtml b/ej2-blazor-samples/Pages/TreeMap/TreeMap/test.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/TreeMap/TreeMap/test.cshtml
rename to ej2-blazor-samples/Pages/TreeMap/TreeMap/test.razor
diff --git a/ej2-blazor-samples/Pages/Viewer/PdfViewer/CustomToolbar.cshtml b/ej2-blazor-samples/Pages/Viewer/PdfViewer/CustomToolbar.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Viewer/PdfViewer/CustomToolbar.cshtml
rename to ej2-blazor-samples/Pages/Viewer/PdfViewer/CustomToolbar.razor
diff --git a/ej2-blazor-samples/Pages/Viewer/PdfViewer/DefaultFunctionalities.cshtml b/ej2-blazor-samples/Pages/Viewer/PdfViewer/DefaultFunctionalities.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Viewer/PdfViewer/DefaultFunctionalities.cshtml
rename to ej2-blazor-samples/Pages/Viewer/PdfViewer/DefaultFunctionalities.razor
diff --git a/ej2-blazor-samples/Pages/Viewer/PdfViewer/RightToLeft.cshtml b/ej2-blazor-samples/Pages/Viewer/PdfViewer/RightToLeft.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/Viewer/PdfViewer/RightToLeft.cshtml
rename to ej2-blazor-samples/Pages/Viewer/PdfViewer/RightToLeft.razor
diff --git a/ej2-blazor-samples/Pages/Viewer/SampleList.cs b/ej2-blazor-samples/Pages/Viewer/SampleList.cs
index e957ae678..ca620ba00 100644
--- a/ej2-blazor-samples/Pages/Viewer/SampleList.cs
+++ b/ej2-blazor-samples/Pages/Viewer/SampleList.cs
@@ -14,7 +14,7 @@ internal partial class SampleConfig
                 Category = "PdfViewer",
                 Directory = "Viewer/PdfViewer",
                 Url = "Viewer/DefaultFunctionalities",
-                FileName = "DefaultFunctionalities.cshtml",
+                FileName = "DefaultFunctionalities.razor",
                 Type = SampleType.New
             },
              new Sample
@@ -23,7 +23,7 @@ internal partial class SampleConfig
                 Category = "PdfViewer",
                 Directory = "Viewer/PdfViewer",
                 Url = "Viewer/CustomToolbar",
-                FileName = "CustomToolbar.cshtml",
+                FileName = "CustomToolbar.razor",
                 Type = SampleType.New
             },
              new Sample
@@ -32,7 +32,7 @@ internal partial class SampleConfig
                 Category = "PdfViewer",
                 Directory = "Viewer/PdfViewer",
                 Url = "Viewer/RightToLeft",
-                FileName = "RightToLeft.cshtml",
+                FileName = "RightToLeft.razor",
                 Type = SampleType.New
             }
         };
diff --git a/ej2-blazor-samples/Pages/_ViewImports.cshtml b/ej2-blazor-samples/Pages/_Imports.razor
similarity index 100%
rename from ej2-blazor-samples/Pages/_ViewImports.cshtml
rename to ej2-blazor-samples/Pages/_Imports.razor
diff --git a/ej2-blazor-samples/Program.cs b/ej2-blazor-samples/Program.cs
index e8cc7405f..6803cf717 100644
--- a/ej2-blazor-samples/Program.cs
+++ b/ej2-blazor-samples/Program.cs
@@ -2,7 +2,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace ej2_blazor_samples
@@ -59,7 +58,7 @@ internal static class SampleBrowser
         internal static string CurrentUrl;
         internal static string[] ActionDescription;
         internal static string[] Description;
-        internal static List<String>  SampleUrls = new List<String>();
+        internal static List<String> SampleUrls = new List<String>();
     }
 
     enum SampleType
@@ -69,7 +68,4 @@ enum SampleType
         Updated,
         Preview
     }
-
-
-
 }
diff --git a/ej2-blazor-samples/Properties/PublishProfiles/FolderProfile.pubxml b/ej2-blazor-samples/Properties/PublishProfiles/FolderProfile.pubxml
deleted file mode 100644
index 3272a4e64..000000000
--- a/ej2-blazor-samples/Properties/PublishProfiles/FolderProfile.pubxml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <PublishProvider>FileSystem</PublishProvider>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <ProjectGuid>ebaf476b-638d-444f-8699-fa2def01db55</ProjectGuid>
-    <publishUrl>bin\Release\netstandard2.0\publish\</publishUrl>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/ej2-blazor-samples/Properties/PublishProfiles/FolderProfile.pubxml.user b/ej2-blazor-samples/Properties/PublishProfiles/FolderProfile.pubxml.user
deleted file mode 100644
index 9634f8668..000000000
--- a/ej2-blazor-samples/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TimeStampOfAssociatedLegacyPublishXmlFile />
-    <_PublishTargetUrl>D:\dev\ej2\source\development\ej2-blazor-samples\bin\Release\netstandard2.0\publish\</_PublishTargetUrl>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/ej2-blazor-samples/Properties/launchSettings.json b/ej2-blazor-samples/Properties/launchSettings.json
index 2197e2114..268f41f56 100644
--- a/ej2-blazor-samples/Properties/launchSettings.json
+++ b/ej2-blazor-samples/Properties/launchSettings.json
@@ -3,26 +3,25 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:52781/",
+      "applicationUrl": "http://localhost:52256/",
       "sslPort": 0
     }
   },
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
-      "commandLineArgs": "–remote-debugging-port=9222",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "sample": {
+    "ej2-blazor-samples": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:52782/"
+      "applicationUrl": "http://localhost:52258/"
     }
   }
 }
\ No newline at end of file
diff --git a/ej2-blazor-samples/Shared/MainLayout.cshtml b/ej2-blazor-samples/Shared/MainLayout.razor
similarity index 94%
rename from ej2-blazor-samples/Shared/MainLayout.cshtml
rename to ej2-blazor-samples/Shared/MainLayout.razor
index 4f22989a9..5953cdf4d 100644
--- a/ej2-blazor-samples/Shared/MainLayout.cshtml
+++ b/ej2-blazor-samples/Shared/MainLayout.razor
@@ -5,13 +5,15 @@
 @using Syncfusion.EJ2.RazorComponents.Navigations;
 @using Syncfusion.EJ2.RazorComponents.SplitButtons;
 @using Syncfusion.EJ2.RazorComponents.DropDowns;
-@inject Microsoft.AspNetCore.Components.Services.IUriHelper UriHelper;
+@using Microsoft.AspNetCore.Components;
+@using System.Net.Http;
+@inject Microsoft.AspNetCore.Components.IUriHelper UriHelper;
 @inject HttpClient Http;
 @inject IJSRuntime JsRuntime;
 <!-- Google Tag Manager (noscript) -->
 <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WLQL39J" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <!-- End Google Tag Manager (noscript) -->
-<div hiddenid="sync-analytics" data-queue="EJ2 - ASP.NET Core Razor Component - Demos"></div>
+<div hiddenid="sync-analytics" data-queue="EJ2 - ASP.NET Core Blazor - Demos"></div>
 <div class="sample-browser e-view">
     <div class="sb-mobile-overlay sb-hide"></div>
     <div id='sample-header' class="sb-header e-view" role="banner">
@@ -22,7 +24,7 @@
             </div>
             <div class='sb-header-item sb-table-cell' id="sb-header-text" style="padding-left:20px">
                 <span>Essential JS 2 for ASP.NET Core </span>
-                <EjsDropDownButton id="platform-switch" Content="Razor Component" Items="@items"></EjsDropDownButton>
+                <EjsDropDownButton id="platform-switch" Content="Blazor" Items="@items"></EjsDropDownButton>
             </div>
              <div class='sb-header-item sb-table-cell'>
                   <div>
@@ -156,7 +158,7 @@
                 <div class="sb-footer">
                     <div class="sb-footer-left">
                         <div class="sb-footer-links">
-                            <a href="https://ej2.syncfusion.com/aspnet-core-razor-components/documentation/" target="_blank">
+                            <a href="https://ej2.syncfusion.com/aspnet-core-blazor/documentation/" target="_blank">
                                 <div class="sb-footer-link">Documentation</div>
                             </a>
                             <a href="https://www.syncfusion.com/forums/" target="_blank">
@@ -290,13 +292,13 @@ private object AccountMenuItems { get; set; } = new List<object>
          items 
          { get; set; } = new List<object>
     {
-    new { text = "JavaScript", url="https://npmci.syncfusion.com/development/demos/" },
-    new { text = "JavaScript (ES5)", url="https://npmci.syncfusion.com/development/javascript/demos/" },
-    new { text = "React", url="https://npmci.syncfusion.com/development/react/demos/" },
-    new { text = "Angular", url="https://npmci.syncfusion.com/development/angular/demos/" },
-    new { text = "ASP.NET Core", url="https://ej2npmci.azurewebsites.net/development/aspnetcore/" },
-    new { text = "ASP.NET MVC", url="https://ej2npmci.azurewebsites.net/development/aspnetmvc/" },
-    new { text = "Vue", url="https://npmci.syncfusion.com/development/vue/demos/" }
+    new { text = "JavaScript", url="https://ej2.syncfusion.com/demos/" },
+    new { text = "JavaScript (ES5)", url="https://ej2.syncfusion.com/javascript/demos/" },
+    new { text = "React", url="https://ej2.syncfusion.com/react/demos/" },
+    new { text = "Angular", url="https://ej2.syncfusion.com/angular/demos/" },
+    new { text = "ASP.NET Core", url="https://ej2.syncfusion.com/aspnetcore/" },
+    new { text = "ASP.NET MVC", url="https://ej2.syncfusion.com/aspnetmvc/" },
+    new { text = "Vue", url="https://ej2.syncfusion.com/vue/demos/" }
     };
 
     public List<object>
diff --git a/ej2-blazor-samples/Shared/NavMenu.cshtml b/ej2-blazor-samples/Shared/NavMenu.cshtml
deleted file mode 100644
index 5a9334fe1..000000000
--- a/ej2-blazor-samples/Shared/NavMenu.cshtml
+++ /dev/null
@@ -1,171 +0,0 @@
-@using ej2_blazor_samples
-@using Newtonsoft.Json
-@using Syncfusion.EJ2.RazorComponents.Lists
-@using Syncfusion.EJ2.RazorComponents.Navigations
-@using System.Reflection
-
-@inject Microsoft.AspNetCore.Components.Services.IUriHelper UriHelper
-@inject IJSRuntime JsRuntime;
-
-
-
-
-@*<div id="controlTree" class='e-view'></div>*@
-<EjsTreeView ID="controlTree" Fields="@DataSource" CssClass="@treeviewClass" FullRowSelect="true" ExpandOn="@ExpandOnSettings.Click" NodeSelected="@onNodeClick" ref="treeView"></EjsTreeView>
-
-
-<div id="controlSamples" class="time-duration">
-    <div id="sb-left-back1" class="back" role="button" tabindex="0" onclick="@toggle">
-        <div class="e-icons sb-icons back-icon"></div>
-        <div class='control-name'>All Controls</div>
-    </div>
-    <EjsListView id="controlList" CssClass="e-view sb-control-list-top" DataSource="@ListDataSource" Fields="@ListFields" ref="controlList" Select="@OnSampleSelect"></EjsListView>
-</div>
-<div>
-</div>
-
-
-@functions{
-
-        EjsListView controlList;
-
-        EjsTreeView treeView;
-
-
-        private string treeviewClass { get; set; } = "e-view time-duration trans-left";
-
-    string listviewClass = "";
-
-    Object DataSource = new
-    {
-        dataSource = SampleBrowser.SampleList.GroupBy(u => u.Category).Select(g =>
-        {
-            List<SampleList>
-    lst = g.ToList();
-    lst.OrderBy(ob => ob.Order);
-    lst.ForEach(sam =>
-    {
-    sam.Samples.ForEach(curSam =>
-    {
-    SampleBrowser.SampleUrls.Add(curSam.Url);
-    });
-    });
-    return new { dataSource = lst, Name = lst[0].Category, UID = g.Key, expanded = true };
-    }),
-    id = "UID",
-    text = "Name",
-    child = "dataSource"
-    };
-
-
-    private void onNodeClick(object arg)
-    {
-    //JsRuntime.InvokeAsync<Object>("test", arg);
-        string adc = JsonConvert.SerializeObject(arg);
-        TreeViewEventModel data = JsonConvert.DeserializeObject<TreeViewEventModel>
-            (adc, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-            if (data.nodeData.parentID != null)
-            {
-            SampleBrowser.CurrentControl = SampleBrowser.Config.GetType().GetProperty(data.nodeData.text).GetValue(SampleBrowser.Config) as List<Sample>
-                ;
-                ListDataSource = this.controlList.DataSource = SampleBrowser.CurrentControl;
-                this.controlList.DataBind();
-                toggle();
-                }
-                }
-
-                public void toggle()
-                {
-                JsRuntime.InvokeAsync<Object>
-                    ("viewSwitch");
-                    if (this.treeView.CssClass != "e-view time-duration")
-                    {
-                    this.treeView.CssClass = "e-view time-duration";
-                    this.treeView.DataBind();
-                    }
-                    }
-
-                    public void OnSampleSelect(Syncfusion.EJ2.RazorComponents.Lists.SelectEventArgs arg)
-                    {
-
-                    string ad = JsonConvert.SerializeObject(arg);
-                    ListViewEvent data = JsonConvert.DeserializeObject<ListViewEvent>
-                        (ad, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-                        List<string>
-                            ls = new List<string>
-                                ();
-                                List<string>
-                                    ls1 = new List<string>
-                                        ();
-                                        if(SampleBrowser.CurrentUrl != data.data.Url){
-                                        if (SampleBrowser.ActionDescription != null)
-                                        {
-                                        foreach (string element1 in SampleBrowser.ActionDescription)
-                                        {
-                                        ls.Add(element1);
-                                        }
-                                        JsRuntime.InvokeAsync<Object>
-                                            ("updateActionDescription", ls);
-                                            }
-                                            else
-                                            {
-                                            JsRuntime.InvokeAsync<Object>
-                                                ("updateActionDescription", new List<string>
-                                                    ());
-                                                    }
-                                                    if (SampleBrowser.Description != null)
-                                                    {
-                                                    foreach (string element in SampleBrowser.Description)
-                                                    {
-                                                    ls1.Add(element);
-                                                    }
-                                                    JsRuntime.InvokeAsync<Object>
-                                                        ("updateDescription", ls1);
-                                                        }
-                                                        else
-                                                        {
-                                                        JsRuntime.InvokeAsync<Object>
-                                                            ("updateDescription", new List<string>
-                                                                ());
-                                                                }
-
-                                                                JsRuntime.InvokeAsync<Object>
-                                                                    ("destroyControl", new List<string>
-                                                                        ());
-
-                                                                        var temp = JsRuntime.InvokeAsync<Object>
-                                                                    ("persistURL",data.data, new List<string>
-                                                                        ());
-
-                                                                        UriHelper.NavigateTo(data.data.Url);
-                                                                        SampleBrowser.CurrentUrl = data.data.Url;
-
-                                                                        }
-                                                                        }
-
-
-                                                                        [Parameter]
-                                                                        private object ListDataSource { get; set; }
-
-                                                                        protected override void OnAfterRender()
-                                                                        {
-                                                                        ListDataSource = this.controlList.DataSource = SampleBrowser.CurrentControl;
-                                                                        this.controlList.DataBind();
-                                                                        SampleBrowser.CurrentControl.ForEach(f =>
-                                                                        {
-                                                                        if (f.Name == SampleBrowser.CurrentSampleName)
-                                                                        {
-                                                                        SampleBrowser.CurrentUrl = f.Url;
-                                                                        }
-                                                                        });
-                                                                        }
-
-                                                                        object ListFields = new
-                                                                        {
-                                                                        id = "UID",
-                                                                        groupBy = "Category",
-                                                                        text = "Name",
-                                                                        sortBy = "Order"
-                                                                        };
-
-                                                                        }
diff --git a/ej2-blazor-samples/Shared/NavMenu.razor b/ej2-blazor-samples/Shared/NavMenu.razor
new file mode 100644
index 000000000..250e42296
--- /dev/null
+++ b/ej2-blazor-samples/Shared/NavMenu.razor
@@ -0,0 +1,173 @@
+@using ej2_blazor_samples
+@using ej2_blazor_samples.Shared
+@using Newtonsoft.Json
+@using Syncfusion.EJ2.RazorComponents.Lists
+@using Syncfusion.EJ2.RazorComponents.Navigations
+@using System.Reflection
+@using Microsoft.AspNetCore.Components
+
+@inject Microsoft.AspNetCore.Components.IUriHelper UriHelper
+@inject IJSRuntime JsRuntime;
+
+
+
+@*<div id="controlTree" class='e-view'></div>*@
+<EjsTreeView ID="controlTree" Fields="@DataSource" CssClass="@treeviewClass" FullRowSelect="true" ExpandOn="@ExpandOnSettings.Click" NodeSelected="@onNodeClick" ref="treeView"></EjsTreeView>
+
+
+<div id="controlSamples" class="time-duration">
+    <div id="sb-left-back1" class="back" role="button" tabindex="0" onclick="@toggle">
+        <div class="e-icons sb-icons back-icon"></div>
+        <div class='control-name'>All Controls</div>
+    </div>
+    <EjsListView id="controlList" CssClass="e-view sb-control-list-top" DataSource="@ListDataSource" Fields="@ListFields" ref="controlList" Select="@OnSampleSelect"></EjsListView>
+</div>
+<div>
+</div>
+
+
+@functions{
+
+    EjsListView controlList;
+
+    EjsTreeView treeView;
+
+
+    private string treeviewClass { get; set; } = "e-view time-duration trans-left";
+
+    string listviewClass = "";
+
+    Object DataSource = new
+    {
+        dataSource = SampleBrowser.SampleList.GroupBy(u => u.Category).Select(g =>
+        {
+            List<SampleList>
+    lst = g.ToList();
+            lst.OrderBy(ob => ob.Order);
+            lst.ForEach(sam =>
+        {
+        sam.Samples.ForEach(curSam =>
+    {
+        SampleBrowser.SampleUrls.Add(curSam.Url);
+    });
+    });
+            return new { dataSource = lst, Name = lst[0].Category, UID = g.Key, expanded = true };
+        }),
+        id = "UID",
+        text = "Name",
+        child = "dataSource"
+    };
+
+
+    private void onNodeClick(object arg)
+    {
+        //JsRuntime.InvokeAsync<Object>("test", arg);
+        string adc = JsonConvert.SerializeObject(arg);
+        TreeViewEventModel data = JsonConvert.DeserializeObject<TreeViewEventModel>
+            (adc, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+        if (data.nodeData.parentID != null)
+        {
+            SampleBrowser.CurrentControl = SampleBrowser.Config.GetType().GetProperty(data.nodeData.text).GetValue(SampleBrowser.Config) as List<Sample>
+                ;
+            ListDataSource = this.controlList.DataSource = SampleBrowser.CurrentControl;
+            this.controlList.DataBind();
+            toggle();
+        }
+    }
+
+    public void toggle()
+    {
+        JsRuntime.InvokeAsync<Object>
+            ("viewSwitch");
+        if (this.treeView.CssClass != "e-view time-duration")
+        {
+            this.treeView.CssClass = "e-view time-duration";
+            this.treeView.DataBind();
+        }
+    }
+
+    public void OnSampleSelect(Syncfusion.EJ2.RazorComponents.Lists.SelectEventArgs arg)
+    {
+
+        string ad = JsonConvert.SerializeObject(arg);
+        ListViewEvent data = JsonConvert.DeserializeObject<ListViewEvent>
+            (ad, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+        List<string>
+            ls = new List<string>
+                ();
+        List<string>
+            ls1 = new List<string>
+                ();
+        if (SampleBrowser.CurrentUrl != data.data.Url)
+        {
+            if (SampleBrowser.ActionDescription != null)
+            {
+                foreach (string element1 in SampleBrowser.ActionDescription)
+                {
+                    ls.Add(element1);
+                }
+                JsRuntime.InvokeAsync<Object>
+                    ("updateActionDescription", ls);
+            }
+            else
+            {
+                JsRuntime.InvokeAsync<Object>
+                    ("updateActionDescription", new List<string>
+                        ());
+            }
+            if (SampleBrowser.Description != null)
+            {
+                foreach (string element in SampleBrowser.Description)
+                {
+                    ls1.Add(element);
+                }
+                JsRuntime.InvokeAsync<Object>
+                    ("updateDescription", ls1);
+            }
+            else
+            {
+                JsRuntime.InvokeAsync<Object>
+                    ("updateDescription", new List<string>
+                        ());
+            }
+
+            JsRuntime.InvokeAsync<Object>
+                ("destroyControl", new List<string>
+                    ());
+
+            var temp = JsRuntime.InvokeAsync<Object>
+        ("persistURL", data.data, new List<string>
+            ());
+
+            UriHelper.NavigateTo(data.data.Url);
+            SampleBrowser.CurrentUrl = data.data.Url;
+
+        }
+    }
+
+
+    [Parameter]
+    private object ListDataSource { get; set; }
+
+    protected override void OnAfterRender()
+    {
+        ListDataSource = this.controlList.DataSource = SampleBrowser.CurrentControl;
+        this.controlList.DataBind();
+        SampleBrowser.CurrentControl.ForEach(f =>
+        {
+            if (f.Name == SampleBrowser.CurrentSampleName)
+            {
+                SampleBrowser.CurrentUrl = f.Url;
+            }
+        });
+    }
+
+    object ListFields = new
+    {
+        id = "UID",
+        groupBy = "Category",
+        text = "Name",
+        sortBy = "Order"
+    };
+
+}
diff --git a/ej2-blazor-samples/Shared/SurveyPrompt.razor b/ej2-blazor-samples/Shared/SurveyPrompt.razor
new file mode 100644
index 000000000..1db3c13c9
--- /dev/null
+++ b/ej2-blazor-samples/Shared/SurveyPrompt.razor
@@ -0,0 +1,15 @@
+<div class="alert alert-secondary mt-4" role="alert">
+    <span class="oi oi-pencil mr-2" aria-hidden="true"></span>
+    <strong>@Title</strong>
+
+    <span class="text-nowrap">
+        Please take our
+        <a target="_blank" class="font-weight-bold" href="https://go.microsoft.com/fwlink/?linkid=2086020">brief survey</a>
+    </span>
+    and tell us what you think.
+</div>
+
+@functions {
+    // Demonstrates how a parent component can supply parameters
+    [Parameter] string Title { get; set; }
+}
diff --git a/ej2-blazor-samples/Startup.cs b/ej2-blazor-samples/Startup.cs
index be89cd42b..08c81e3c0 100644
--- a/ej2-blazor-samples/Startup.cs
+++ b/ej2-blazor-samples/Startup.cs
@@ -5,20 +5,13 @@ namespace ej2_blazor_samples
 {
     public class Startup
     {
-        static Startup()
-        {
-            
-        }
         public void ConfigureServices(IServiceCollection services)
         {
-            
         }
 
         public void Configure(IComponentsApplicationBuilder app)
         {
-            
             app.AddComponent<App>("app");
         }
-        
     }
 }
diff --git a/ej2-blazor-samples/_ViewImports.cshtml b/ej2-blazor-samples/_Imports.razor
similarity index 69%
rename from ej2-blazor-samples/_ViewImports.cshtml
rename to ej2-blazor-samples/_Imports.razor
index 1fb8cca20..991e8eb6b 100644
--- a/ej2-blazor-samples/_ViewImports.cshtml
+++ b/ej2-blazor-samples/_Imports.razor
@@ -1,11 +1,9 @@
 @using System.Net.Http
-@using Microsoft.AspNetCore.Components
+@using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Layouts
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
 @using ej2_blazor_samples
 @using ej2_blazor_samples.Shared
 
-@* EJ2 Reference *@
 @using Syncfusion.EJ2.RazorComponents
-@addTagHelper *, Syncfusion.EJ2.RazorComponents
\ No newline at end of file
diff --git a/ej2-blazor-samples/ej2-blazor-samples.csproj b/ej2-blazor-samples/ej2-blazor-samples.csproj
index fc07cbef1..ad69c3df9 100644
--- a/ej2-blazor-samples/ej2-blazor-samples.csproj
+++ b/ej2-blazor-samples/ej2-blazor-samples.csproj
@@ -2,23 +2,20 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RunCommand>dotnet</RunCommand>
-    <RunArguments>blazor serve</RunArguments>
+    <RestoreAdditionalProjectSources>
+      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
+      https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
+    </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
-    <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
-    <RootNamespace>ej2_blazor_samples</RootNamespace>
+    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-
-    <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="0.9.0-preview3-19154-02" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.9.0-preview3-19154-02" PrivateAssets="all" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="Syncfusion.EJ2.AspNet.Core.RazorComponents" Version="17.1.0.38-beta" />
-    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.9.0-preview3-19154-02" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+    <PackageReference Include="Syncfusion.EJ2.AspNet.Core.RazorComponents" Version="17.1.0.43-beta" />
   </ItemGroup>
 
 </Project>
diff --git a/ej2-blazor-samples/wwwroot/index.html b/ej2-blazor-samples/wwwroot/index.html
index cb0436ea2..dde66cdc5 100644
--- a/ej2-blazor-samples/wwwroot/index.html
+++ b/ej2-blazor-samples/wwwroot/index.html
@@ -69,7 +69,7 @@
     </app>
 
     <link href="styles/index.css" rel="stylesheet" />
-    <script src="_framework/components.webassembly.js"></script>
+    <script src="_framework/blazor.webassembly.js"></script>
     <script src="scripts/documenteditor/helper.js"></script>
     <script src="scripts/PdfViewer/pdfHelper.js"></script>
 
diff --git a/ej2-blazor-samples/wwwroot/styles/index.css b/ej2-blazor-samples/wwwroot/styles/index.css
index f35c60abe..04929fc04 100644
--- a/ej2-blazor-samples/wwwroot/styles/index.css
+++ b/ej2-blazor-samples/wwwroot/styles/index.css
@@ -1584,9 +1584,6 @@ propertye pane
     font-weight: 500;
     padding-left: 10px;
   }
-  .sb-github-btn{
-    display: none;
-  }
   .sb-mobile-header-buttons {
     display: table;
   }

From 33b953ae9a25816de0a4f07d0f355cc65b86d23e Mon Sep 17 00:00:00 2001
From: kmuthukumar3032 <mkdmuthu@gmail.com>
Date: Sat, 4 May 2019 21:41:35 +0530
Subject: [PATCH 2/3] config(EJ2-26156): commit for update the github samples
 with .NET Core preview4

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a583a6e25..dd80fded9 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ The samples requires the below requirements to run.
 
 ## Documentation
 
-All controls documentation for the Syncfusion ASP.NET Core Razor Components can be found on [Syncfusion Help](https://ej2.syncfusion.com/aspnet-core-razor-components/documentation/introduction/).
+All controls documentation for the Syncfusion ASP.NET Core Razor Components can be found on [Syncfusion Help](https://ej2.syncfusion.com/aspnet-core-blazor/documentation/introduction/).
 
 ## License
 

From 2afbe1e793145e75d970063f0bbd51041bca589d Mon Sep 17 00:00:00 2001
From: kmuthukumar3032 <mkdmuthu@gmail.com>
Date: Sat, 4 May 2019 21:45:34 +0530
Subject: [PATCH 3/3] config(EJ2-26156): commit for update the github samples
 with .NET Core preview4

---
 ej2-blazor-samples/wwwroot/styles/index.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ej2-blazor-samples/wwwroot/styles/index.css b/ej2-blazor-samples/wwwroot/styles/index.css
index 04929fc04..f35c60abe 100644
--- a/ej2-blazor-samples/wwwroot/styles/index.css
+++ b/ej2-blazor-samples/wwwroot/styles/index.css
@@ -1584,6 +1584,9 @@ propertye pane
     font-weight: 500;
     padding-left: 10px;
   }
+  .sb-github-btn{
+    display: none;
+  }
   .sb-mobile-header-buttons {
     display: table;
   }