diff --git a/.vs/20230724_MBJC_upperpc/DesignTimeBuild/.dtbcache.v2 b/.vs/20230724_MBJC_upperpc/DesignTimeBuild/.dtbcache.v2 index 5d6c0c0..525a815 100644 Binary files a/.vs/20230724_MBJC_upperpc/DesignTimeBuild/.dtbcache.v2 and b/.vs/20230724_MBJC_upperpc/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/20230724_MBJC_upperpc/FileContentIndex/12fb37c6-759f-468b-afda-8ec451c0243b.vsidx b/.vs/20230724_MBJC_upperpc/FileContentIndex/12fb37c6-759f-468b-afda-8ec451c0243b.vsidx new file mode 100644 index 0000000..e0107c1 Binary files /dev/null and b/.vs/20230724_MBJC_upperpc/FileContentIndex/12fb37c6-759f-468b-afda-8ec451c0243b.vsidx differ diff --git a/.vs/20230724_MBJC_upperpc/FileContentIndex/160a1ffa-b114-4c37-af0d-6535c31ef466.vsidx b/.vs/20230724_MBJC_upperpc/FileContentIndex/160a1ffa-b114-4c37-af0d-6535c31ef466.vsidx new file mode 100644 index 0000000..ad5e21e Binary files /dev/null and b/.vs/20230724_MBJC_upperpc/FileContentIndex/160a1ffa-b114-4c37-af0d-6535c31ef466.vsidx differ diff --git a/.vs/20230724_MBJC_upperpc/FileContentIndex/65b7d6f5-be62-4926-ae15-df089e300757.vsidx b/.vs/20230724_MBJC_upperpc/FileContentIndex/65b7d6f5-be62-4926-ae15-df089e300757.vsidx new file mode 100644 index 0000000..a7d76f1 Binary files /dev/null and b/.vs/20230724_MBJC_upperpc/FileContentIndex/65b7d6f5-be62-4926-ae15-df089e300757.vsidx differ diff --git a/.vs/20230724_MBJC_upperpc/FileContentIndex/9d147377-68c3-4cc9-9aa5-6d01c9c37e44.vsidx b/.vs/20230724_MBJC_upperpc/FileContentIndex/9d147377-68c3-4cc9-9aa5-6d01c9c37e44.vsidx new file mode 100644 index 0000000..16e13d2 Binary files /dev/null and b/.vs/20230724_MBJC_upperpc/FileContentIndex/9d147377-68c3-4cc9-9aa5-6d01c9c37e44.vsidx differ diff --git a/.vs/20230724_MBJC_upperpc/FileContentIndex/d7e33b3f-e93a-48a1-a4b0-18133428b6ab.vsidx b/.vs/20230724_MBJC_upperpc/FileContentIndex/d7e33b3f-e93a-48a1-a4b0-18133428b6ab.vsidx new file mode 100644 index 0000000..f3c3692 Binary files /dev/null and b/.vs/20230724_MBJC_upperpc/FileContentIndex/d7e33b3f-e93a-48a1-a4b0-18133428b6ab.vsidx differ diff --git a/.vs/20230724_MBJC_upperpc/v17/.suo b/.vs/20230724_MBJC_upperpc/v17/.suo index 3e88987..9cde300 100644 Binary files a/.vs/20230724_MBJC_upperpc/v17/.suo and b/.vs/20230724_MBJC_upperpc/v17/.suo differ diff --git a/.vs/ProjectEvaluation/20230724_mbjc_upperpc.metadata.v6.1 b/.vs/ProjectEvaluation/20230724_mbjc_upperpc.metadata.v6.1 deleted file mode 100644 index 0acb68f..0000000 Binary files a/.vs/ProjectEvaluation/20230724_mbjc_upperpc.metadata.v6.1 and /dev/null differ diff --git a/.vs/ProjectEvaluation/20230724_mbjc_upperpc.projects.v6.1 b/.vs/ProjectEvaluation/20230724_mbjc_upperpc.projects.v6.1 deleted file mode 100644 index 585f4b3..0000000 Binary files a/.vs/ProjectEvaluation/20230724_mbjc_upperpc.projects.v6.1 and /dev/null differ diff --git a/FirstWindow.xaml b/FirstWindow.xaml index 5985346..de0aabd 100644 --- a/FirstWindow.xaml +++ b/FirstWindow.xaml @@ -6,6 +6,7 @@ xmlns:local="clr-namespace:_20230724_MBJC_upperpc" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Name="Window" Title="FirstWindow" Width="1600" Background="{DynamicResource MaterialDesignPaper}" @@ -15,7 +16,6 @@ TextElement.Foreground="{DynamicResource MaterialDesignBody}" WindowStartupLocation="CenterScreen" WindowStyle="None" - Name="Window" mc:Ignorable="d"> @@ -76,12 +76,12 @@ - + - + diff --git a/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.dll b/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.dll index d1956dc..97c4a83 100644 Binary files a/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.dll and b/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.dll differ diff --git a/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.exe b/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.exe index c866022..66fcfd0 100644 Binary files a/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.exe and b/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.exe differ diff --git a/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.pdb b/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.pdb index fa5d60c..d9f393c 100644 Binary files a/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.pdb and b/bin/Debug/net6.0-windows/20230724_MBJC_upperpc.pdb differ diff --git a/obj/20230724_MBJC_upperpc.csproj.nuget.dgspec.json b/obj/20230724_MBJC_upperpc.csproj.nuget.dgspec.json index 197d927..f950614 100644 --- a/obj/20230724_MBJC_upperpc.csproj.nuget.dgspec.json +++ b/obj/20230724_MBJC_upperpc.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj": {} + "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj": {} }, "projects": { - "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj": { + "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", + "projectUniqueName": "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", "projectName": "20230724_MBJC_upperpc", - "projectPath": "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", - "packagesPath": "C:\\Users\\86453\\.nuget\\packages\\", - "outputPath": "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\obj\\", + "projectPath": "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", + "packagesPath": "C:\\Users\\Chen\\.nuget\\packages\\", + "outputPath": "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\Software\\VisualStudio2022\\Shared\\NuGetPackages" + "D:\\Software\\IDE\\VisualStudio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\86453\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Chen\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -73,7 +73,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/obj/20230724_MBJC_upperpc.csproj.nuget.g.props b/obj/20230724_MBJC_upperpc.csproj.nuget.g.props index 86bb915..88a70f9 100644 --- a/obj/20230724_MBJC_upperpc.csproj.nuget.g.props +++ b/obj/20230724_MBJC_upperpc.csproj.nuget.g.props @@ -5,16 +5,16 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\86453\.nuget\packages\;D:\Software\VisualStudio2022\Shared\NuGetPackages + C:\Users\Chen\.nuget\packages\;D:\Software\IDE\VisualStudio\Shared\NuGetPackages PackageReference - 6.5.0 + 6.7.0 - - + + - C:\Users\86453\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.39 - C:\Users\86453\.nuget\packages\materialdesignthemes\4.9.0 + C:\Users\Chen\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.39 + C:\Users\Chen\.nuget\packages\materialdesignthemes\4.9.0 \ No newline at end of file diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.GeneratedMSBuildEditorConfig.editorconfig index 7964348..b2296e7 100644 --- a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = _20230724_MBJC_upperpc -build_property.ProjectDir = D:\WorkSpace\Gitea\20230724_MBJC_upperpc\ +build_property.ProjectDir = D:\Workspace\Gitea\20230724_MBJC_upperpc\ diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.assets.cache b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.assets.cache index 2a87420..2dec0ac 100644 Binary files a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.assets.cache and b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.assets.cache differ diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.csproj.AssemblyReference.cache b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.csproj.AssemblyReference.cache index 6f1ff86..45cab05 100644 Binary files a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.csproj.AssemblyReference.cache and b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.csproj.CoreCompileInputs.cache b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.csproj.CoreCompileInputs.cache index b976b11..e921567 100644 --- a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -71a54a269186d56bb969073c1962658d70ac4fab +fd746cc6dcd14fc44dcce1e634efc5ba160e94ad diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.designer.runtimeconfig.json b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.designer.runtimeconfig.json index 72598f3..1d9dc51 100644 --- a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.designer.runtimeconfig.json +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.designer.runtimeconfig.json @@ -12,9 +12,9 @@ } ], "additionalProbingPaths": [ - "C:\\Users\\86453\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\86453\\.nuget\\packages", - "D:\\Software\\VisualStudio2022\\Shared\\NuGetPackages" + "C:\\Users\\Chen\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Chen\\.nuget\\packages", + "D:\\Software\\IDE\\VisualStudio\\Shared\\NuGetPackages" ], "configProperties": { "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.dll b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.dll index d1956dc..97c4a83 100644 Binary files a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.dll and b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.dll differ diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.g.resources b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.g.resources index 6e90423..debdd66 100644 Binary files a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.g.resources and b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.g.resources differ diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.genruntimeconfig.cache b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.genruntimeconfig.cache index 93e2769..28d7333 100644 --- a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.genruntimeconfig.cache +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.genruntimeconfig.cache @@ -1 +1 @@ -b739079b1780dfde7e4c972c4065189ecd226037 +045da831a74311370f06c69a1d7f771e919172b9 diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.pdb b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.pdb index fa5d60c..d9f393c 100644 Binary files a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.pdb and b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc.pdb differ diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.cache b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.cache index 588bb49..dd87f31 100644 --- a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.cache +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -D:\WorkSpace\Gitea\20230724_MBJC_upperpc\obj\Debug\net6.0-windows\ +D:\Workspace\Gitea\20230724_MBJC_upperpc\obj\Debug\net6.0-windows\ _20230724_MBJC_upperpc none false TRACE;DEBUG;NET;NET6_0;NETCOREAPP -D:\WorkSpace\Gitea\20230724_MBJC_upperpc\App.xaml +D:\Workspace\Gitea\20230724_MBJC_upperpc\App.xaml 2-1932936564 81699574642 -198-1745317550 +198-979494243 FirstWindow.xaml;Views\FirstPageView.xaml; False diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.i.cache b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.i.cache index 6e59e1d..9c066b8 100644 --- a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.i.cache +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.i.cache @@ -4,16 +4,16 @@ winexe C# .cs -D:\WorkSpace\Gitea\20230724_MBJC_upperpc\obj\Debug\net6.0-windows\ +D:\Workspace\Gitea\20230724_MBJC_upperpc\obj\Debug\net6.0-windows\ _20230724_MBJC_upperpc none false TRACE;DEBUG;NET;NET6_0;NETCOREAPP -D:\WorkSpace\Gitea\20230724_MBJC_upperpc\App.xaml +D:\Workspace\Gitea\20230724_MBJC_upperpc\App.xaml 2-1932936564 10-67268122 -198-1745317550 +198-979494243 FirstWindow.xaml;Views\FirstPageView.xaml; True diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.lref b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.lref index 2193006..8015e26 100644 --- a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.lref +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_MarkupCompile.lref @@ -1,5 +1,5 @@  -FD:\WorkSpace\Gitea\20230724_MBJC_upperpc\App.xaml;; -FD:\WorkSpace\Gitea\20230724_MBJC_upperpc\FirstWindow.xaml;; -FD:\WorkSpace\Gitea\20230724_MBJC_upperpc\Views\FirstPageView.xaml;; +FD:\Workspace\Gitea\20230724_MBJC_upperpc\App.xaml;; +FD:\Workspace\Gitea\20230724_MBJC_upperpc\FirstWindow.xaml;; +FD:\Workspace\Gitea\20230724_MBJC_upperpc\Views\FirstPageView.xaml;; diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.AssemblyInfo.cs b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.AssemblyInfo.cs new file mode 100644 index 0000000..599871d --- /dev/null +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("20230724_MBJC_upperpc")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("20230724_MBJC_upperpc")] +[assembly: System.Reflection.AssemblyTitleAttribute("20230724_MBJC_upperpc")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.AssemblyInfoInputs.cache b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 0000000..6175f8f --- /dev/null +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +30a7b50224ea867d874cd87b220c9acbeaa9a3d3 diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..b2296e7 --- /dev/null +++ b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,11 @@ +is_global = true +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = _20230724_MBJC_upperpc +build_property.ProjectDir = D:\Workspace\Gitea\20230724_MBJC_upperpc\ diff --git a/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.assets.cache b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.assets.cache new file mode 100644 index 0000000..c329eaa Binary files /dev/null and b/obj/Debug/net6.0-windows/20230724_MBJC_upperpc_g51gn00j_wpftmp.assets.cache differ diff --git a/obj/Debug/net6.0-windows/App.g.cs b/obj/Debug/net6.0-windows/App.g.cs index c8c0736..0ca6ef2 100644 --- a/obj/Debug/net6.0-windows/App.g.cs +++ b/obj/Debug/net6.0-windows/App.g.cs @@ -50,7 +50,7 @@ namespace _20230724_MBJC_upperpc { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -76,7 +76,7 @@ namespace _20230724_MBJC_upperpc { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] public static void Main() { _20230724_MBJC_upperpc.App app = new _20230724_MBJC_upperpc.App(); app.InitializeComponent(); diff --git a/obj/Debug/net6.0-windows/App.g.i.cs b/obj/Debug/net6.0-windows/App.g.i.cs index c8c0736..0ca6ef2 100644 --- a/obj/Debug/net6.0-windows/App.g.i.cs +++ b/obj/Debug/net6.0-windows/App.g.i.cs @@ -50,7 +50,7 @@ namespace _20230724_MBJC_upperpc { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -76,7 +76,7 @@ namespace _20230724_MBJC_upperpc { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] public static void Main() { _20230724_MBJC_upperpc.App app = new _20230724_MBJC_upperpc.App(); app.InitializeComponent(); diff --git a/obj/Debug/net6.0-windows/FirstWindow.baml b/obj/Debug/net6.0-windows/FirstWindow.baml index 7fa4b38..cf2425a 100644 Binary files a/obj/Debug/net6.0-windows/FirstWindow.baml and b/obj/Debug/net6.0-windows/FirstWindow.baml differ diff --git a/obj/Debug/net6.0-windows/FirstWindow.g.cs b/obj/Debug/net6.0-windows/FirstWindow.g.cs index 1bc258e..33abb26 100644 --- a/obj/Debug/net6.0-windows/FirstWindow.g.cs +++ b/obj/Debug/net6.0-windows/FirstWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\FirstWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B95FA368098B9ECC5702CF78759FB05BB5C5F54A" +#pragma checksum "..\..\..\FirstWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2E14697D59B6A097A28C471AB70AFEF226ABE05B" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -45,7 +45,7 @@ namespace _20230724_MBJC_upperpc { public partial class FirstWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 18 "..\..\..\FirstWindow.xaml" + #line 9 "..\..\..\FirstWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal _20230724_MBJC_upperpc.FirstWindow Window; @@ -58,7 +58,7 @@ namespace _20230724_MBJC_upperpc { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -74,7 +74,7 @@ namespace _20230724_MBJC_upperpc { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/obj/Debug/net6.0-windows/FirstWindow.g.i.cs b/obj/Debug/net6.0-windows/FirstWindow.g.i.cs index 64f9be3..33abb26 100644 --- a/obj/Debug/net6.0-windows/FirstWindow.g.i.cs +++ b/obj/Debug/net6.0-windows/FirstWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\FirstWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B95FA368098B9ECC5702CF78759FB05BB5C5F54A" +#pragma checksum "..\..\..\FirstWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2E14697D59B6A097A28C471AB70AFEF226ABE05B" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -45,7 +45,7 @@ namespace _20230724_MBJC_upperpc { public partial class FirstWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 18 "..\..\..\FirstWindow.xaml" + #line 9 "..\..\..\FirstWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal _20230724_MBJC_upperpc.FirstWindow Window; @@ -58,13 +58,13 @@ namespace _20230724_MBJC_upperpc { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/20230724_MBJC_upperpc;V1.0.0.0;component/firstwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/20230724_MBJC_upperpc;component/firstwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\FirstWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -74,7 +74,7 @@ namespace _20230724_MBJC_upperpc { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/obj/Debug/net6.0-windows/Views/FirstPageView.g.cs b/obj/Debug/net6.0-windows/Views/FirstPageView.g.cs index 20a5b29..0938ad9 100644 --- a/obj/Debug/net6.0-windows/Views/FirstPageView.g.cs +++ b/obj/Debug/net6.0-windows/Views/FirstPageView.g.cs @@ -88,7 +88,7 @@ namespace _20230724_MBJC_upperpc.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -104,7 +104,7 @@ namespace _20230724_MBJC_upperpc.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/obj/Debug/net6.0-windows/Views/FirstPageView.g.i.cs b/obj/Debug/net6.0-windows/Views/FirstPageView.g.i.cs index 20a5b29..0938ad9 100644 --- a/obj/Debug/net6.0-windows/Views/FirstPageView.g.i.cs +++ b/obj/Debug/net6.0-windows/Views/FirstPageView.g.i.cs @@ -88,7 +88,7 @@ namespace _20230724_MBJC_upperpc.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -104,7 +104,7 @@ namespace _20230724_MBJC_upperpc.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.11.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/obj/Debug/net6.0-windows/apphost.exe b/obj/Debug/net6.0-windows/apphost.exe index c866022..66fcfd0 100644 Binary files a/obj/Debug/net6.0-windows/apphost.exe and b/obj/Debug/net6.0-windows/apphost.exe differ diff --git a/obj/Debug/net6.0-windows/ref/20230724_MBJC_upperpc.dll b/obj/Debug/net6.0-windows/ref/20230724_MBJC_upperpc.dll index dcb90ad..9344704 100644 Binary files a/obj/Debug/net6.0-windows/ref/20230724_MBJC_upperpc.dll and b/obj/Debug/net6.0-windows/ref/20230724_MBJC_upperpc.dll differ diff --git a/obj/Debug/net6.0-windows/refint/20230724_MBJC_upperpc.dll b/obj/Debug/net6.0-windows/refint/20230724_MBJC_upperpc.dll index dcb90ad..9344704 100644 Binary files a/obj/Debug/net6.0-windows/refint/20230724_MBJC_upperpc.dll and b/obj/Debug/net6.0-windows/refint/20230724_MBJC_upperpc.dll differ diff --git a/obj/project.assets.json b/obj/project.assets.json index 2ff7348..f04fcc3 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -179,23 +179,23 @@ ] }, "packageFolders": { - "C:\\Users\\86453\\.nuget\\packages\\": {}, - "D:\\Software\\VisualStudio2022\\Shared\\NuGetPackages": {} + "C:\\Users\\Chen\\.nuget\\packages\\": {}, + "D:\\Software\\IDE\\VisualStudio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", + "projectUniqueName": "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", "projectName": "20230724_MBJC_upperpc", - "projectPath": "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", - "packagesPath": "C:\\Users\\86453\\.nuget\\packages\\", - "outputPath": "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\obj\\", + "projectPath": "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", + "packagesPath": "C:\\Users\\Chen\\.nuget\\packages\\", + "outputPath": "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\Software\\VisualStudio2022\\Shared\\NuGetPackages" + "D:\\Software\\IDE\\VisualStudio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\86453\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Chen\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -251,7 +251,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.203\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index 7961e26..40acd95 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,13 +1,13 @@ { "version": 2, - "dgSpecHash": "iQGKFAPIa9r6aiWRyPEPwdDUR/mQ3KtYfOC7BMC555hN/9vSpUIEDHyp0EgAqCbfaQOfsn8+5GK5ImAI2ZedMw==", + "dgSpecHash": "zoPW0IxI2+cO/V6S3bLxAnlY0fF136mtvmdpaz2iEmoaRBM0FTP/BrLqyn/ncZNQ33URjlBTmiIfiK6+1FPeIg==", "success": true, - "projectFilePath": "D:\\WorkSpace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", + "projectFilePath": "D:\\Workspace\\Gitea\\20230724_MBJC_upperpc\\20230724_MBJC_upperpc.csproj", "expectedPackageFiles": [ - "C:\\Users\\86453\\.nuget\\packages\\3dtools\\1.0.0\\3dtools.1.0.0.nupkg.sha512", - "C:\\Users\\86453\\.nuget\\packages\\materialdesigncolors\\2.1.4\\materialdesigncolors.2.1.4.nupkg.sha512", - "C:\\Users\\86453\\.nuget\\packages\\materialdesignthemes\\4.9.0\\materialdesignthemes.4.9.0.nupkg.sha512", - "C:\\Users\\86453\\.nuget\\packages\\microsoft.xaml.behaviors.wpf\\1.1.39\\microsoft.xaml.behaviors.wpf.1.1.39.nupkg.sha512" + "C:\\Users\\Chen\\.nuget\\packages\\3dtools\\1.0.0\\3dtools.1.0.0.nupkg.sha512", + "C:\\Users\\Chen\\.nuget\\packages\\materialdesigncolors\\2.1.4\\materialdesigncolors.2.1.4.nupkg.sha512", + "C:\\Users\\Chen\\.nuget\\packages\\materialdesignthemes\\4.9.0\\materialdesignthemes.4.9.0.nupkg.sha512", + "C:\\Users\\Chen\\.nuget\\packages\\microsoft.xaml.behaviors.wpf\\1.1.39\\microsoft.xaml.behaviors.wpf.1.1.39.nupkg.sha512" ], "logs": [] } \ No newline at end of file