Merge nucleic/warm-north-vole-pf37 into dev
This commit is contained in:
+42
@@ -7,6 +7,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucleicBroker", "NucleicBro
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucleicBroker.Tests", "NucleicBroker.Tests\NucleicBroker.Tests.csproj", "{513C933F-89FF-4918-87AB-E9B70625BE4B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucleicProtocol.Interop", "NucleicProtocol.Interop\NucleicProtocol.Interop.csproj", "{A13FB10F-03E9-4F2E-A934-324820A3EBC1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucleicApp", "NucleicApp\NucleicApp.csproj", "{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucleicApp.Tests", "NucleicApp.Tests\NucleicApp.Tests.csproj", "{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@@ -41,6 +47,42 @@ Global
|
||||
{513C933F-89FF-4918-87AB-E9B70625BE4B}.Release|x64.Build.0 = Release|Any CPU
|
||||
{513C933F-89FF-4918-87AB-E9B70625BE4B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{513C933F-89FF-4918-87AB-E9B70625BE4B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Release|x64.Build.0 = Release|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{A13FB10F-03E9-4F2E-A934-324820A3EBC1}.Release|x86.Build.0 = Release|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Release|x64.Build.0 = Release|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B2721DF8-DDA6-4B35-98E8-94C5CA52FB2B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Release|x64.Build.0 = Release|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{C37B2431-0F92-4B61-8038-18B7C0BD7BAA}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
Reference in New Issue
Block a user