合并冲突
xiyunfei 编写于 2021-08-15 10:21:33
NewLife.Cube

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31521.260
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Others", "Others", "{32891F65-FBA1-42B2-918E-61F3A9623F2A}"
	ProjectSection(SolutionItems) = preProject
		.editorconfig = .editorconfig
		.gitignore = .gitignore
		NuGet.config = NuGet.config
		Readme.MD = Readme.MD
	EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewLife.CubeNC", "NewLife.CubeNC\NewLife.CubeNC.csproj", "{637B6360-D9AB-4CB4-A1B4-6A8A899F57B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CubeDemoNC", "CubeDemoNC\CubeDemoNC.csproj", "{C9830F6C-8EB3-4115-A7CA-821F02349E3B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj", "{D14BC31C-B4F9-425A-999A-C2ED1E0C6D60}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnitTest", "XUnitTest\XUnitTest.csproj", "{E3B44ECB-BE8B-4878-B987-CAF116D57961}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewLife.Cube.AdminLTE", "NewLife.Cube.AdminLTE\NewLife.Cube.AdminLTE.csproj", "{B18A926E-842E-45DD-A0D0-0078D898D72B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewLife.Cube.Tabler", "NewLife.Cube.Tabler\NewLife.Cube.Tabler.csproj", "{7CF34F4E-E080-410C-B5F1-24BCFD64BFE9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewLife.Cube.Metronic", "NewLife.Cube.Metronic\NewLife.Cube.Metronic.csproj", "{FD226577-A7C3-4A67-AEA6-B89745A6A950}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewLife.Cube.Blazor", "NewLife.Cube.Blazor\NewLife.Cube.Blazor.csproj", "{664872A2-7E4D-41D2-8606-95B1E416EB08}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
		Debug|Any CPU = Debug|Any CPU
		Release|Any CPU = Release|Any CPU
	EndGlobalSection
	GlobalSection(ProjectConfigurationPlatforms) = postSolution
		{637B6360-D9AB-4CB4-A1B4-6A8A899F57B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
		{637B6360-D9AB-4CB4-A1B4-6A8A899F57B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
		{637B6360-D9AB-4CB4-A1B4-6A8A899F57B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
		{637B6360-D9AB-4CB4-A1B4-6A8A899F57B3}.Release|Any CPU.Build.0 = Release|Any CPU
		{C9830F6C-8EB3-4115-A7CA-821F02349E3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
		{C9830F6C-8EB3-4115-A7CA-821F02349E3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
		{C9830F6C-8EB3-4115-A7CA-821F02349E3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
		{C9830F6C-8EB3-4115-A7CA-821F02349E3B}.Release|Any CPU.Build.0 = Release|Any CPU
		{D14BC31C-B4F9-425A-999A-C2ED1E0C6D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
		{D14BC31C-B4F9-425A-999A-C2ED1E0C6D60}.Debug|Any CPU.Build.0 = Debug|Any CPU
		{D14BC31C-B4F9-425A-999A-C2ED1E0C6D60}.Release|Any CPU.ActiveCfg = Release|Any CPU
		{D14BC31C-B4F9-425A-999A-C2ED1E0C6D60}.Release|Any CPU.Build.0 = Release|Any CPU
		{E3B44ECB-BE8B-4878-B987-CAF116D57961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
		{E3B44ECB-BE8B-4878-B987-CAF116D57961}.Debug|Any CPU.Build.0 = Debug|Any CPU
		{E3B44ECB-BE8B-4878-B987-CAF116D57961}.Release|Any CPU.ActiveCfg = Release|Any CPU
		{E3B44ECB-BE8B-4878-B987-CAF116D57961}.Release|Any CPU.Build.0 = Release|Any CPU
		{B18A926E-842E-45DD-A0D0-0078D898D72B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
		{B18A926E-842E-45DD-A0D0-0078D898D72B}.Debug|Any CPU.Build.0 = Debug|Any CPU
		{B18A926E-842E-45DD-A0D0-0078D898D72B}.Release|Any CPU.ActiveCfg = Release|Any CPU
		{B18A926E-842E-45DD-A0D0-0078D898D72B}.Release|Any CPU.Build.0 = Release|Any CPU
		{7CF34F4E-E080-410C-B5F1-24BCFD64BFE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
		{7CF34F4E-E080-410C-B5F1-24BCFD64BFE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
		{7CF34F4E-E080-410C-B5F1-24BCFD64BFE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
		{7CF34F4E-E080-410C-B5F1-24BCFD64BFE9}.Release|Any CPU.Build.0 = Release|Any CPU
		{FD226577-A7C3-4A67-AEA6-B89745A6A950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
		{FD226577-A7C3-4A67-AEA6-B89745A6A950}.Debug|Any CPU.Build.0 = Debug|Any CPU
		{FD226577-A7C3-4A67-AEA6-B89745A6A950}.Release|Any CPU.ActiveCfg = Release|Any CPU
		{FD226577-A7C3-4A67-AEA6-B89745A6A950}.Release|Any CPU.Build.0 = Release|Any CPU
		{664872A2-7E4D-41D2-8606-95B1E416EB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
		{664872A2-7E4D-41D2-8606-95B1E416EB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
		{664872A2-7E4D-41D2-8606-95B1E416EB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
		{664872A2-7E4D-41D2-8606-95B1E416EB08}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
		HideSolutionNode = FALSE
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
		SolutionGuid = {6AEA440B-0D90-4F6E-BA9A-D42B27A78D7B}
	EndGlobalSection
EndGlobal