From 3397e4c99913a92b54fdc072cc7effda23bf27c4 Mon Sep 17 00:00:00 2001 From: lindexi Date: Tue, 22 Dec 2020 19:32:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Common/src/System/SR.cs | 2 ++ .../src/dotnetCampus.WPF/Program.cs | 14 ++++++++ .../dotnet-campus.PublicKey.snk | Bin 0 -> 160 bytes .../src/dotnetCampus.WPF/dotnet-campus.snk | Bin 0 -> 596 bytes .../dotnetCampus.WPF/dotnetCampus.WPF.csproj | 9 +++++ .../src/dotnetCampus.WPF/dotnetCampus.WPF.sln | 34 ++++++++++++++++++ 6 files changed, 59 insertions(+) create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln diff --git a/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs b/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs index 0ecaad06f94..5b2b5db760a 100644 --- a/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs +++ b/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs @@ -6,6 +6,8 @@ using System.Resources; using System.Runtime.CompilerServices; +[assembly:InternalsVisibleTo("dotnetCampus.WPF, PublicKey=0024000004800000940000000602000000240000525341310004000001000100256f5cb79140dbc25623807d6823ca4b5b602209eaaf71f064e5926a7039c24351c1e2ad3130e194631307ed36a76ad4b832e237a467fefbd693428c7ecc5d4cc26796f6f8b705311948e00f2be5fa2db52ddff50a5b3eb0acc715b45618c1a92532ae2326529fb9e0f58a44abf31e9b5701994464186d3b9f52169b6e0f80b9")] + #if WINDOWS_BASE namespace MS.Internal.WindowsBase #elif PRESENTATION_CORE diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs new file mode 100644 index 00000000000..ae9e97c4315 --- /dev/null +++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs @@ -0,0 +1,14 @@ +using System; +using System.Runtime.CompilerServices; + + +namespace dotnetCampus.WPF +{ + class Program + { + static void Main(string[] args) + { + Console.WriteLine("Hello World!"); + } + } +} diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk new file mode 100644 index 0000000000000000000000000000000000000000..a21f243aa1b954575ec15f1d38b7faf500a46ff6 GIT binary patch literal 160 zcmV;R0AK$ABme*efB*oL000060ssI2Bme+XQ$aBR1ONa50096cZ(O&LK-ER^B$X50hvT( O7;QVBQWl$T4}iI1d_a-_ literal 0 HcmV?d00001 diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk new file mode 100644 index 0000000000000000000000000000000000000000..8251708e309f71ab6f702b832821fe8dcc7b02e8 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096cZ(O&LK-ER^B$X50hvT(7;QVBQWl$T4}iHB zq&`FG;kp?#ZTb*RSg=)NYMg4=OfD^6w7@&Hl9tWd5lZlIcfwp^3-Zc0_CU>GB8$WM z@}6}K+lYwPFTwO902FLVW8jlC)=C>8Woal^h4qKdJuU>c~98VTKhEw9sKiw~8 z>LJijo!W)!;B<{T^z=+Ub;;VI;6!yNq=gItW%*yg{N?2%t`Ew;*}C*sz$lfgoo1G$ zVq?%=>Ku1O!jX@=IRL)&G@Wsv@dP8n%ax)jov3gnHO=?wav0b`J + + + Exe + net5.0 + dotnet-campus.snk + + + diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln new file mode 100644 index 00000000000..71196ac7fb7 --- /dev/null +++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF", "dotnetCampus.WPF.csproj", "{BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x64.ActiveCfg = Debug|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x64.Build.0 = Debug|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x86.ActiveCfg = Debug|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x86.Build.0 = Debug|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|Any CPU.Build.0 = Release|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x64.ActiveCfg = Release|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x64.Build.0 = Release|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x86.ActiveCfg = Release|Any CPU + {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal From f6b5bbbce97c5f9534db5e4b72582f735e1fc53f Mon Sep 17 00:00:00 2001 From: lindexi Date: Wed, 20 Apr 2022 20:28:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/dotnetCampus.WPF/dotnetCampus.WPF.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj index 46af5f5ce46..96505041751 100644 --- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj +++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj @@ -1,8 +1,8 @@ - Exe - net5.0 + net6.0-windows + true dotnet-campus.snk From 1d7fc3dd5f1569fd8b00aebecc09fd4c8041bb9e Mon Sep 17 00:00:00 2001 From: lindexi Date: Wed, 20 Apr 2022 21:09:07 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/dotnetCampus.WPF/Directory.Build.props | 3 +++ .../src/dotnetCampus.WPF/Directory.Build.targets | 3 +++ .../src/dotnetCampus.WPF/Program.cs | 7 ++++++- .../src/dotnetCampus.WPF/dotnetCampus.WPF.csproj | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props new file mode 100644 index 00000000000..faf2349bae2 --- /dev/null +++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props @@ -0,0 +1,3 @@ + + + diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets new file mode 100644 index 00000000000..faf2349bae2 --- /dev/null +++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets @@ -0,0 +1,3 @@ + + + diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs index ae9e97c4315..80ef5a775a1 100644 --- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs +++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs @@ -1,5 +1,9 @@ using System; using System.Runtime.CompilerServices; +using System.Windows; +using System.Windows.Media; +using System.Windows.Media.Composition; +using System.Windows.Navigation; namespace dotnetCampus.WPF @@ -8,7 +12,8 @@ class Program { static void Main(string[] args) { - Console.WriteLine("Hello World!"); + Application application = new Application(); + NavigationService applicationNavService = application.NavService; } } } diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj index 96505041751..438b3d73c21 100644 --- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj +++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj @@ -3,7 +3,21 @@ net6.0-windows true + True dotnet-campus.snk + + + ..\..\..\.. + + $(Configuration) + + Microsoft.DotNet.Wpf.GitHub.Debug + Microsoft.DotNet.Wpf.GitHub + + + + + From 3916f1d7c3c406b0b9d42562fcd14aa7b0c0cfea Mon Sep 17 00:00:00 2001 From: lindexi Date: Thu, 21 Apr 2022 20:06:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E5=9C=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CustomWpf/CustomWpf.sln | 14 ++++++++ .../Directory.Build.props | 0 .../Directory.Build.targets | 0 .../dotnetCampus.CustomWpf.Lib}/Program.cs | 0 .../dotnet-campus.PublicKey.snk | Bin .../dotnet-campus.snk | Bin .../dotnetCampus.WPF.csproj | 2 +- .../src/dotnetCampus.WPF/dotnetCampus.WPF.sln | 34 ------------------ 8 files changed, 15 insertions(+), 35 deletions(-) create mode 100644 CustomWpf/CustomWpf.sln rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/Directory.Build.props (100%) rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/Directory.Build.targets (100%) rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/Program.cs (100%) rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/dotnet-campus.PublicKey.snk (100%) rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/dotnet-campus.snk (100%) rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/dotnetCampus.WPF.csproj (95%) delete mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln diff --git a/CustomWpf/CustomWpf.sln b/CustomWpf/CustomWpf.sln new file mode 100644 index 00000000000..c3cb3c3a7fd --- /dev/null +++ b/CustomWpf/CustomWpf.sln @@ -0,0 +1,14 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.105 +MinimumVisualStudioVersion = 10.0.40219.1 +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props similarity index 100% rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.targets similarity index 100% rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.targets diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnet-campus.PublicKey.snk similarity index 100% rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnet-campus.PublicKey.snk diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnet-campus.snk similarity index 100% rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnet-campus.snk diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj similarity index 95% rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj index 438b3d73c21..08f2027c732 100644 --- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj @@ -7,7 +7,7 @@ dotnet-campus.snk - ..\..\..\.. + ..\..\ $(Configuration) diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln deleted file mode 100644 index 71196ac7fb7..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF", "dotnetCampus.WPF.csproj", "{BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x64.Build.0 = Debug|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x86.Build.0 = Debug|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|Any CPU.Build.0 = Release|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x64.ActiveCfg = Release|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x64.Build.0 = Release|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x86.ActiveCfg = Release|Any CPU - {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal From d73165ad5475b81d97d0ede10ef969f360d0164a Mon Sep 17 00:00:00 2001 From: lindexi Date: Thu, 21 Apr 2022 20:23:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CustomWpf/CustomWpf.sln | 29 +++++++++++++++++-- CustomWpf/Directory.Build.props | 17 +++++++++++ .../Directory.Build.targets | 0 .../Directory.Build.props | 3 -- .../dotnetCampus.WPF.csproj | 2 +- .../dotnetCampus.WPF.NuGet/Program.cs | 2 ++ .../dotnetCampus.WPF.NuGet.csproj | 10 +++++++ CustomWpf/build/Version.props | 5 ++++ 8 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 CustomWpf/Directory.Build.props rename CustomWpf/{Lib/dotnetCampus.CustomWpf.Lib => }/Directory.Build.targets (100%) delete mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props create mode 100644 CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs create mode 100644 CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj create mode 100644 CustomWpf/build/Version.props diff --git a/CustomWpf/CustomWpf.sln b/CustomWpf/CustomWpf.sln index c3cb3c3a7fd..fa0ca9fa030 100644 --- a/CustomWpf/CustomWpf.sln +++ b/CustomWpf/CustomWpf.sln @@ -1,14 +1,39 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30114.105 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnetCampus.WPF", "Lib\dotnetCampus.CustomWpf.Lib\dotnetCampus.WPF.csproj", "{39764FE3-C2F9-4772-9BF6-B66923ABEC4C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{FE032A91-A790-4274-A194-02E161D1F14B}" +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}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {39764FE3-C2F9-4772-9BF6-B66923ABEC4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39764FE3-C2F9-4772-9BF6-B66923ABEC4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39764FE3-C2F9-4772-9BF6-B66923ABEC4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39764FE3-C2F9-4772-9BF6-B66923ABEC4C}.Release|Any CPU.Build.0 = Release|Any CPU + {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {39764FE3-C2F9-4772-9BF6-B66923ABEC4C} = {FE032A91-A790-4274-A194-02E161D1F14B} + {FDC9151F-3544-4C68-9D05-D8E4935F1A9F} = {27886E90-E328-4AE9-86DA-1F596554D26B} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C25E6016-F278-457B-87D6-39EC0E0A6849} + EndGlobalSection EndGlobal diff --git a/CustomWpf/Directory.Build.props b/CustomWpf/Directory.Build.props new file mode 100644 index 00000000000..b75437bf1dd --- /dev/null +++ b/CustomWpf/Directory.Build.props @@ -0,0 +1,17 @@ + + + + latest + $(MSBuildThisFileDirectory)bin\$(Configuration) + dotnet campus（.NET 职业技术学院） + + dotnet-campus + https://github.com/dotnet-campus/dotnetCampus.Ipc + https://github.com/dotnet-campus/dotnetCampus.Ipc + 包含定制的 WPF 版本 + + git + Copyright © 2020-2022 dotnet campus, All Rights Reserved. + + + diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.targets b/CustomWpf/Directory.Build.targets similarity index 100% rename from CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.targets rename to CustomWpf/Directory.Build.targets diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props deleted file mode 100644 index faf2349bae2..00000000000 --- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj index 08f2027c732..09f0a0f1b11 100644 --- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj @@ -7,7 +7,7 @@ dotnet-campus.snk - ..\..\ + ..\..\..\ $(Configuration) diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs new file mode 100644 index 00000000000..3751555cbd3 --- /dev/null +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs @@ -0,0 +1,2 @@ +// See https://aka.ms/new-console-template for more information +Console.WriteLine("Hello, World!"); diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj new file mode 100644 index 00000000000..74abf5c9766 --- /dev/null +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj @@ -0,0 +1,10 @@ + + + + Exe + net6.0 + enable + enable + + + diff --git a/CustomWpf/build/Version.props b/CustomWpf/build/Version.props new file mode 100644 index 00000000000..b7b14edcd63 --- /dev/null +++ b/CustomWpf/build/Version.props @@ -0,0 +1,5 @@ + + + 6.0.4 + + \ No newline at end of file From a6c7dca6c9d312f5aeb77f88542d78a372b1257f Mon Sep 17 00:00:00 2001 From: lindexi Date: Thu, 21 Apr 2022 21:17:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CustomWpf/CustomWpf.sln | 19 +++++++++++++++ CustomWpf/Directory.Build.props | 1 + .../Build/Package.targets | 13 +++++++++++ .../dotnetCampus.WPF.Dependencies.csproj | 17 ++++++++++++++ .../dotnetCampus.WPF.csproj | 3 +-- .../Build/Package.props | 7 ++++++ .../dotnetCampus.WPF.Resource.csproj | 23 +++++++++++++++++++ CustomWpf/NuGet.config | 9 ++++++++ CustomWpf/build/Version.props | 4 ++-- 9 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/Build/Package.targets create mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/dotnetCampus.WPF.Dependencies.csproj create mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props create mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/dotnetCampus.WPF.Resource.csproj create mode 100644 CustomWpf/NuGet.config diff --git a/CustomWpf/CustomWpf.sln b/CustomWpf/CustomWpf.sln index fa0ca9fa030..5be3cf3aedd 100644 --- a/CustomWpf/CustomWpf.sln +++ b/CustomWpf/CustomWpf.sln @@ -11,6 +11,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packaging", "Packaging", "{ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{315B416C-6CDA-4CD5-9666-69C8272CD80E}" + ProjectSection(SolutionItems) = preProject + 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}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -25,6 +34,14 @@ Global {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Release|Any CPU.Build.0 = Release|Any CPU + {D73CB485-6290-4E37-B441-8068E60CBF7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D73CB485-6290-4E37-B441-8068E60CBF7E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D73CB485-6290-4E37-B441-8068E60CBF7E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D73CB485-6290-4E37-B441-8068E60CBF7E}.Release|Any CPU.Build.0 = Release|Any CPU + {39E01A9E-C352-4B7E-96CA-612A07937470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -32,6 +49,8 @@ Global GlobalSection(NestedProjects) = preSolution {39764FE3-C2F9-4772-9BF6-B66923ABEC4C} = {FE032A91-A790-4274-A194-02E161D1F14B} {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C25E6016-F278-457B-87D6-39EC0E0A6849} diff --git a/CustomWpf/Directory.Build.props b/CustomWpf/Directory.Build.props index b75437bf1dd..961a10f9fc0 100644 --- a/CustomWpf/Directory.Build.props +++ b/CustomWpf/Directory.Build.props @@ -14,4 +14,5 @@ Copyright © 2020-2022 dotnet campus, All Rights Reserved. + diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/Build/Package.targets b/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/Build/Package.targets new file mode 100644 index 00000000000..c99690af8b8 --- /dev/null +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/Build/Package.targets @@ -0,0 +1,13 @@ + + + + $(RuntimeIdentifier) + win-x86 + + + + + + + diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/dotnetCampus.WPF.Dependencies.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/dotnetCampus.WPF.Dependencies.csproj new file mode 100644 index 00000000000..63906a8bab0 --- /dev/null +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/dotnetCampus.WPF.Dependencies.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + + false + true + + + + + + + + + + diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj index 09f0a0f1b11..b7d289f1a7e 100644 --- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj @@ -6,8 +6,8 @@ True dotnet-campus.snk - ..\..\..\ + $(Configuration) @@ -17,7 +17,6 @@ - diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props new file mode 100644 index 00000000000..f932a8463d7 --- /dev/null +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props @@ -0,0 +1,7 @@ + + + $(MSBuildThisFileDirectory)..\Assets\ + + + + diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/dotnetCampus.WPF.Resource.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/dotnetCampus.WPF.Resource.csproj new file mode 100644 index 00000000000..092ccde4276 --- /dev/null +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/dotnetCampus.WPF.Resource.csproj @@ -0,0 +1,23 @@ + + + + net6.0 + false + true + + ..\..\..\ + + + $(Configuration) + + Microsoft.DotNet.Wpf.GitHub.Debug + Microsoft.DotNet.Wpf.GitHub + + $(WpfRepoRoot)\artifacts\packaging\$(WpfConfig)\$(WpfOuputFolder) + + + + + + + diff --git a/CustomWpf/NuGet.config b/CustomWpf/NuGet.config new file mode 100644 index 00000000000..f578cf96933 --- /dev/null +++ b/CustomWpf/NuGet.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/CustomWpf/build/Version.props b/CustomWpf/build/Version.props index b7b14edcd63..c66636f9398 100644 --- a/CustomWpf/build/Version.props +++ b/CustomWpf/build/Version.props @@ -1,5 +1,5 @@ - 6.0.4 + 6.0.4-alpha01-001232332 - \ No newline at end of file +