|
|
|
|
@ -1,67 +1,3 @@
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
|
|
|
# Visual Studio Version 17
|
|
|
|
|
VisualStudioVersion = 17.5.33516.290
|
|
|
|
|
MinimumVisualStudioVersion = 10.0.40219.1
|
|
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "ConsoleApp\ConsoleApp.csproj", "{666C2211-8EBB-4FC8-9484-CB93BC854153}"
|
|
|
|
|
EndProject
|
|
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model", "Model\Model.csproj", "{42FF86BD-92F9-4A32-A938-68515905378F}"
|
|
|
|
|
EndProject
|
|
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Views", "Views\Views.csproj", "{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}"
|
|
|
|
|
EndProject
|
|
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model_UnitTests", "Tests\Model_UnitTests\Model_UnitTests.csproj", "{45AB746A-194B-4E43-81EB-83B06F35AA33}"
|
|
|
|
|
ProjectSection(ProjectDependencies) = postProject
|
|
|
|
|
{42FF86BD-92F9-4A32-A938-68515905378F} = {42FF86BD-92F9-4A32-A938-68515905378F}
|
|
|
|
|
EndProjectSection
|
|
|
|
|
EndProject
|
|
|
|
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{08B80CE8-A01D-4D86-8989-AF225D5DA48C}"
|
|
|
|
|
EndProject
|
|
|
|
|
Global
|
|
|
|
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
|
|
|
CI|Any CPU = CI|Any CPU
|
|
|
|
|
Debug|Any CPU = Debug|Any CPU
|
|
|
|
|
Release|Any CPU = Release|Any CPU
|
|
|
|
|
EndGlobalSection
|
|
|
|
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
|
|
|
{666C2211-8EBB-4FC8-9484-CB93BC854153}.CI|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
|
|
{666C2211-8EBB-4FC8-9484-CB93BC854153}.CI|Any CPU.Build.0 = Release|Any CPU
|
|
|
|
|
{666C2211-8EBB-4FC8-9484-CB93BC854153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
|
|
|
{666C2211-8EBB-4FC8-9484-CB93BC854153}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
|
|
{666C2211-8EBB-4FC8-9484-CB93BC854153}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
|
|
{666C2211-8EBB-4FC8-9484-CB93BC854153}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
|
|
|
{42FF86BD-92F9-4A32-A938-68515905378F}.CI|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
|
|
{42FF86BD-92F9-4A32-A938-68515905378F}.CI|Any CPU.Build.0 = Release|Any CPU
|
|
|
|
|
{42FF86BD-92F9-4A32-A938-68515905378F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
|
|
|
{42FF86BD-92F9-4A32-A938-68515905378F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
|
|
{42FF86BD-92F9-4A32-A938-68515905378F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
|
|
{42FF86BD-92F9-4A32-A938-68515905378F}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
|
|
|
{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.CI|Any CPU.ActiveCfg = CI|Any CPU
|
|
|
|
|
{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
|
|
|
{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
|
|
{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
|
|
|
|
|
{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
|
|
{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
|
|
|
{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Release|Any CPU.Deploy.0 = Release|Any CPU
|
|
|
|
|
{45AB746A-194B-4E43-81EB-83B06F35AA33}.CI|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
|
|
{45AB746A-194B-4E43-81EB-83B06F35AA33}.CI|Any CPU.Build.0 = Release|Any CPU
|
|
|
|
|
{45AB746A-194B-4E43-81EB-83B06F35AA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
|
|
|
{45AB746A-194B-4E43-81EB-83B06F35AA33}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
|
|
{45AB746A-194B-4E43-81EB-83B06F35AA33}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
|
|
{45AB746A-194B-4E43-81EB-83B06F35AA33}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
|
|
|
EndGlobalSection
|
|
|
|
|
GlobalSection(SolutionProperties) = preSolution
|
|
|
|
|
HideSolutionNode = FALSE
|
|
|
|
|
EndGlobalSection
|
|
|
|
|
GlobalSection(NestedProjects) = preSolution
|
|
|
|
|
{45AB746A-194B-4E43-81EB-83B06F35AA33} = {08B80CE8-A01D-4D86-8989-AF225D5DA48C}
|
|
|
|
|
EndGlobalSection
|
|
|
|
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
|
|
|
SolutionGuid = {ADEA5603-1EF6-4D43-9493-7D6D9DE7FA3F}
|
|
|
|
|
EndGlobalSection
|
|
|
|
|
EndGlobal
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
|
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
|
|
|
# Visual Studio Version 17
|
|
|
|
|
VisualStudioVersion = 17.5.33516.290
|
|
|
|
|
@ -117,4 +53,3 @@ Global
|
|
|
|
|
SolutionGuid = {ADEA5603-1EF6-4D43-9493-7D6D9DE7FA3F}
|
|
|
|
|
EndGlobalSection
|
|
|
|
|
EndGlobal
|
|
|
|
|
>>>>>>> dev
|
|
|
|
|
|
