Update packages and upgrade to .NET Aspire 9.3

README.md

@@ -1,6 +1,6 @@
 # Azure Url Shortener (AzUrlShortener)
 
-![GitHub Release](https://img.shields.io/github/v/release/microsoft/AzUrlShortener)  ![.NET](https://img.shields.io/badge/9.0-512BD4?logo=dotnet&logoColor=fff) [![Build](https://github.com/microsoft/AzUrlShortener/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/microsoft/AzUrlShortener/actions/workflows/build.yml) ![GitHub License](https://img.shields.io/github/license/microsoft/AzUrlShortener)
+![GitHub Release](https://img.shields.io/github/v/release/microsoft/AzUrlShortener)  ![.NET](https://img.shields.io/badge/9.0-512BD4?logo=dotnet&logoColor=fff) [![Build](https://github.com/microsoft/AzUrlShortener/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/microsoft/AzUrlShortener/actions/workflows/build.yml) ![GitHub License](https://img.shields.io/github/license/microsoft/AzUrlShortener) [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?&logo=discord&logoColor=white)](https://discord.gg/6zA3jKw)
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors-)

doc/how-to-migrate-data.md

@@ -1,16 +1,28 @@
-# How to migrate your data
+# HowAzure Storage Explorer is a free tool to manage your Azure cloud storage resources (aka your short URLs) from your desktop. It's cross-platform and can be downloaded [here](https://azure.microsoft.com/en-us/products/storage/storage-explorer/).
 
+In the resources deployed to Azure, there will be 2 storage accounts. One for the redirect service (azfunc-light) and one acting as the data store. That last one is the one you want to use for the data migration. The name of that storage account should start with `urldata`. migrate your data
 
-The easiest way to migrate your data between account or from an ealier version of AzUrlShortener is to use the **Azure Storage Explorer** to export the data as a CSV files and use the TinyBlazorAdmin to import the files .
-
+The easiest way to migrate your data between accounts or from an earlier version of AzUrlShortener is to use the **Azure Storage Explorer** to export the data as CSV files and use the TinyBlazorAdmin to import the files.
 
 Azure Storage Explorer is a free tool to manage your Azure cloud storage resources (aka your short URLs) from your desktop. It’s a cross-platform and can be downloaded [here](https://azure.microsoft.com/en-us/products/storage/storage-explorer/). 
 
 In the resources deployed to Azure there will be 2 storage accounts. One for the redirect service (azfunc-light) and one acting as the data store. That last one is the one you want to use for the data migration. The name of that storage account should start wirh `urldata`. 
 
-You need to expot to CSV the following tables:
+You need to export to CSV the following tables:
 - UrlsDetails: This table contains the details of the short URLs, including the original URL, the short URL, schedules, etc.
-- ClickStats: This table contains the clicks informations.
+- ClickStats: This table contains the click information.
+
+The best settings to export when planning to import using the TinyBlazorAdmin are:
 
+![export_settings](../images/export_settings.png)
 
 To import the data use the Import button in the Settings page.
+
+If you have customized the structure of the tables by adding custom columns, you will need to import the data using Azure Storage Explorer instead to keep those columns.
+
+Here are the settings to use when importing using Azure Storage Explorer:
+- Make sure you use the same column delimiters as used in the export.
+- You need to select the data type for each column.
+- Uncheck the checkbox *Ignore empty string values*.
+
+![Import settings when using Azure Storage Explorer](../images/import_using_azStorage-explorer.png)

src/Api/Cloud5mins.ShortenerTools.Api.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Azure.Data.Tables" Version="9.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
+    <PackageReference Include="Aspire.Azure.Data.Tables" Version="9.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
   </ItemGroup>
 
   <ItemGroup>

src/AppHost/Cloud5mins.ShortenerTools.AppHost.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.3.0" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
-    <PackageReference Include="Aspire.Hosting.Azure.Functions" Version="9.1.0-preview.1.25121.10" />
-    <PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.1.0" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.3.0" />
+    <PackageReference Include="Aspire.Hosting.Azure.Functions" Version="9.3.0-preview.1.25265.20" />
+    <PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.3.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Core/Cloud5mins.ShortenerTools.Core.csproj

@@ -5,11 +5,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Aspire.Azure.Data.Tables" Version="9.1.0" />
-    <PackageReference Include="cronos" Version="0.9.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
+    <PackageReference Include="Aspire.Azure.Data.Tables" Version="9.3.0" />
+    <PackageReference Include="cronos" Version="0.11.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
 
     <PackageReference Include="CsvHelper" Version="33.0.1" />
-
   </ItemGroup>
 </Project>

src/FunctionsLight/Cloud5mins.ShortenerTools.FunctionsLight.csproj

@@ -12,9 +12,9 @@
     <!-- <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" /> -->
     <!-- <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" /> -->
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.4" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServiceDefaults\Cloud5mins.ShortenerTools.ServiceDefaults.csproj" />

src/ServiceDefaults/Cloud5mins.ShortenerTools.ServiceDefaults.csproj

@@ -10,13 +10,13 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.3.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
   </ItemGroup>
 
 </Project>

src/TinyBlazorAdmin/Components/Pages/Help.razor

@@ -6,7 +6,7 @@
 <FluentCard Width="50%" Height="50%">
     <ul>
         <li>This is an admin tool, it can create, modify and delete any URL in your data store. Make sure you secure it properly.</li>
-        <li>Refer to the <a href="https://github.com/microsoft/AzUrlShortener/blob/main/doc/faq.md">documentation on GitHub</a> for more details.</li>
-        <li>Having an issue or an idea for a new feature? Please check the GitHub [issues](https://github.com/microsoft/AzUrlShortener/issues) or [discussions](https://github.com/microsoft/AzUrlShortener/discussions).</li>
+        <li>Refer to the <a href="https://github.com/microsoft/AzUrlShortener/blob/main/doc/faq.md"  target="_blank">documentation on GitHub</a> for more details.</li>
+        <li>Having an issue or an idea for a new feature? Please check the GitHub <a href="https://github.com/microsoft/AzUrlShortener/issues" target="_blank">issues</a> or <a href="https://github.com/microsoft/AzUrlShortener/discussions"  target="_blank">discussions</a>.</li>
     </ul>
 </FluentCard>