From 203097edd1517a9bd9a91dd77698819407127ebb Mon Sep 17 00:00:00 2001 From: walterlv Date: Mon, 18 Nov 2024 11:08:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.git?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 120 +++++++++++++++++++++++-------------------------- .gitignore | 44 ++++++++++++++++-- 2 files changed, 97 insertions(+), 67 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1ff0c42..256d68e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,63 +1,57 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain +# Auto detect text files and perform LF normalization +* text=false + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=text +*.csproj merge=text +*.vbproj merge=text +*.fsproj merge=text +*.dbproj merge=text + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain + +# ignore file + +*.mp3 -diff +*.wav -diff +*.enas -diff +*.png -diff +*.jpg -diff +*.psd -diff +*.gif -diff + +# binary +*.avi binary +*.bmp binary +*.exr binary +*.ico binary +*.jpeg binary +*.jpg binary +*.png binary + +*.a binary +*.so binary +*.dll binary +*.jar binary + +*.pdf binary +*.pbxproj binary +*.vec binary +*.doc binary +*.dia binary + +# CR/LF + +*.bat text eol=crlf +*.sh text eol=lf diff --git a/.gitignore b/.gitignore index 9491a2f..1cd7ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -## Ignore Visual Studio temporary files, build results, and +## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files *.rsuser @@ -29,7 +29,6 @@ x86/ bld/ [Bb]in/ [Oo]bj/ -[Oo]ut/ [Ll]og/ [Ll]ogs/ @@ -91,6 +90,7 @@ StyleCopReport.xml *.tmp_proj *_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds @@ -294,6 +294,17 @@ node_modules/ # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) *.vbw +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -350,6 +361,9 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ +# Visual Studio History (VSHistory) files +.vshistory/ + # BeatPulse healthcheck temp database healthchecksdb @@ -360,4 +374,26 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +.idea/ +*.sln.iml From 5e814dfec9df89e207b603323c11fb9b12f356f4 Mon Sep 17 00:00:00 2001 From: walterlv Date: Mon, 18 Nov 2024 11:28:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=20.NET=209=20SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dotnetCampus.AppHostDemo.csproj | 4 ++-- src/dotnetCampus.AppHost/Assets/build/Build.targets | 6 ++++-- src/dotnetCampus.AppHost/Program.cs | 2 +- src/dotnetCampus.AppHost/dotnetCampus.AppHost.csproj | 10 +++++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/samples/dotnetCampus.AppHostDemo/dotnetCampus.AppHostDemo.csproj b/samples/dotnetCampus.AppHostDemo/dotnetCampus.AppHostDemo.csproj index 99069b0..60c5b88 100644 --- a/samples/dotnetCampus.AppHostDemo/dotnetCampus.AppHostDemo.csproj +++ b/samples/dotnetCampus.AppHostDemo/dotnetCampus.AppHostDemo.csproj @@ -4,7 +4,7 @@ WinExe - net6.0-windows;net45 + net6.0-windows enable true false @@ -16,7 +16,7 @@ - $(MSBuildProjectDirectory)\..\..\src\dotnetCampus.AppHost\bin\$(Configuration)\net6.0\dotnetCampus.AppHost.dll + $(MSBuildProjectDirectory)\..\..\src\dotnetCampus.AppHost\bin\$(Configuration)\net8.0\dotnetCampus.AppHost.dll diff --git a/src/dotnetCampus.AppHost/Assets/build/Build.targets b/src/dotnetCampus.AppHost/Assets/build/Build.targets index 5eeae19..4b3d934 100644 --- a/src/dotnetCampus.AppHost/Assets/build/Build.targets +++ b/src/dotnetCampus.AppHost/Assets/build/Build.targets @@ -10,9 +10,11 @@ + _ChooseAppHost + _GetAppHostPaths - + <_DCAppHostRoot>$(MSBuildThisFileDirectory)..\ @@ -90,4 +92,4 @@ AppHostNeedSystemPrereqsUrl = $(AppHostNeedSystemPrereqsUrl) <系统 - \ No newline at end of file + diff --git a/src/dotnetCampus.AppHost/Program.cs b/src/dotnetCampus.AppHost/Program.cs index 756f82a..8ef3ee4 100644 --- a/src/dotnetCampus.AppHost/Program.cs +++ b/src/dotnetCampus.AppHost/Program.cs @@ -1,4 +1,4 @@ -#if !NET6_0 +#if !NET8_0 internal static class Program { private static void Main() diff --git a/src/dotnetCampus.AppHost/dotnetCampus.AppHost.csproj b/src/dotnetCampus.AppHost/dotnetCampus.AppHost.csproj index eaec5c3..0f8e47e 100644 --- a/src/dotnetCampus.AppHost/dotnetCampus.AppHost.csproj +++ b/src/dotnetCampus.AppHost/dotnetCampus.AppHost.csproj @@ -2,7 +2,7 @@ WinExe - net6.0;net5.0;netstandard2.0;net45 + net8.0;net6.0;netstandard2.0;net45 true true dotnetCampus.AppHosting @@ -30,13 +30,17 @@ snupkg - + - + + + + + From 1cc0b57696cabf1c966dc544364a9697bf11b36b Mon Sep 17 00:00:00 2001 From: walterlv Date: Mon, 18 Nov 2024 11:32:39 +0800 Subject: [PATCH 3/3] fix encoding --- src/dotnetCampus.AppHost/Patches/README.md | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dotnetCampus.AppHost/Patches/README.md b/src/dotnetCampus.AppHost/Patches/README.md index 4432211..2d3b154 100644 --- a/src/dotnetCampus.AppHost/Patches/README.md +++ b/src/dotnetCampus.AppHost/Patches/README.md @@ -1,26 +1,26 @@ -# .NET Runtime ֿⲹ˵ +# .NET Runtime 仓库补丁说明 -## AppHost.exe 뷽 +## AppHost.exe 编译方法 -### Ӧô벹 +### 应用代码补丁 -1. ¡ dotnet/runtime ֿ -2. лļӦ Tagл v6.0.1 Tag -3. dotnet/runtime ·£ʹӦ git ļ +1. 克隆 dotnet/runtime 仓库 +2. 切换到文件夹名对应的 Tag（例如切换到 v6.0.1 的 Tag） +3. 在 dotnet/runtime 工作路径下，使用命令应用 git 补丁文件 * `git am ` -### ޸ɴ벹 +### 修改与生成代码补丁 -1. ޸IJύ루ϲύٲԱ˲ֿ Patches ļи׶ -2. ʹļ - * `git format-patch `ᴴǰָ֧ Tag ֮ύIJ +1. 修改并提交代码（建议合并提交，减少补丁个数，以便此仓库里的 Patches 文件夹更易读） +2. 使用命令创建补丁文件 + * `git format-patch `（此命令会创建当前分支与指定 Tag 之间所有提交的补丁） -### AppHost +### 编译 AppHost -1. ʹЩͬ汾 AppHostȫʱԼ 15 ӣǰ 2 ӾͿԵõ AppHost ļ +1. 使用这些命令编译各不同版本的 AppHost（完全编译用时大约 15 分钟，但前 2 分钟就可以得到 AppHost 的所有输出文件） * x64: `.\build.cmd -a x64 -c Release` * x86: `.\build.cmd -a x86 -c Release` -2. ȥЩ·ҵ AppHost ļ +2. 去这些路径找到 AppHost 输出文件 * x64: `.\artifacts\bin\win-x64.Release\corehost` * x86: `.\artifacts\bin\win-x86.Release\corehost` -3. ҵļĿ Assets\template ӦĿļ +3. 将找到的输出文件拷贝到本项目的 Assets\template 对应的框架文件夹下