Skip to content

Commit 14ff1bd

Browse files
StarryXYJStarryXYJ
committed
优化项目命名空间，nuget package id似乎被占用了
1 parent e590feb commit 14ff1bd

52 files changed

Lines changed: 175 additions & 245 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Avalonia.DynamicLocalization.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DynamicLocalization.Demo", "Avalonia.DynamicLocalization.Demo\Avalonia.DynamicLocalization.Demo.csproj", "{7E253D0B-B339-42D3-B4F9-E59D4511B4AB}"
3+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicLocalization.Avalonia.Demo", "DynamicLocalization.Avalonia.Demo\DynamicLocalization.Avalonia.Demo.csproj", "{7E253D0B-B339-42D3-B4F9-E59D4511B4AB}"
44
EndProject
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DynamicLocalization", "Avalonia.DynamicLocalization\Avalonia.DynamicLocalization.csproj", "{2809A296-AAA4-4167-951A-4CA0AD1DB562}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicLocalization.Avalonia", "DynamicLocalization.Avalonia\DynamicLocalization.Avalonia.csproj", "{2809A296-AAA4-4167-951A-4CA0AD1DB562}"
66
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DynamicLocalization.Demo.Resx", "Avalonia.DynamicLocalization.Demo.Resx\Avalonia.DynamicLocalization.Demo.Resx.csproj", "{A1396D45-0995-4F8C-9D9F-26F49F1EB046}"
7+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicLocalization.Avalonia.Demo.Resx", "DynamicLocalization.Avalonia.Demo.Resx\DynamicLocalization.Avalonia.Demo.Resx.csproj", "{A1396D45-0995-4F8C-9D9F-26F49F1EB046}"
88
EndProject
99
Global
1010
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎Avalonia.DynamicLocalization/Core/LanguageService.cs‎

Lines changed: 0 additions & 192 deletions
This file was deleted.

Avalonia.DynamicLocalization.Demo.Resx/App.axaml renamed to DynamicLocalization.Avalonia.Demo.Resx/App.axaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<Application xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
x:Class="Avalonia.DynamicLocalization.Demo.Resx.App"
4-
xmlns:local="using:Avalonia.DynamicLocalization.Demo.Resx"
3+
x:Class="DynamicLocalization.Avalonia.Demo.Resx.App"
4+
xmlns:local="using:DynamicLocalization.Avalonia.Demo.Resx"
5+
xmlns:resx="clr-namespace:DynamicLocalization.Avalonia.Demo.Resx"
56
RequestedThemeVariant="Default">
67
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
78

89
<Application.DataTemplates>
9-
<local:ViewLocator/>
10+
<resx:ViewLocator/>
1011
</Application.DataTemplates>
1112

1213
<Application.Styles>

Avalonia.DynamicLocalization.Demo.Resx/App.axaml.cs renamed to DynamicLocalization.Avalonia.Demo.Resx/App.axaml.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
using Avalonia.Data.Core;
55
using Avalonia.Data.Core.Plugins;
66
using System.Linq;
7+
using DynamicLocalization.Avalonia.Demo.Resx.ViewModels;
8+
using DynamicLocalization.Avalonia.Demo.Resx.Views;
79
using Avalonia.Markup.Xaml;
8-
using Avalonia.DynamicLocalization.Demo.Resx.ViewModels;
9-
using Avalonia.DynamicLocalization.Demo.Resx.Views;
10+
using DynamicLocalization.Avalonia.Demo.Resx.ViewModels;
11+
using DynamicLocalization.Avalonia.Demo.Resx.Views;
1012
using Microsoft.Extensions.DependencyInjection;
11-
using Avalonia.DynamicLocalization.Extensions;
13+
using DynamicLocalization.Avalonia.Extensions;
1214

13-
namespace Avalonia.DynamicLocalization.Demo.Resx;
15+
namespace DynamicLocalization.Avalonia.Demo.Resx;
1416

1517
/// <summary>
1618
/// Application entry point demonstrating RESX-based localization.
@@ -69,7 +71,7 @@ private void ConfigureServices(IServiceCollection services)
6971
{
7072
services.AddResxLocalization(options =>
7173
{
72-
options.ResourceType = typeof(global::Avalonia.DynamicLocalization.Demo.Resx.Resources.Strings);
74+
options.ResourceType = typeof(global::DynamicLocalization.Avalonia.Demo.Resx.Resources.Strings);
7375
options.AutoDetectCultures = false;
7476
options.KnownCultures = new[] { "en", "en-US", "en-GB", "zh-CN", "zh-TW", "ja", "de" };
7577
});

Avalonia.DynamicLocalization.Demo.Resx/Assets/avalonia-logo.ico renamed to DynamicLocalization.Avalonia.Demo.Resx/Assets/avalonia-logo.ico

File renamed without changes.

Avalonia.DynamicLocalization.Demo.Resx/Avalonia.DynamicLocalization.Demo.Resx.csproj renamed to DynamicLocalization.Avalonia.Demo.Resx/DynamicLocalization.Avalonia.Demo.Resx.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
9-
<RootNamespace>Avalonia.DynamicLocalization.Demo.Resx</RootNamespace>
109
</PropertyGroup>
1110

1211
<ItemGroup>
@@ -28,7 +27,7 @@
2827
</ItemGroup>
2928

3029
<ItemGroup>
31-
<ProjectReference Include="..\Avalonia.DynamicLocalization\Avalonia.DynamicLocalization.csproj"/>
30+
<ProjectReference Include="..\DynamicLocalization.Avalonia\DynamicLocalization.Avalonia.csproj" />
3231
</ItemGroup>
3332

3433
<!-- RESX localization files -->

Avalonia.DynamicLocalization.Demo.Resx/Program.cs renamed to DynamicLocalization.Avalonia.Demo.Resx/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Avalonia;
22
using System;
33

4-
namespace Avalonia.DynamicLocalization.Demo.Resx;
4+
namespace DynamicLocalization.Avalonia.Demo.Resx;
55

66
sealed class Program
77
{

Avalonia.DynamicLocalization.Demo.Resx/Resources/Strings.Designer.cs renamed to DynamicLocalization.Avalonia.Demo.Resx/Resources/Strings.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Avalonia.DynamicLocalization.Demo.Resx/Resources/Strings.de.resx renamed to DynamicLocalization.Avalonia.Demo.Resx/Resources/Strings.de.resx

File renamed without changes.

Avalonia.DynamicLocalization.Demo.Resx/Resources/Strings.en-GB.resx renamed to DynamicLocalization.Avalonia.Demo.Resx/Resources/Strings.en-GB.resx

File renamed without changes.

0 commit comments

Comments
 (0)