From 3397e4c99913a92b54fdc072cc7effda23bf27c4 Mon Sep 17 00:00:00 2001 From: lindexi Date: Tue, 22 Dec 2020 19:32:10 +0800 Subject: [PATCH 01/26] =?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 02/26] =?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 03/26] =?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 04/26] =?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 05/26] =?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 06/26] =?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 + From 3b47989d1f4af01f39e5ddf6f800c325b268c18c Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 16:29:05 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props index f932a8463d7..ca9ef88448a 100644 --- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props @@ -2,6 +2,4 @@ $(MSBuildThisFileDirectory)..\Assets\ - - From 92d980d4adf410b3efda1090a72f57d40a7e9675 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 16:29:18 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E7=AE=80=E5=8C=96=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 这是测试代码 --- CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs index 80ef5a775a1..edfa89a0b31 100644 --- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs @@ -5,7 +5,6 @@ using System.Windows.Media.Composition; using System.Windows.Navigation; - namespace dotnetCampus.WPF { class Program @@ -13,7 +12,7 @@ class Program static void Main(string[] args) { Application application = new Application(); - NavigationService applicationNavService = application.NavService; + //NavigationService applicationNavService = application.NavService; } } } From e62f4d80ddc2eae8c265cab54d4653970d86ce09 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 16:29:28 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C=E5=87=86=E5=A4=87=E6=89=93?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CustomWpf/build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CustomWpf/build/Version.props b/CustomWpf/build/Version.props index c66636f9398..0fd74ea58ea 100644 --- a/CustomWpf/build/Version.props +++ b/CustomWpf/build/Version.props @@ -1,5 +1,5 @@ - 6.0.4-alpha01-001232332 + 6.0.4-alpha01-202205a6c7dca6 From 74f19b69e1104eaee1e596f2f2f55518cc13927f Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 17:38:52 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=9E=83=E5=9C=BE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dotnetCampus.WPF.NuGet/MainTask.cs | 55 +++++++++++++++++++ .../dotnetCampus.WPF.NuGet/Program.cs | 20 ++++++- .../dotnetCampus.WPF.NuGet.csproj | 4 ++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs new file mode 100644 index 00000000000..93929943d7d --- /dev/null +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs @@ -0,0 +1,55 @@ +using System.Reflection; + +using dotnetCampus.Configurations; +using dotnetCampus.DotNETBuild.Context; +using dotnetCampus.DotNETBuild.Utils; +using dotnetCampus.GitCommand; + +namespace dotnetCampus.WPF.NuGet; + +class MainTask +{ + public void Run() + { + var appConfigurator = AppConfigurator.GetAppConfigurator(); + FileSniff fileSniff = new FileSniff(appConfigurator); + fileSniff.Sniff(); + + // 重新寻找 CustomWpf.sln 所在文件夹 + var slnFolder = FindDirectoryByFile(new DirectoryInfo(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!), "CustomWpf.sln")!; + + var compileConfiguration = appConfigurator.Of(); + + Git git = new Git(new DirectoryInfo(compileConfiguration.CodeDirectory)); + var currentCommit = git.GetCurrentCommit(); + + // 找到 Version 版本号文件 + var versionFile = Path.Combine(slnFolder.FullName, @"build\Version.props"); + + } + + /// + /// 向上寻找到存在某个文件名的文件夹 + /// + /// + /// + /// + private static DirectoryInfo FindDirectoryByFile(DirectoryInfo currentDirectory, string fileName) + { + var directory = currentDirectory; + while (directory != null) + { + var file = Path.Combine(directory.FullName, fileName); + if (File.Exists(file)) + { + return directory; + } + else + { + directory = directory.Parent; + } + } + + throw new ArgumentException($"Can not find any Directory. CurrentDirectory =\"{currentDirectory}\";FileName=\"{fileName}\""); + } +} diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs index 3751555cbd3..6b2b0fc13a9 100644 --- a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs @@ -1,2 +1,18 @@ -// See https://aka.ms/new-console-template for more information -Console.WriteLine("Hello, World!"); +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using dotnetCampus.Configurations; + +namespace dotnetCampus.WPF.NuGet; + +internal class Program +{ + public static void Main(string[] args) + { + MainTask mainTask = new MainTask(); + mainTask.Run(); + } +} diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj index 74abf5c9766..498a71049ee 100644 --- a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj @@ -7,4 +7,8 @@ enable + + + + From 48f28ea2262cbdfcb1e68bca60f6ef2ae9b16310 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 17:46:52 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs | 9 +++++++++ CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs | 1 + 2 files changed, 10 insertions(+) diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs index 93929943d7d..a528545072c 100644 --- a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/MainTask.cs @@ -12,6 +12,15 @@ class MainTask public void Run() { var appConfigurator = AppConfigurator.GetAppConfigurator(); + + var commandLineArgs = Environment.GetCommandLineArgs(); + appConfigurator.AddCommandLine(commandLineArgs, new Dictionary() + { + {"t","Tag" } + }); + + var tagVersion = appConfigurator.Default["Tag"]; + FileSniff fileSniff = new FileSniff(appConfigurator); fileSniff.Sniff(); diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs index 6b2b0fc13a9..1b402c73549 100644 --- a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using dotnetCampus.Configurations; +using dotnetCampus.DotNETBuild.Utils; namespace dotnetCampus.WPF.NuGet; From 6107f8ff79ccd9147d28a8cf997495095af2b387 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 17:49:42 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E4=B8=8D=E7=BB=A7=E7=BB=AD=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E8=B0=83=E8=AF=95=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index f4e91b0fedf..1762fd1e4bc 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -3,23 +3,23 @@ name: Build WPF on: [push] jobs: - BuildDebug: + # BuildDebug: - runs-on: windows-latest + # runs-on: windows-latest - steps: - - uses: actions/checkout@v1 - # - name: Install Nuget - # uses: nuget/setup-nuget@v1 - # with: - # nuget-version: '5.x' - - name: Build - run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86 - - name: Push - uses: actions/upload-artifact@v1 - with: - name: WPF_Debug - path: ./artifacts/packages/Debug/NonShipping + # steps: + # - uses: actions/checkout@v1 + # # - name: Install Nuget + # # uses: nuget/setup-nuget@v1 + # # with: + # # nuget-version: '5.x' + # - name: Build + # run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86 + # - name: Push + # uses: actions/upload-artifact@v1 + # with: + # name: WPF_Debug + # path: ./artifacts/packages/Debug/NonShipping BuildRelease: From f12621a6afa663418444219344320f1aef9cb062 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 20:19:21 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E7=A6=81=E7=94=A8=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj index 498a71049ee..8b5a0a04d35 100644 --- a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj @@ -5,6 +5,7 @@ net6.0 enable enable + false From 6a335a11167480970a5788297dbc64c9e9cc71a4 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 20:19:59 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B5=8C=E5=85=A5?= =?UTF-8?q?=E6=BA=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj index b7d289f1a7e..5f667bfc3ed 100644 --- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj +++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj @@ -15,6 +15,12 @@ Microsoft.DotNet.Wpf.GitHub + + true + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + From fa31e5d7753ba1070fe25a66416b71692f030779 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 20:24:27 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=20Tag=20=E6=89=93?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build.yml | 44 ++++++++----------- .github/workflows/NuGet-Tag-Publish.yml | 58 +++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/NuGet-Tag-Publish.yml diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 1762fd1e4bc..a029bd70a7e 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -3,38 +3,30 @@ name: Build WPF on: [push] jobs: - # BuildDebug: + BuildDebug: - # runs-on: windows-latest + runs-on: windows-latest - # steps: - # - uses: actions/checkout@v1 - # # - name: Install Nuget - # # uses: nuget/setup-nuget@v1 - # # with: - # # nuget-version: '5.x' - # - name: Build - # run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86 - # - name: Push - # uses: actions/upload-artifact@v1 - # with: - # name: WPF_Debug - # path: ./artifacts/packages/Debug/NonShipping + steps: + - uses: actions/checkout@v1 + - name: Build + run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86 + # - name: Push + # uses: actions/upload-artifact@v1 + # with: + # name: WPF_Debug + # path: ./artifacts/packages/Debug/NonShipping - BuildRelease: + Build: runs-on: windows-latest steps: - uses: actions/checkout@v1 - # - name: Install Nuget - # uses: nuget/setup-nuget@v1 - # with: - # nuget-version: '5.x' - - name: Build + - name: Build WPF run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86 - - name: Push - uses: actions/upload-artifact@v1 - with: - name: WPF_Release - path: ./artifacts/packages/Release/NonShipping \ No newline at end of file + # - name: Push + # uses: actions/upload-artifact@v1 + # with: + # name: WPF_Release + # path: ./artifacts/packages/Release/NonShipping \ No newline at end of file diff --git a/.github/workflows/NuGet-Tag-Publish.yml b/.github/workflows/NuGet-Tag-Publish.yml new file mode 100644 index 00000000000..f619ec03a3d --- /dev/null +++ b/.github/workflows/NuGet-Tag-Publish.yml @@ -0,0 +1,58 @@ +name: Build WPF + +on: + push: + tags: + - '*' + +jobs: + # BuildDebug: + + # runs-on: windows-latest + + # steps: + # - uses: actions/checkout@v1 + # # - name: Install Nuget + # # uses: nuget/setup-nuget@v1 + # # with: + # # nuget-version: '5.x' + # - name: Build + # run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86 + # - name: Push + # uses: actions/upload-artifact@v1 + # with: + # name: WPF_Debug + # path: ./artifacts/packages/Debug/NonShipping + + Build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v1 + - name: Install Tools + run: dotnet tool install -g dotnetCampus.TagToVersion --add-source https://api.nuget.org/v3/index.json + - name: Set Package TagToVersion + run: dotnet tagtoversion -t ${{ github.ref }} -f CustomWpf\build\Version.props + - name: Build WPF + run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86 + - name: Pack NuGet + run: dotnet pack CustomWpf -c release + + - name: Install Nuget + uses: nuget/setup-nuget@v1 + with: + nuget-version: '5.x' + - name: Add private GitHub registry to NuGet + run: | + nuget sources add -name github -Source https://nuget.pkg.github.com/dotnet-campus/index.json -Username dotnet-campus -Password ${{ secrets.GITHUB_TOKEN }} + - name: Push NuGet Package + run: | + nuget push .\bin\Release\*.nupkg -Source github -SkipDuplicate + nuget push .\bin\Release\*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} + + # - name: Push + # uses: actions/upload-artifact@v1 + # with: + # name: WPF_Release + # path: ./artifacts/packages/Release/NonShipping \ No newline at end of file From cc4e0bcea5539f0b06550dfb34827b8f4a78e350 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 20:27:10 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index a029bd70a7e..84c5dff5dc6 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -17,7 +17,7 @@ jobs: # name: WPF_Debug # path: ./artifacts/packages/Debug/NonShipping - Build: + BuildRelease: runs-on: windows-latest From 11894d0ce21857da92dc518f31e8a5b3491f29be Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 20:28:26 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=A7=81=E6=9C=89?= =?UTF-8?q?=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 84c5dff5dc6..2382bf1aad3 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -9,8 +9,10 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Build + - name: Build WPF run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86 + - name: Build CustomWPF + run: dotnet build CustomWpf # - name: Push # uses: actions/upload-artifact@v1 # with: @@ -25,6 +27,8 @@ jobs: - uses: actions/checkout@v1 - name: Build WPF run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86 + - name: Build CustomWPF + run: dotnet build CustomWpf -c Release # - name: Push # uses: actions/upload-artifact@v1 # with: From 59affa6d8179807cad3f24bae793aec44ce76778 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 20:29:27 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs index 1b402c73549..d59d2ba2a93 100644 --- a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs +++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs @@ -9,6 +9,8 @@ namespace dotnetCampus.WPF.NuGet; +// 这个项目现在完全没有被用上 +// 不删除，后续需要再发布 x64 版本 internal class Program { public static void Main(string[] args) From 1ffaf90ab67bf608ad65daad4703fb67170e3fd9 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 20:48:07 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index abfa3e03b2a..14fb2a8c35e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,26 @@ +# The Custom Windows Presentation Foundation (WPF) + +This repository fork from [WPF](https://github.com/dotnet/wpf), but contains code that is not officially merged. + +The reason for creating this repo is that we can't wait for some fascinating features. + +## What version are we on? + +[v6.0.4](https://github.com/dotnet/wpf/releases/tag/v6.0.4) + +[fcb07d637abf53791e2c55c63d9207fc3232fe83](https://github.com/dotnet/wpf/commit/fcb07d637abf53791e2c55c63d9207fc3232fe83) + +## Features + +- [ToolTip closes immediately in high DPI by SamBent · Pull Request #6332 · dotnet/wpf](https://github.com/dotnet/wpf/pull/6332) +- [Try fix the first point in StylusPlugin in high DPI by lindexi · Pull Request #6428 · dotnet/wpf](https://github.com/dotnet/wpf/pull/6428) + +## Contribution + +We recommend that you submit the Pull Request to the official [WPF](https://github.com/dotnet/wpf) repository and then you can ask we to pick the commit to this repository. This repository does not accept commit. + +----- + # Windows Presentation Foundation (WPF) [![.NET Foundation](https://img.shields.io/badge/.NET%20Foundation-blueviolet.svg)](https://www.dotnetfoundation.org/) [![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/wpf/dotnet-wpf%20CI)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=270) From aa56d2c45b3bd90c2b03da75f46a8476cb3ede27 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 20:51:03 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build.yml | 14 ++++++++++++++ .github/workflows/NuGet-Tag-Publish.yml | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 2382bf1aad3..655389b92f9 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -9,6 +9,13 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: | + 3.1.x + 5.0.x + 6.0.101 - name: Build WPF run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86 - name: Build CustomWPF @@ -25,6 +32,13 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: | + 3.1.x + 5.0.x + 6.0.101 - name: Build WPF run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86 - name: Build CustomWPF diff --git a/.github/workflows/NuGet-Tag-Publish.yml b/.github/workflows/NuGet-Tag-Publish.yml index f619ec03a3d..6a74130847c 100644 --- a/.github/workflows/NuGet-Tag-Publish.yml +++ b/.github/workflows/NuGet-Tag-Publish.yml @@ -30,6 +30,13 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: | + 3.1.x + 5.0.x + 6.0.101 - name: Install Tools run: dotnet tool install -g dotnetCampus.TagToVersion --add-source https://api.nuget.org/v3/index.json - name: Set Package TagToVersion From e19589a9d67fbc7cc30352ce0919f4935dd8a0a4 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 21:09:16 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/NuGet-Tag-Publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/NuGet-Tag-Publish.yml b/.github/workflows/NuGet-Tag-Publish.yml index 6a74130847c..1866f75db02 100644 --- a/.github/workflows/NuGet-Tag-Publish.yml +++ b/.github/workflows/NuGet-Tag-Publish.yml @@ -1,4 +1,4 @@ -name: Build WPF +name: Publish Custom WPF on: push: From 867fbc06f8e20111ddc49597e4c03362aa3b936f Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 21:13:24 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CustomWpf/README.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 CustomWpf/README.md diff --git a/CustomWpf/README.md b/CustomWpf/README.md new file mode 100644 index 00000000000..9864e635efd --- /dev/null +++ b/CustomWpf/README.md @@ -0,0 +1,7 @@ +# 私有发布的 WPF 仓库 + +这个仓库包含了官方没有合入的功能 + +## 给开发者 + +本仓库当前固定 dotnet 版本号，用来解决引用依赖问题。如有升级 dotnet runtime 版本，请同步更改 global.json 的 sdk 版本号，以及 `.github\workflows\` 里面的构建代码的安装版本号 \ No newline at end of file From cd7e06f14c385d3b2717b5604d46c9ad7bf829c4 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 21:22:45 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/NuGet-Tag-Publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/NuGet-Tag-Publish.yml b/.github/workflows/NuGet-Tag-Publish.yml index 1866f75db02..7de16267ed3 100644 --- a/.github/workflows/NuGet-Tag-Publish.yml +++ b/.github/workflows/NuGet-Tag-Publish.yml @@ -55,8 +55,8 @@ jobs: nuget sources add -name github -Source https://nuget.pkg.github.com/dotnet-campus/index.json -Username dotnet-campus -Password ${{ secrets.GITHUB_TOKEN }} - name: Push NuGet Package run: | - nuget push .\bin\Release\*.nupkg -Source github -SkipDuplicate - nuget push .\bin\Release\*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} + nuget push .\CustomWpf\bin\Release\*.nupkg -Source github -SkipDuplicate + nuget push .\CustomWpf\bin\Release\*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} # - name: Push # uses: actions/upload-artifact@v1 From a0798bd3b0f4a2952ccea4af8ad8827695e4e11c Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 21:50:27 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 14fb2a8c35e..7a0888ed2e0 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,15 @@ This repository fork from [WPF](https://github.com/dotnet/wpf), but contains cod The reason for creating this repo is that we can't wait for some fascinating features. +![](https://github.com/dotnet-campus/dotnetCampus.CustomWpf +/workflows/Build%20WPF/badge.svg) + +| NuGet | Version | +|--|--| +|dotnetCampus.WPF|![](https://img.shields.io/nuget/v/dotnetCampus.WPF.svg)](https://www.nuget.org/packages/dotnetCampus.WPF)| +|dotnetCampus.WPF.Dependencies|![](https://img.shields.io/nuget/v/dotnetCampus.WPF.Resource.svg)](https://www.nuget.org/packages/dotnetCampus.WPF.Resource)| +|dotnetCampus.WPF.Resource|![](https://img.shields.io/nuget/v/dotnetCampus.WPF.Dependencies.svg)](https://www.nuget.org/packages/dotnetCampus.WPF.Dependencies)| + ## What version are we on? [v6.0.4](https://github.com/dotnet/wpf/releases/tag/v6.0.4) From 7d0ce280587b4ec910c9fe886c49d861b72da37f Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 21:53:32 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7a0888ed2e0..3cd93dc2ce6 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ The reason for creating this repo is that we can't wait for some fascinating fea | NuGet | Version | |--|--| -|dotnetCampus.WPF|![](https://img.shields.io/nuget/v/dotnetCampus.WPF.svg)](https://www.nuget.org/packages/dotnetCampus.WPF)| -|dotnetCampus.WPF.Dependencies|![](https://img.shields.io/nuget/v/dotnetCampus.WPF.Resource.svg)](https://www.nuget.org/packages/dotnetCampus.WPF.Resource)| -|dotnetCampus.WPF.Resource|![](https://img.shields.io/nuget/v/dotnetCampus.WPF.Dependencies.svg)](https://www.nuget.org/packages/dotnetCampus.WPF.Dependencies)| +|dotnetCampus.WPF|[![](https://img.shields.io/nuget/v/dotnetCampus.WPF.svg)](https://www.nuget.org/packages/dotnetCampus.WPF)| +|dotnetCampus.WPF.Dependencies|[![](https://img.shields.io/nuget/v/dotnetCampus.WPF.Resource.svg)](https://www.nuget.org/packages/dotnetCampus.WPF.Resource)| +|dotnetCampus.WPF.Resource|[![](https://img.shields.io/nuget/v/dotnetCampus.WPF.Dependencies.svg)](https://www.nuget.org/packages/dotnetCampus.WPF.Dependencies)| ## What version are we on? From b47e52888bbe1c8b2f91d06f74a469ca1f773660 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 8 May 2022 21:54:27 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 3cd93dc2ce6..d5103b5ebb8 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ This repository fork from [WPF](https://github.com/dotnet/wpf), but contains cod The reason for creating this repo is that we can't wait for some fascinating features. -![](https://github.com/dotnet-campus/dotnetCampus.CustomWpf -/workflows/Build%20WPF/badge.svg) +![](https://github.com/dotnet-campus/dotnetCampus.CustomWpf/workflows/Build%20WPF/badge.svg) | NuGet | Version | |--|--|