diff --git a/src/Antelcat.Wpf.I18N.Demo.Framework/Antelcat.Wpf.I18N.Demo.Framework.csproj b/src/Antelcat.Wpf.I18N.Demo.Framework/Antelcat.Wpf.I18N.Demo.Framework.csproj index 74f8aa3..900e85b 100644 --- a/src/Antelcat.Wpf.I18N.Demo.Framework/Antelcat.Wpf.I18N.Demo.Framework.csproj +++ b/src/Antelcat.Wpf.I18N.Demo.Framework/Antelcat.Wpf.I18N.Demo.Framework.csproj @@ -1,96 +1,49 @@ - - - - - Debug - AnyCPU - {A175A416-9532-4102-90B4-02F807EE1F94} - WinExe - Antelcat.Wpf.I18N.Demo.Framework - Antelcat.Wpf.I18N.Demo.Framework - v4.8.1 - 11 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - - - App.xaml - Code - - - - - - - - ResXFileCodeGenerator - Properties\Resources.resx - - - ResXFileCodeGenerator - Resources.resx - Properties\Resources.zh.resx - - - Properties\Resources.Designer.cs - - - {51d7777a-1f56-4f09-8581-7f546b2f1817} - Antelcat.Wpf.I18N.SourceGenerators - - - {87ae0560-b337-4958-97b4-7928c6c6962c} - Antelcat.Wpf.I18N - - - - - - - - - - \ No newline at end of file + + + + WinExe + net462 + enable + enable + true + 1.0.0 + preview + 1.0.0 + Antelcat.Wpf.I18N.Demo + ../Icon.ico + Antelcat + Antelcat.Wpf.I18N.Demo-1.0.0 + Antelcat.Wpf.I18N.Demo + Antelcat.Wpf.I18N.Demo + Antelcat + + + + + + + + + + + + Properties\Resources.resx + Resources.Designer.cs + + + Properties\Resources.zh.resx + Resources.resx + + + + + + + Properties\Resources.Designer.cs + + + + + + + diff --git a/src/Antelcat.Wpf.I18N.Demo.Framework/App.config b/src/Antelcat.Wpf.I18N.Demo.Framework/App.config deleted file mode 100644 index 37a0993..0000000 --- a/src/Antelcat.Wpf.I18N.Demo.Framework/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/Antelcat.Wpf.I18N.Demo.Framework/App.xaml b/src/Antelcat.Wpf.I18N.Demo.Framework/App.xaml index 9dc43c6..402e2ef 100644 --- a/src/Antelcat.Wpf.I18N.Demo.Framework/App.xaml +++ b/src/Antelcat.Wpf.I18N.Demo.Framework/App.xaml @@ -1,8 +1,8 @@ - + > diff --git a/src/Antelcat.Wpf.I18N.Demo.Framework/App.xaml.cs b/src/Antelcat.Wpf.I18N.Demo.Framework/App.xaml.cs index b6aa8c6..c141c58 100644 --- a/src/Antelcat.Wpf.I18N.Demo.Framework/App.xaml.cs +++ b/src/Antelcat.Wpf.I18N.Demo.Framework/App.xaml.cs @@ -1,24 +1,21 @@ -using System; -using System.Collections.Generic; -using System.Configuration; +using System.Configuration; using System.Data; -using System.Linq; -using System.Threading.Tasks; using System.Windows; -using Antelcat.Wpf.I18N.Demo.Models; using Antelcat.Wpf.I18N.Demo.Windows; -namespace Antelcat.Wpf.I18N.Demo.Framework +namespace Antelcat.Wpf.I18N.Demo { /// - /// App.xaml 的交互逻辑 + /// Interaction logic for App.xaml /// - public partial class App : Application + public partial class App { + protected override void OnStartup(StartupEventArgs e) { base.OnStartup(e); new MainWindow().Show(); } } + } diff --git a/src/Antelcat.Wpf.I18N.Demo.Framework/AssemblyInfo.cs b/src/Antelcat.Wpf.I18N.Demo.Framework/AssemblyInfo.cs new file mode 100644 index 0000000..b0ec827 --- /dev/null +++ b/src/Antelcat.Wpf.I18N.Demo.Framework/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/src/Antelcat.Wpf.I18N.Demo/Antelcat.Wpf.I18N.Demo.csproj b/src/Antelcat.Wpf.I18N.Demo/Antelcat.Wpf.I18N.Demo.csproj index 1fb354a..91046e4 100644 --- a/src/Antelcat.Wpf.I18N.Demo/Antelcat.Wpf.I18N.Demo.csproj +++ b/src/Antelcat.Wpf.I18N.Demo/Antelcat.Wpf.I18N.Demo.csproj @@ -9,38 +9,39 @@ 1.0.0 preview 1.0.0 - ./Icon.ico + ../Icon.ico Antelcat Antelcat.Wpf.I18N.Demo-1.0.0 - - + + - - + + + + + + + Resources.Designer.cs + - ResXFileCodeGenerator - Properties\Resources.Designer.cs Properties\Resources.resx + Resources.Designer.cs - ResXFileCodeGenerator - Resources.resx Properties\Resources.zh.resx + Resources.resx - - Properties\Resources.Designer.cs - - + diff --git a/Antelcat.Wpf.I18N.sln b/src/Antelcat.Wpf.I18N.sln similarity index 51% rename from Antelcat.Wpf.I18N.sln rename to src/Antelcat.Wpf.I18N.sln index 4142b6b..d3c3645 100644 --- a/Antelcat.Wpf.I18N.sln +++ b/src/Antelcat.Wpf.I18N.sln @@ -3,27 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.34202.233 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.Wpf.I18N", "src\Antelcat.Wpf.I18N\Antelcat.Wpf.I18N.csproj", "{87AE0560-B337-4958-97B4-7928C6C6962C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.Wpf.I18N", "Antelcat.Wpf.I18N\Antelcat.Wpf.I18N.csproj", "{87AE0560-B337-4958-97B4-7928C6C6962C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.Wpf.I18N.SourceGenerators", "src\Antelcat.Wpf.I18N.SourceGenerators\Antelcat.Wpf.I18N.SourceGenerators.csproj", "{51D7777A-1F56-4F09-8581-7F546B2F1817}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.Wpf.I18N.SourceGenerators", "Antelcat.Wpf.I18N.SourceGenerators\Antelcat.Wpf.I18N.SourceGenerators.csproj", "{51D7777A-1F56-4F09-8581-7F546B2F1817}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.Wpf.I18N.Demo", "src\Antelcat.Wpf.I18N.Demo\Antelcat.Wpf.I18N.Demo.csproj", "{7F3763B9-97B3-4FB6-89B5-B54600693577}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.Wpf.I18N.Demo", "Antelcat.Wpf.I18N.Demo\Antelcat.Wpf.I18N.Demo.csproj", "{7F3763B9-97B3-4FB6-89B5-B54600693577}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extern", "Extern", "{2835EE7C-9F76-45A2-9754-E86902623A81}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Feast.CodeAnalysis.Extensions.SourceGenerators", "extrern\CodeAnalysis.Extensions\src\Feast.CodeAnalysis.Extensions.SourceGenerators\Feast.CodeAnalysis.Extensions.SourceGenerators.csproj", "{B2D6AEE3-D9E3-40E5-A80B-B3E3F3DD64B2}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Antelcat.Wpf.I18N.Demo.Shared", "Antelcat.Wpf.I18N.Demo.Shared\Antelcat.Wpf.I18N.Demo.Shared.shproj", "{50BA267B-188A-46D3-B957-878790AF1E76}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Antelcat.Wpf.I18N.Demo.Shared", "src\Antelcat.Wpf.I18N.Demo.Shared\Antelcat.Wpf.I18N.Demo.Shared.shproj", "{50BA267B-188A-46D3-B957-878790AF1E76}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__", "__", "{DAC60261-079A-44B4-8872-61FC02A4AE9F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antelcat.Wpf.I18N.Demo.Framework", "src\Antelcat.Wpf.I18N.Demo.Framework\Antelcat.Wpf.I18N.Demo.Framework.csproj", "{A175A416-9532-4102-90B4-02F807EE1F94}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Feast.CodeAnalysis.Extensions.SourceGenerators", "..\extern\CodeAnalysis.Extensions\src\Feast.CodeAnalysis.Extensions.SourceGenerators\Feast.CodeAnalysis.Extensions.SourceGenerators.csproj", "{190293FC-3F2C-4FEE-8090-62A09713DD8D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__", "__", "{DAC60261-079A-44B4-8872-61FC02A4AE9F}" - ProjectSection(SolutionItems) = preProject - Icon.png = Icon.png - LICENSE = LICENSE - README.en.md = README.en.md - README.md = README.md - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.Wpf.I18N.Demo.Framework", "Antelcat.Wpf.I18N.Demo.Framework\Antelcat.Wpf.I18N.Demo.Framework.csproj", "{3B6E4D9A-09D3-4567-B89F-4B02EB6D3F55}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -43,29 +37,29 @@ Global {7F3763B9-97B3-4FB6-89B5-B54600693577}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F3763B9-97B3-4FB6-89B5-B54600693577}.Release|Any CPU.ActiveCfg = Release|Any CPU {7F3763B9-97B3-4FB6-89B5-B54600693577}.Release|Any CPU.Build.0 = Release|Any CPU - {B2D6AEE3-D9E3-40E5-A80B-B3E3F3DD64B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2D6AEE3-D9E3-40E5-A80B-B3E3F3DD64B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2D6AEE3-D9E3-40E5-A80B-B3E3F3DD64B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2D6AEE3-D9E3-40E5-A80B-B3E3F3DD64B2}.Release|Any CPU.Build.0 = Release|Any CPU - {A175A416-9532-4102-90B4-02F807EE1F94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A175A416-9532-4102-90B4-02F807EE1F94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A175A416-9532-4102-90B4-02F807EE1F94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A175A416-9532-4102-90B4-02F807EE1F94}.Release|Any CPU.Build.0 = Release|Any CPU + {190293FC-3F2C-4FEE-8090-62A09713DD8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {190293FC-3F2C-4FEE-8090-62A09713DD8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {190293FC-3F2C-4FEE-8090-62A09713DD8D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {190293FC-3F2C-4FEE-8090-62A09713DD8D}.Release|Any CPU.Build.0 = Release|Any CPU + {3B6E4D9A-09D3-4567-B89F-4B02EB6D3F55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B6E4D9A-09D3-4567-B89F-4B02EB6D3F55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B6E4D9A-09D3-4567-B89F-4B02EB6D3F55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B6E4D9A-09D3-4567-B89F-4B02EB6D3F55}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {B2D6AEE3-D9E3-40E5-A80B-B3E3F3DD64B2} = {2835EE7C-9F76-45A2-9754-E86902623A81} + {190293FC-3F2C-4FEE-8090-62A09713DD8D} = {2835EE7C-9F76-45A2-9754-E86902623A81} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73D6AEFA-1477-4119-9F85-0DA27E35BDB8} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution - src\Antelcat.Wpf.I18N.Demo.Shared\Antelcat.Wpf.I18N.Demo.Shared.projitems*{50ba267b-188a-46d3-b957-878790af1e76}*SharedItemsImports = 13 - src\WpfToolkit.Mvvm.SourceGenerators\WpfToolkit.Mvvm.SourceGenerators.projitems*{51d7777a-1f56-4f09-8581-7f546b2f1817}*SharedItemsImports = 5 - src\Antelcat.Wpf.I18N.Demo.Shared\Antelcat.Wpf.I18N.Demo.Shared.projitems*{7f3763b9-97b3-4fb6-89b5-b54600693577}*SharedItemsImports = 5 - src\Antelcat.Wpf.I18N.Demo.Shared\Antelcat.Wpf.I18N.Demo.Shared.projitems*{a175a416-9532-4102-90b4-02f807ee1f94}*SharedItemsImports = 4 - extrern\CodeAnalysis.Extensions\src\Feast.CodeAnalysis.Extensions.Shared\Feast.CodeAnalysis.Extensions.Shared.projitems*{b2d6aee3-d9e3-40e5-a80b-b3e3f3dd64b2}*SharedItemsImports = 5 + ..\extern\CodeAnalysis.Extensions\src\Feast.CodeAnalysis.Extensions.Shared\Feast.CodeAnalysis.Extensions.Shared.projitems*{190293fc-3f2c-4fee-8090-62a09713dd8d}*SharedItemsImports = 5 + Antelcat.Wpf.I18N.Demo.Shared\Antelcat.Wpf.I18N.Demo.Shared.projitems*{3b6e4d9a-09d3-4567-b89f-4b02eb6d3f55}*SharedItemsImports = 5 + Antelcat.Wpf.I18N.Demo.Shared\Antelcat.Wpf.I18N.Demo.Shared.projitems*{50ba267b-188a-46d3-b957-878790af1e76}*SharedItemsImports = 13 + WpfToolkit.Mvvm.SourceGenerators\WpfToolkit.Mvvm.SourceGenerators.projitems*{51d7777a-1f56-4f09-8581-7f546b2f1817}*SharedItemsImports = 5 + Antelcat.Wpf.I18N.Demo.Shared\Antelcat.Wpf.I18N.Demo.Shared.projitems*{7f3763b9-97b3-4fb6-89b5-b54600693577}*SharedItemsImports = 5 EndGlobalSection EndGlobal diff --git a/Antelcat.Wpf.I18N.sln.DotSettings b/src/Antelcat.Wpf.I18N.sln.DotSettings similarity index 100% rename from Antelcat.Wpf.I18N.sln.DotSettings rename to src/Antelcat.Wpf.I18N.sln.DotSettings diff --git a/src/Antelcat.Wpf.I18n.SourceGenerators/Antelcat.Wpf.I18n.SourceGenerators.csproj b/src/Antelcat.Wpf.I18n.SourceGenerators/Antelcat.Wpf.I18n.SourceGenerators.csproj index 52d63e6..5bf87ce 100644 --- a/src/Antelcat.Wpf.I18n.SourceGenerators/Antelcat.Wpf.I18n.SourceGenerators.csproj +++ b/src/Antelcat.Wpf.I18n.SourceGenerators/Antelcat.Wpf.I18n.SourceGenerators.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Antelcat.Wpf.I18N.Demo/Icon.ico b/src/Icon.ico similarity index 100% rename from src/Antelcat.Wpf.I18N.Demo/Icon.ico rename to src/Icon.ico