Skip to content

Commit 532f09d

Browse files
fboucherfboucheros
fboucher
and
fboucheros
authored
Update packages and upgrade to .NET Aspire 9.3 (#573)
* Enhances data migration documentation and updates dependencies (#572) * Adding a Discord Badge * Updates dependencies to latest versions * Fix Anchors in help page * Adds documentation for data migration --------- Co-authored-by: Frank Boucher <125662836+fboucheros@users.noreply.github.com>
1 parent 133288f commit 532f09d

10 files changed

Lines changed: 38 additions & 27 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Azure Url Shortener (AzUrlShortener)
22

3-
![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)
3+
![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)
44

55
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
66
[![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors-)

‎doc/how-to-migrate-data.md‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
1-
# How to migrate your data
1+
# 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/).
22

3+
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
34

4-
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 .
5-
5+
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.
66

77
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/).
88

99
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`.
1010

11-
You need to expot to CSV the following tables:
11+
You need to export to CSV the following tables:
1212
- UrlsDetails: This table contains the details of the short URLs, including the original URL, the short URL, schedules, etc.
13-
- ClickStats: This table contains the clicks informations.
13+
- ClickStats: This table contains the click information.
14+
15+
The best settings to export when planning to import using the TinyBlazorAdmin are:
1416

17+
![export_settings](../images/export_settings.png)
1518

1619
To import the data use the Import button in the Settings page.
20+
21+
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.
22+
23+
Here are the settings to use when importing using Azure Storage Explorer:
24+
- Make sure you use the same column delimiters as used in the export.
25+
- You need to select the data type for each column.
26+
- Uncheck the checkbox *Ignore empty string values*.
27+
28+
![Import settings when using Azure Storage Explorer](../images/import_using_azStorage-explorer.png)

‎images/export_settings.png‎

81.5 KB
Loading

‎images/import_using_azStorage-explorer.png‎

68.7 KB
Loading

‎src/Api/Cloud5mins.ShortenerTools.Api.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Aspire.Azure.Data.Tables" Version="9.1.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
10+
<PackageReference Include="Aspire.Azure.Data.Tables" Version="9.3.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/AppHost/Cloud5mins.ShortenerTools.AppHost.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.3.0" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
15-
<PackageReference Include="Aspire.Hosting.Azure.Functions" Version="9.1.0-preview.1.25121.10" />
16-
<PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.1.0" />
14+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.3.0" />
15+
<PackageReference Include="Aspire.Hosting.Azure.Functions" Version="9.3.0-preview.1.25265.20" />
16+
<PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.3.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/Core/Cloud5mins.ShortenerTools.Core.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Aspire.Azure.Data.Tables" Version="9.1.0" />
9-
<PackageReference Include="cronos" Version="0.9.0" />
10-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
8+
<PackageReference Include="Aspire.Azure.Data.Tables" Version="9.3.0" />
9+
<PackageReference Include="cronos" Version="0.11.0" />
10+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
1111

1212
<PackageReference Include="CsvHelper" Version="33.0.1" />
13-
1413
</ItemGroup>
1514
</Project>

‎src/FunctionsLight/Cloud5mins.ShortenerTools.FunctionsLight.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<!-- <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" /> -->
1313
<!-- <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" /> -->
1414
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
15-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.2" />
15+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.4" />
1616
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
17-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.1" />
17+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\ServiceDefaults\Cloud5mins.ShortenerTools.ServiceDefaults.csproj" />

‎src/ServiceDefaults/Cloud5mins.ShortenerTools.ServiceDefaults.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<ItemGroup>
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

13-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.3.0" />
14-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
16-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
13+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
14+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
16+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
2020
</ItemGroup>
2121

2222
</Project>

‎src/TinyBlazorAdmin/Components/Pages/Help.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<FluentCard Width="50%" Height="50%">
77
<ul>
88
<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>
9-
<li>Refer to the <a href="https://github.com/microsoft/AzUrlShortener/blob/main/doc/faq.md">documentation on GitHub</a> for more details.</li>
10-
<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>
9+
<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>
10+
<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>
1111
</ul>
1212
</FluentCard>

0 commit comments

Comments
 (0)