diff --git a/CustomWpf/CustomWpf.sln b/CustomWpf/CustomWpf.sln index 5be3cf3aedd..500cb3ff708 100644 --- a/CustomWpf/CustomWpf.sln +++ b/CustomWpf/CustomWpf.sln @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{FE032A91-A79 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packaging", "Packaging", "{27886E90-E328-4AE9-86DA-1F596554D26B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF.NuGet", "Packaging\dotnetCampus.WPF.NuGet\dotnetCampus.WPF.NuGet.csproj", "{FDC9151F-3544-4C68-9D05-D8E4935F1A9F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnetCampus.WPF.NuGet", "Packaging\dotnetCampus.WPF.NuGet\dotnetCampus.WPF.NuGet.csproj", "{FDC9151F-3544-4C68-9D05-D8E4935F1A9F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnetCampus.WPF.Resource", "Lib\dotnetCampus.CustomWpf.Resource\dotnetCampus.WPF.Resource.csproj", "{D73CB485-6290-4E37-B441-8068E60CBF7E}" EndProject @@ -18,7 +18,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution build\Version.props = build\Version.props EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF.Dependencies", "Lib\dotnetCampus.CustomWpf.Dependencies\dotnetCampus.WPF.Dependencies.csproj", "{39E01A9E-C352-4B7E-96CA-612A07937470}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnetCampus.WPF.Dependencies", "Lib\dotnetCampus.CustomWpf.Dependencies\dotnetCampus.WPF.Dependencies.csproj", "{39E01A9E-C352-4B7E-96CA-612A07937470}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{1FCB5593-B06F-4DC3-B63F-315CF6DCF2BA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoApp", "Demo\DemoApp\DemoApp.csproj", "{3C3A4FD6-333B-480B-8354-3BB209FA89DB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoLib1", "Demo\DemoLib1\DemoLib1.csproj", "{B892B53C-752A-4700-8845-CD095F3AC08B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoLib2", "Demo\DemoLib2\DemoLib2.csproj", "{17CCDE40-5335-479A-8B67-E7B0A1332EA9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -42,6 +50,18 @@ Global {39E01A9E-C352-4B7E-96CA-612A07937470}.Debug|Any CPU.Build.0 = Debug|Any CPU {39E01A9E-C352-4B7E-96CA-612A07937470}.Release|Any CPU.ActiveCfg = Release|Any CPU {39E01A9E-C352-4B7E-96CA-612A07937470}.Release|Any CPU.Build.0 = Release|Any CPU + {3C3A4FD6-333B-480B-8354-3BB209FA89DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C3A4FD6-333B-480B-8354-3BB209FA89DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C3A4FD6-333B-480B-8354-3BB209FA89DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C3A4FD6-333B-480B-8354-3BB209FA89DB}.Release|Any CPU.Build.0 = Release|Any CPU + {B892B53C-752A-4700-8845-CD095F3AC08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B892B53C-752A-4700-8845-CD095F3AC08B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B892B53C-752A-4700-8845-CD095F3AC08B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B892B53C-752A-4700-8845-CD095F3AC08B}.Release|Any CPU.Build.0 = Release|Any CPU + {17CCDE40-5335-479A-8B67-E7B0A1332EA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {17CCDE40-5335-479A-8B67-E7B0A1332EA9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17CCDE40-5335-479A-8B67-E7B0A1332EA9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {17CCDE40-5335-479A-8B67-E7B0A1332EA9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -51,6 +71,9 @@ Global {FDC9151F-3544-4C68-9D05-D8E4935F1A9F} = {27886E90-E328-4AE9-86DA-1F596554D26B} {D73CB485-6290-4E37-B441-8068E60CBF7E} = {FE032A91-A790-4274-A194-02E161D1F14B} {39E01A9E-C352-4B7E-96CA-612A07937470} = {FE032A91-A790-4274-A194-02E161D1F14B} + {3C3A4FD6-333B-480B-8354-3BB209FA89DB} = {1FCB5593-B06F-4DC3-B63F-315CF6DCF2BA} + {B892B53C-752A-4700-8845-CD095F3AC08B} = {1FCB5593-B06F-4DC3-B63F-315CF6DCF2BA} + {17CCDE40-5335-479A-8B67-E7B0A1332EA9} = {1FCB5593-B06F-4DC3-B63F-315CF6DCF2BA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C25E6016-F278-457B-87D6-39EC0E0A6849} diff --git a/CustomWpf/Demo/DemoApp/App.xaml b/CustomWpf/Demo/DemoApp/App.xaml new file mode 100644 index 00000000000..d2734c10dbf --- /dev/null +++ b/CustomWpf/Demo/DemoApp/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/CustomWpf/Demo/DemoApp/App.xaml.cs b/CustomWpf/Demo/DemoApp/App.xaml.cs new file mode 100644 index 00000000000..5a67a03ff54 --- /dev/null +++ b/CustomWpf/Demo/DemoApp/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace DemoApp +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/CustomWpf/Demo/DemoApp/AssemblyInfo.cs b/CustomWpf/Demo/DemoApp/AssemblyInfo.cs new file mode 100644 index 00000000000..8b5504ecfbb --- /dev/null +++ b/CustomWpf/Demo/DemoApp/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/CustomWpf/Demo/DemoApp/DemoApp.csproj b/CustomWpf/Demo/DemoApp/DemoApp.csproj new file mode 100644 index 00000000000..1a3bf6c44c4 --- /dev/null +++ b/CustomWpf/Demo/DemoApp/DemoApp.csproj @@ -0,0 +1,21 @@ + + + + WinExe + net6.0-windows + enable + true + false + + + + + + + + + + + + + diff --git a/CustomWpf/Demo/DemoApp/MainWindow.xaml b/CustomWpf/Demo/DemoApp/MainWindow.xaml new file mode 100644 index 00000000000..b52095773ab --- /dev/null +++ b/CustomWpf/Demo/DemoApp/MainWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/CustomWpf/Demo/DemoApp/MainWindow.xaml.cs b/CustomWpf/Demo/DemoApp/MainWindow.xaml.cs new file mode 100644 index 00000000000..d2dfd425734 --- /dev/null +++ b/CustomWpf/Demo/DemoApp/MainWindow.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace DemoApp +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/CustomWpf/Demo/DemoLib1/AssemblyInfo.cs b/CustomWpf/Demo/DemoLib1/AssemblyInfo.cs new file mode 100644 index 00000000000..8b5504ecfbb --- /dev/null +++ b/CustomWpf/Demo/DemoLib1/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/CustomWpf/Demo/DemoLib1/DemoLib1.csproj b/CustomWpf/Demo/DemoLib1/DemoLib1.csproj new file mode 100644 index 00000000000..efadcca11bb --- /dev/null +++ b/CustomWpf/Demo/DemoLib1/DemoLib1.csproj @@ -0,0 +1,18 @@ + + + + net6.0-windows + enable + true + false + + + + + + + + + + + diff --git a/CustomWpf/Demo/DemoLib1/UserControl1.xaml b/CustomWpf/Demo/DemoLib1/UserControl1.xaml new file mode 100644 index 00000000000..c1a99ddd476 --- /dev/null +++ b/CustomWpf/Demo/DemoLib1/UserControl1.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/CustomWpf/Demo/DemoLib1/UserControl1.xaml.cs b/CustomWpf/Demo/DemoLib1/UserControl1.xaml.cs new file mode 100644 index 00000000000..255d31e44fa --- /dev/null +++ b/CustomWpf/Demo/DemoLib1/UserControl1.xaml.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using DemoLib2; + +namespace DemoLib1 +{ + /// + /// Interaction logic for UserControl1.xaml + /// + public partial class UserControl1 : UserControl + { + public UserControl1() + { + InitializeComponent(); + } + + public Foo Foo { get; } = new Foo(); + } +} diff --git a/CustomWpf/Demo/DemoLib2/DemoLib2.csproj b/CustomWpf/Demo/DemoLib2/DemoLib2.csproj new file mode 100644 index 00000000000..268cbace460 --- /dev/null +++ b/CustomWpf/Demo/DemoLib2/DemoLib2.csproj @@ -0,0 +1,10 @@ + + + + net6.0 + enable + enable + false + + + diff --git a/CustomWpf/Demo/DemoLib2/Foo.cs b/CustomWpf/Demo/DemoLib2/Foo.cs new file mode 100644 index 00000000000..a5438636cd7 --- /dev/null +++ b/CustomWpf/Demo/DemoLib2/Foo.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DemoLib2 +{ + public class Foo + { + } +}