Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

分离域与编译单元 #256

Merged
merged 2 commits into from
Jan 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 2
updates:

- package-ecosystem: "nuget"
directory: "src/Natasha.CSharp/Core/Natasha.CSharp.Compiler"
directory: "src/Natasha.CSharp/Natasha.CSharp.Compiler"
schedule:
interval: "daily"
commit-message:
Expand Down
94 changes: 63 additions & 31 deletions .github/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,9 @@ samples:
projects: []
src:
folded_projects:
- src/Natasha.CSharp/Core/Extension/Natasha.CSharp.Extension.Ambiguity/Natasha.CSharp.Extension.Ambiguity.csproj
- src/Natasha.CSharp/Core/Extension/Natasha.CSharp.Codecov/Natasha.CSharp.Codecov.csproj
- src/Natasha.CSharp/Framework/Natasha.CSharp.Compiler.Framework/Natasha.CSharp.Compiler.Framework.csproj
- src/Natasha.CSharp/Framework/Natasha.CSharp.Template.Framework/Natasha.CSharp.Template.Framework.csproj
- src/Natasha.CSharp/Extension/Natasha.CSharp.Codecov/Natasha.CSharp.Codecov.csproj
- src/Natasha.CSharp/Extension/Natasha.CSharp.Extension.Ambiguity/Natasha.CSharp.Extension.Ambiguity.csproj
global_labels:
- name: pr_src
description: 此次提交包含 [源码工程] 相关的改动.
Expand All @@ -102,25 +101,56 @@ src:
- System
- System.Runtime.CompilerServices
- System.Reflection
id: 806EDCE9-74E4-41F3-9E97-74317EB209B3
id: 6A64FCC4-0E19-4181-ABD8-D951DB6B75E9
is_ignored: false
is_folded: false
relative_path: src/Natasha.CSharp/Core/Natasha.CSharp.Template/Natasha.CSharp.Template.csproj
project_name: Natasha.CSharp.Template
package_name: DotNetCore.Natasha.CSharp.Template
project_folder: src/Natasha.CSharp/Core/Natasha.CSharp.Template
relative_path: src/Natasha.CSharp/Natasha.CSharp.Compiler/Natasha.CSharp.Compiler.csproj
project_name: Natasha.CSharp.Compiler
package_name: DotNetCore.Natasha.CSharp.Compiler
project_folder: src/Natasha.CSharp/Natasha.CSharp.Compiler
labels:
dependency_config:
type: nuget
interval: daily
commit_prefix: '[DEPENDENCY SRC]'
special_time:
special_time_zone:
labels:
- name: dependencies
description: 有依赖需要升级
color: 4E04B0
ignore:
- name: Microsoft.Extensions.DependencyModel
versions:
versions_type:
- using_output:
enable: true
ignores:
- System
- System.Runtime.CompilerServices
- System.Reflection
id: A6A252E0-BC83-43D1-A118-371721F1A5D4
is_ignored: false
is_folded: false
relative_path: src/Natasha.CSharp/Natasha.DynamicLoad.Base/Natasha.DynamicLoad.Base.csproj
project_name: Natasha.DynamicLoad.Base
package_name:
project_folder: src/Natasha.CSharp/Natasha.DynamicLoad.Base
labels:
dependency_config:
- using_output:
enable: true
ignores:
id: B810A41B-66BC-4FD4-B78E-CBFA0CF96A33
ignores:
- System
- System.Runtime.CompilerServices
- System.Reflection
id: 02D796A3-A9FB-4E9C-972C-50B173DE213C
is_ignored: false
is_folded: false
relative_path: src/Natasha.CSharp/Core/Natasha.Domain/Natasha.Domain.csproj
relative_path: src/Natasha.CSharp/Component/Core/Natasha.Domain/Natasha.Domain.csproj
project_name: Natasha.Domain
package_name: DotNetCore.Natasha.Domain
project_folder: src/Natasha.CSharp/Core/Natasha.Domain
project_folder: src/Natasha.CSharp/Component/Core/Natasha.Domain
labels:
dependency_config:
- using_output:
Expand All @@ -129,28 +159,30 @@ src:
- System
- System.Runtime.CompilerServices
- System.Reflection
id: 4DFD079F-2353-48A1-BDC7-1711491CB82C
id: CE5B5331-3F4F-412F-8169-8DA1D37170C6
is_ignored: false
is_folded: false
relative_path: src/Natasha.CSharp/Core/Natasha.CSharp.Compiler/Natasha.CSharp.Compiler.csproj
project_name: Natasha.CSharp.Compiler
package_name: DotNetCore.Natasha.CSharp.Compiler
project_folder: src/Natasha.CSharp/Core/Natasha.CSharp.Compiler
relative_path: src/Natasha.CSharp/Component/Core/Natasha.CSharp.Compiler.Domain/Natasha.CSharp.Compiler.Domain.csproj
project_name: Natasha.CSharp.Compiler.Domain
package_name:
project_folder: src/Natasha.CSharp/Component/Core/Natasha.CSharp.Compiler.Domain
labels:
dependency_config:
type: nuget
interval: daily
commit_prefix: '[DEPENDENCY SRC]'
special_time:
special_time_zone:
labels:
- name: dependencies
description: 有依赖需要升级
color: 4E04B0
ignore:
- name: Microsoft.Extensions.DependencyModel
versions:
versions_type:
dependency_config:
- using_output:
enable: true
ignores:
- System
- System.Runtime.CompilerServices
- System.Reflection
id: 1A79A124-5C6D-456E-8402-33A1FA68C566
is_ignored: false
is_folded: false
relative_path: src/Natasha.CSharp/Component/Core/Natasha.CSharp.Template.Core/Natasha.CSharp.Template.Core.csproj
project_name: Natasha.CSharp.Template.Core
package_name: DotNetCore.Natasha.CSharp.Template
project_folder: src/Natasha.CSharp/Component/Core/Natasha.CSharp.Template.Core
labels:
dependency_config:
test:
folded_projects: []
global_labels:
Expand Down
93 changes: 48 additions & 45 deletions Natasha.sln
Original file line number Diff line number Diff line change
Expand Up @@ -197,19 +197,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{57D0570C-7B6A-4795-960E-D37E9FFDA066}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Extension.Ambiguity", "src\Natasha.CSharp\Core\Extension\Natasha.CSharp.Extension.Ambiguity\Natasha.CSharp.Extension.Ambiguity.csproj", "{05F54420-1410-4240-9287-F410A24130E1}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Component", "Component", "{B0EBDE47-FE8A-4BC6-A4EE-767CD405BB06}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Codecov", "src\Natasha.CSharp\Core\Extension\Natasha.CSharp.Codecov\Natasha.CSharp.Codecov.csproj", "{5FAA826B-DD53-488D-A9C4-1950B1D4DF2E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Compiler", "src\Natasha.CSharp\Natasha.CSharp.Compiler\Natasha.CSharp.Compiler.csproj", "{6A64FCC4-0E19-4181-ABD8-D951DB6B75E9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Compiler.Framework", "src\Natasha.CSharp\Framework\Natasha.CSharp.Compiler.Framework\Natasha.CSharp.Compiler.Framework.csproj", "{3590A83D-8992-4A96-AC42-9704098C46ED}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Natasha.DynamicLoad.Base", "src\Natasha.CSharp\Natasha.DynamicLoad.Base\Natasha.DynamicLoad.Base.csproj", "{A6A252E0-BC83-43D1-A118-371721F1A5D4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Template.Framework", "src\Natasha.CSharp\Framework\Natasha.CSharp.Template.Framework\Natasha.CSharp.Template.Framework.csproj", "{2FFCB9ED-F02E-4C26-9551-74EDE27E3DD4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.Domain", "src\Natasha.CSharp\Component\Core\Natasha.Domain\Natasha.Domain.csproj", "{02D796A3-A9FB-4E9C-972C-50B173DE213C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Template", "src\Natasha.CSharp\Core\Natasha.CSharp.Template\Natasha.CSharp.Template.csproj", "{806EDCE9-74E4-41F3-9E97-74317EB209B3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Compiler.Domain", "src\Natasha.CSharp\Component\Core\Natasha.CSharp.Compiler.Domain\Natasha.CSharp.Compiler.Domain.csproj", "{CE5B5331-3F4F-412F-8169-8DA1D37170C6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.Domain", "src\Natasha.CSharp\Core\Natasha.Domain\Natasha.Domain.csproj", "{B810A41B-66BC-4FD4-B78E-CBFA0CF96A33}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Template.Core", "src\Natasha.CSharp\Component\Core\Natasha.CSharp.Template.Core\Natasha.CSharp.Template.Core.csproj", "{1A79A124-5C6D-456E-8402-33A1FA68C566}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Compiler", "src\Natasha.CSharp\Core\Natasha.CSharp.Compiler\Natasha.CSharp.Compiler.csproj", "{4DFD079F-2353-48A1-BDC7-1711491CB82C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Codecov", "src\Natasha.CSharp\Extension\Natasha.CSharp.Codecov\Natasha.CSharp.Codecov.csproj", "{5A914466-79DF-4F6E-8A8F-829CBDCDFFDE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natasha.CSharp.Extension.Ambiguity", "src\Natasha.CSharp\Extension\Natasha.CSharp.Extension.Ambiguity\Natasha.CSharp.Extension.Ambiguity.csproj", "{0A6025A4-97ED-4F67-9B49-82B417BCB81F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -361,34 +363,34 @@ Global
{89A2EC20-B432-4C6A-B740-78BBD1BF80EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89A2EC20-B432-4C6A-B740-78BBD1BF80EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89A2EC20-B432-4C6A-B740-78BBD1BF80EC}.Release|Any CPU.Build.0 = Release|Any CPU
{05F54420-1410-4240-9287-F410A24130E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05F54420-1410-4240-9287-F410A24130E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05F54420-1410-4240-9287-F410A24130E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05F54420-1410-4240-9287-F410A24130E1}.Release|Any CPU.Build.0 = Release|Any CPU
{5FAA826B-DD53-488D-A9C4-1950B1D4DF2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5FAA826B-DD53-488D-A9C4-1950B1D4DF2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5FAA826B-DD53-488D-A9C4-1950B1D4DF2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5FAA826B-DD53-488D-A9C4-1950B1D4DF2E}.Release|Any CPU.Build.0 = Release|Any CPU
{3590A83D-8992-4A96-AC42-9704098C46ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3590A83D-8992-4A96-AC42-9704098C46ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3590A83D-8992-4A96-AC42-9704098C46ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3590A83D-8992-4A96-AC42-9704098C46ED}.Release|Any CPU.Build.0 = Release|Any CPU
{2FFCB9ED-F02E-4C26-9551-74EDE27E3DD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FFCB9ED-F02E-4C26-9551-74EDE27E3DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FFCB9ED-F02E-4C26-9551-74EDE27E3DD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FFCB9ED-F02E-4C26-9551-74EDE27E3DD4}.Release|Any CPU.Build.0 = Release|Any CPU
{806EDCE9-74E4-41F3-9E97-74317EB209B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{806EDCE9-74E4-41F3-9E97-74317EB209B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{806EDCE9-74E4-41F3-9E97-74317EB209B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{806EDCE9-74E4-41F3-9E97-74317EB209B3}.Release|Any CPU.Build.0 = Release|Any CPU
{B810A41B-66BC-4FD4-B78E-CBFA0CF96A33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B810A41B-66BC-4FD4-B78E-CBFA0CF96A33}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B810A41B-66BC-4FD4-B78E-CBFA0CF96A33}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B810A41B-66BC-4FD4-B78E-CBFA0CF96A33}.Release|Any CPU.Build.0 = Release|Any CPU
{4DFD079F-2353-48A1-BDC7-1711491CB82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4DFD079F-2353-48A1-BDC7-1711491CB82C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4DFD079F-2353-48A1-BDC7-1711491CB82C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4DFD079F-2353-48A1-BDC7-1711491CB82C}.Release|Any CPU.Build.0 = Release|Any CPU
{6A64FCC4-0E19-4181-ABD8-D951DB6B75E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A64FCC4-0E19-4181-ABD8-D951DB6B75E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A64FCC4-0E19-4181-ABD8-D951DB6B75E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A64FCC4-0E19-4181-ABD8-D951DB6B75E9}.Release|Any CPU.Build.0 = Release|Any CPU
{A6A252E0-BC83-43D1-A118-371721F1A5D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6A252E0-BC83-43D1-A118-371721F1A5D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6A252E0-BC83-43D1-A118-371721F1A5D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6A252E0-BC83-43D1-A118-371721F1A5D4}.Release|Any CPU.Build.0 = Release|Any CPU
{02D796A3-A9FB-4E9C-972C-50B173DE213C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02D796A3-A9FB-4E9C-972C-50B173DE213C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02D796A3-A9FB-4E9C-972C-50B173DE213C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{02D796A3-A9FB-4E9C-972C-50B173DE213C}.Release|Any CPU.Build.0 = Release|Any CPU
{CE5B5331-3F4F-412F-8169-8DA1D37170C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE5B5331-3F4F-412F-8169-8DA1D37170C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE5B5331-3F4F-412F-8169-8DA1D37170C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE5B5331-3F4F-412F-8169-8DA1D37170C6}.Release|Any CPU.Build.0 = Release|Any CPU
{1A79A124-5C6D-456E-8402-33A1FA68C566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A79A124-5C6D-456E-8402-33A1FA68C566}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A79A124-5C6D-456E-8402-33A1FA68C566}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A79A124-5C6D-456E-8402-33A1FA68C566}.Release|Any CPU.Build.0 = Release|Any CPU
{5A914466-79DF-4F6E-8A8F-829CBDCDFFDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A914466-79DF-4F6E-8A8F-829CBDCDFFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A914466-79DF-4F6E-8A8F-829CBDCDFFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A914466-79DF-4F6E-8A8F-829CBDCDFFDE}.Release|Any CPU.Build.0 = Release|Any CPU
{0A6025A4-97ED-4F67-9B49-82B417BCB81F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A6025A4-97ED-4F67-9B49-82B417BCB81F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A6025A4-97ED-4F67-9B49-82B417BCB81F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A6025A4-97ED-4F67-9B49-82B417BCB81F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -401,7 +403,7 @@ Global
{BE249E27-1BFF-4DB5-9B05-478E80C5E7B1} = {082FE559-7B32-4D83-B01B-0D4934396891}
{EB036B9F-DD9D-42BD-A132-32A71F77D27C} = {082FE559-7B32-4D83-B01B-0D4934396891}
{8C9B862A-B569-460C-8B74-E74C6DF0CAB3} = {508A2E20-BB12-4610-8CB2-0B07B233DE68}
{0CB3AF52-50F3-4728-BAC6-389F2E995111} = {57D0570C-7B6A-4795-960E-D37E9FFDA066}
{0CB3AF52-50F3-4728-BAC6-389F2E995111} = {8C9B862A-B569-460C-8B74-E74C6DF0CAB3}
{B9B66D92-BDFB-4D06-9C63-227176CD157C} = {5A4C28F6-36C5-4735-A1E0-E4BC5DD7F5F8}
{5A4C28F6-36C5-4735-A1E0-E4BC5DD7F5F8} = {B4487ABB-27A2-4353-AB16-1A94B31E0210}
{C11CDBDF-E204-412F-A1AF-C2AD83383599} = {5A4C28F6-36C5-4735-A1E0-E4BC5DD7F5F8}
Expand Down Expand Up @@ -454,15 +456,16 @@ Global
{716B9CEC-8CA2-433F-9E9A-974E536C4099} = {F4622BCB-C287-4AFE-916B-8C138BD15A3D}
{7CD6F3A9-85F0-4F01-8B68-7FCC527768E6} = {B4487ABB-27A2-4353-AB16-1A94B31E0210}
{89A2EC20-B432-4C6A-B740-78BBD1BF80EC} = {B4487ABB-27A2-4353-AB16-1A94B31E0210}
{64F66ABD-6398-417B-95D7-A8B51077FB3C} = {8C9B862A-B569-460C-8B74-E74C6DF0CAB3}
{57D0570C-7B6A-4795-960E-D37E9FFDA066} = {8C9B862A-B569-460C-8B74-E74C6DF0CAB3}
{05F54420-1410-4240-9287-F410A24130E1} = {0CB3AF52-50F3-4728-BAC6-389F2E995111}
{5FAA826B-DD53-488D-A9C4-1950B1D4DF2E} = {0CB3AF52-50F3-4728-BAC6-389F2E995111}
{3590A83D-8992-4A96-AC42-9704098C46ED} = {64F66ABD-6398-417B-95D7-A8B51077FB3C}
{2FFCB9ED-F02E-4C26-9551-74EDE27E3DD4} = {64F66ABD-6398-417B-95D7-A8B51077FB3C}
{806EDCE9-74E4-41F3-9E97-74317EB209B3} = {57D0570C-7B6A-4795-960E-D37E9FFDA066}
{B810A41B-66BC-4FD4-B78E-CBFA0CF96A33} = {57D0570C-7B6A-4795-960E-D37E9FFDA066}
{4DFD079F-2353-48A1-BDC7-1711491CB82C} = {57D0570C-7B6A-4795-960E-D37E9FFDA066}
{64F66ABD-6398-417B-95D7-A8B51077FB3C} = {B0EBDE47-FE8A-4BC6-A4EE-767CD405BB06}
{57D0570C-7B6A-4795-960E-D37E9FFDA066} = {B0EBDE47-FE8A-4BC6-A4EE-767CD405BB06}
{B0EBDE47-FE8A-4BC6-A4EE-767CD405BB06} = {8C9B862A-B569-460C-8B74-E74C6DF0CAB3}
{6A64FCC4-0E19-4181-ABD8-D951DB6B75E9} = {8C9B862A-B569-460C-8B74-E74C6DF0CAB3}
{A6A252E0-BC83-43D1-A118-371721F1A5D4} = {8C9B862A-B569-460C-8B74-E74C6DF0CAB3}
{02D796A3-A9FB-4E9C-972C-50B173DE213C} = {57D0570C-7B6A-4795-960E-D37E9FFDA066}
{CE5B5331-3F4F-412F-8169-8DA1D37170C6} = {57D0570C-7B6A-4795-960E-D37E9FFDA066}
{1A79A124-5C6D-456E-8402-33A1FA68C566} = {57D0570C-7B6A-4795-960E-D37E9FFDA066}
{5A914466-79DF-4F6E-8A8F-829CBDCDFFDE} = {0CB3AF52-50F3-4728-BAC6-389F2E995111}
{0A6025A4-97ED-4F67-9B49-82B417BCB81F} = {0CB3AF52-50F3-4728-BAC6-389F2E995111}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3004E730-B231-40FA-B75C-58D7DDE17679}
Expand Down
3 changes: 2 additions & 1 deletion samples/HotReloadSample/HotReloadSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

<ItemGroup>
<PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
<ProjectReference Include="..\..\src\Natasha.CSharp\Core\Natasha.CSharp.Compiler\Natasha.CSharp.Compiler.csproj" />
<ProjectReference Include="..\..\src\Natasha.CSharp\Component\Core\Natasha.CSharp.Compiler.Domain\Natasha.CSharp.Compiler.Domain.csproj" />
<ProjectReference Include="..\..\src\Natasha.CSharp\Natasha.CSharp.Compiler\Natasha.CSharp.Compiler.csproj" />
<ProjectReference Include="..\HotReloadPlugin\HotReloadPlugin.csproj" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions samples/HotReloadSample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private static void HotReloadService_UpdateApplicationEvent(Type[]? obj)
Console.WriteLine(obj==null);
}

public static Assembly OldAssembly(NatashaReferenceDomain domain)
public static Assembly OldAssembly(NatashaLoadContext domain)
{
AssemblyCSharpBuilder builder = new AssemblyCSharpBuilder
{
Expand All @@ -126,7 +126,7 @@ public static Assembly OldAssembly(NatashaReferenceDomain domain)
return builder.GetAssembly();
}

public static Assembly NewAssembly(NatashaReferenceDomain domain)
public static Assembly NewAssembly(NatashaLoadContext domain)
{
AssemblyCSharpBuilder builder = new AssemblyCSharpBuilder();
builder.Domain = domain;
Expand Down
7 changes: 4 additions & 3 deletions samples/ReferenceSample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ static void Main(string[] args)
//var a = typeof(CodecovMonitor);
//var b = typeof(A);
//NatashaManagement.Preheating(true, true);
TestMini1();
TestMini1();
NatashaManagement.RegistDomainCreator<NatashaDomainCreator>();
TestMini();
TestMini();
//var a = Math.Min(1, args.Length);
//NatashaManagement.Preheating(false, false);
//Console.WriteLine("=============================");
Expand Down Expand Up @@ -250,7 +251,7 @@ public static void Run1()
builder.ConfigCompilerOption(item => item.AddSupperess("CS0108"));
builder.WithoutAnalysisAccessibility();

builder.Domain = DomainManagement.Random();
builder.LoadContext = DomainManagement.Random();


builder.Add("public class A { public string Name {get;set;} = \"abc\"; }", UsingLoadBehavior.WithDefault);
Expand Down
3 changes: 2 additions & 1 deletion samples/ReferenceSample/ReferenceSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Natasha.CSharp\Core\Extension\Natasha.CSharp.Codecov\Natasha.CSharp.Codecov.csproj" />
<ProjectReference Include="..\..\src\Natasha.CSharp\Component\Core\Natasha.CSharp.Compiler.Domain\Natasha.CSharp.Compiler.Domain.csproj" />
<ProjectReference Include="..\..\src\Natasha.CSharp\Extension\Natasha.CSharp.Codecov\Natasha.CSharp.Codecov.csproj" />
<ProjectReference Include="..\HotReloadPlugin\HotReloadPlugin.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Description>Natasha 的编译域实现.</Description>
<PackageId>DotNetCore.Natasha.CSharp.Compiler.Domain</PackageId>
<PackageReleaseNotes>升级到最新版.</PackageReleaseNotes>
<PackageTags>Natasha;NMS;Template;Compile;Domain;LoadContext;</PackageTags>
<Version>8.0.0.0</Version>
<FileVersion>8.0.0.0</FileVersion>
<AssemblyVersion>8.0.0.0</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Natasha.Domain\Natasha.Domain.csproj" />
</ItemGroup>

</Project>
Loading
Loading