diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 3430a29..885ffdb 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup .NET 9 + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Restore run: dotnet restore src/CodeIndex.sln diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f51c37b..3bc512c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,10 +16,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup .NET + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Restore run: dotnet restore src/CodeIndex.sln @@ -53,10 +53,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup .NET + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Restore (solution) run: dotnet restore src/CodeIndex.sln diff --git a/README.md b/README.md index 0a34dfa..eb364b6 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,10 @@ Latest improvements to the Visual Studio extension - Replaced WinForms dialog with Vista IFileOpenDialog (better UX); removed System.Windows.Forms dependency. - Theme-Aware UI - Buttons/styles now use Visual Studio dynamic theme brushes (light/dark/HC) instead of hardcoded colors. +- Internationalization (i18n) + - Full multi-language support with automatic VS language detection. + - Currently supports English and Simplified Chinese (易于扩展其他语言). + - All UI elements (windows, buttons, messages) fully localized. - Quick Navigation Buttons - Open buttons beside Local & Remote URLs (auto prepend http:// when missing). - Responsive Async Commands diff --git a/src/CodeIndex.Common/CodeIndex.Common.csproj b/src/CodeIndex.Common/CodeIndex.Common.csproj index 5d927a4..6462f81 100644 --- a/src/CodeIndex.Common/CodeIndex.Common.csproj +++ b/src/CodeIndex.Common/CodeIndex.Common.csproj @@ -1,12 +1,12 @@  - net9.0 + net10.0 latest - + diff --git a/src/CodeIndex.ConsoleApp/CodeIndex.ConsoleApp.csproj b/src/CodeIndex.ConsoleApp/CodeIndex.ConsoleApp.csproj index e940aeb..be92742 100644 --- a/src/CodeIndex.ConsoleApp/CodeIndex.ConsoleApp.csproj +++ b/src/CodeIndex.ConsoleApp/CodeIndex.ConsoleApp.csproj @@ -2,16 +2,16 @@ Exe - net9.0 + net10.0 latest - - - - - + + + + + diff --git a/src/CodeIndex.Files/CodeIndex.Files.csproj b/src/CodeIndex.Files/CodeIndex.Files.csproj index ce369f0..325261f 100644 --- a/src/CodeIndex.Files/CodeIndex.Files.csproj +++ b/src/CodeIndex.Files/CodeIndex.Files.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 latest diff --git a/src/CodeIndex.IndexBuilder/CodeIndex.IndexBuilder.csproj b/src/CodeIndex.IndexBuilder/CodeIndex.IndexBuilder.csproj index b8f5d60..08e4d56 100644 --- a/src/CodeIndex.IndexBuilder/CodeIndex.IndexBuilder.csproj +++ b/src/CodeIndex.IndexBuilder/CodeIndex.IndexBuilder.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 latest @@ -10,7 +10,7 @@ - + diff --git a/src/CodeIndex.MaintainIndex/CodeIndex.MaintainIndex.csproj b/src/CodeIndex.MaintainIndex/CodeIndex.MaintainIndex.csproj index 5029389..3d0e79c 100644 --- a/src/CodeIndex.MaintainIndex/CodeIndex.MaintainIndex.csproj +++ b/src/CodeIndex.MaintainIndex/CodeIndex.MaintainIndex.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 latest diff --git a/src/CodeIndex.Search/CodeIndex.Search.csproj b/src/CodeIndex.Search/CodeIndex.Search.csproj index cfe4086..8897d1c 100644 --- a/src/CodeIndex.Search/CodeIndex.Search.csproj +++ b/src/CodeIndex.Search/CodeIndex.Search.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 latest diff --git a/src/CodeIndex.Server/.config/dotnet-tools.json b/src/CodeIndex.Server/.config/dotnet-tools.json new file mode 100644 index 0000000..fbb7b76 --- /dev/null +++ b/src/CodeIndex.Server/.config/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "10.0.1", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/src/CodeIndex.Server/CodeIndex.Server.csproj b/src/CodeIndex.Server/CodeIndex.Server.csproj index 32bd45d..daf58b2 100644 --- a/src/CodeIndex.Server/CodeIndex.Server.csproj +++ b/src/CodeIndex.Server/CodeIndex.Server.csproj @@ -1,12 +1,11 @@  - net9.0 + net10.0 latest 869cc96a-d1b8-4328-9b99-bc356c26a33a Linux - PreserveNewest @@ -15,14 +14,13 @@ - - - - - + + + + - + diff --git a/src/CodeIndex.Server/Dockerfile b/src/CodeIndex.Server/Dockerfile index 821e8ba..aa95329 100644 --- a/src/CodeIndex.Server/Dockerfile +++ b/src/CodeIndex.Server/Dockerfile @@ -1,16 +1,16 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base WORKDIR /app ENV ASPNETCORE_ENVIRONMENT Production ENV CodeIndex__LuceneIndex /luceneindex ENV CodeIndex__MonitorFolder /monitorfolder ENV CodeIndex__IsInLinux true ENV CodeIndex__LocalUrl http://localhost:80/ -EXPOSE 80 -EXPOSE 443 +EXPOSE 8080 +EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY ["CodeIndex.Server/CodeIndex.Server.csproj", "CodeIndex.Server/"] COPY ["CodeIndex.Common/CodeIndex.Common.csproj", "CodeIndex.Common/"] diff --git a/src/CodeIndex.Test/CodeIndex.Test.csproj b/src/CodeIndex.Test/CodeIndex.Test.csproj index e6226c8..b841520 100644 --- a/src/CodeIndex.Test/CodeIndex.Test.csproj +++ b/src/CodeIndex.Test/CodeIndex.Test.csproj @@ -1,18 +1,18 @@  - net9.0 + net10.0 latest false - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/CodeIndex.VisualStudioExtension/CodeIndex.VisualStudioExtension.csproj b/src/CodeIndex.VisualStudioExtension/CodeIndex.VisualStudioExtension.csproj index c001715..ff557e7 100644 --- a/src/CodeIndex.VisualStudioExtension/CodeIndex.VisualStudioExtension.csproj +++ b/src/CodeIndex.VisualStudioExtension/CodeIndex.VisualStudioExtension.csproj @@ -60,6 +60,15 @@ Models\CodeContentProcessing.cs + + + PublicResXFileCodeGenerator + Strings.Designer.cs + + + Strings.resx + + Resources\Extension-Icon.png @@ -128,6 +137,13 @@ + + + True + True + Strings.resx + + $(NoWarn);MSB4011 diff --git a/src/CodeIndex.VisualStudioExtension/Controls/CodeIndexSearchControl.xaml b/src/CodeIndex.VisualStudioExtension/Controls/CodeIndexSearchControl.xaml index 7645863..0022250 100644 --- a/src/CodeIndex.VisualStudioExtension/Controls/CodeIndexSearchControl.xaml +++ b/src/CodeIndex.VisualStudioExtension/Controls/CodeIndexSearchControl.xaml @@ -4,6 +4,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vsshell="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0" + xmlns:cvt="clr-namespace:CodeIndex.VisualStudioExtension.Converts" + xmlns:res="clr-namespace:CodeIndex.VisualStudioExtension.Resources" mc:Ignorable="d" d:DesignHeight="281.2" d:DesignWidth="987.2" Foreground="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}" @@ -13,37 +15,37 @@ - + - - - + + - - - - -