From ea3fe8077b7d8505bc3f63b5ca4f1cbbf042aa58 Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Sat, 6 May 2017 19:41:14 -0500 Subject: [PATCH] Add Guess demo to cosmos solution. Change package feed names. --- Cosmos.sln | 27 +++++++++ Demos/Guess/Cosmos.bxrc | 0 Demos/Guess/Cosmos.targets | 57 ------------------- Demos/Guess/Guess.csproj | 13 ----- Demos/Guess/GuessBoot.project.json | 8 --- Demos/Guess/GuessKernel.csproj | 17 ++++++ ...uessBoot.Cosmos => GuessKernelBoot.Cosmos} | 29 ++++------ Setup/Cosmos.iss | 2 +- nuget.config | 2 +- 9 files changed, 58 insertions(+), 97 deletions(-) delete mode 100644 Demos/Guess/Cosmos.bxrc delete mode 100644 Demos/Guess/Cosmos.targets delete mode 100644 Demos/Guess/Guess.csproj delete mode 100644 Demos/Guess/GuessBoot.project.json create mode 100644 Demos/Guess/GuessKernel.csproj rename Demos/Guess/{GuessBoot.Cosmos => GuessKernelBoot.Cosmos} (53%) diff --git a/Cosmos.sln b/Cosmos.sln index e173d6958..4895dc97e 100644 --- a/Cosmos.sln +++ b/Cosmos.sln @@ -158,6 +158,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.UnitTest" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphicTest", "Tests\GraphicTest\GraphicTest.csproj", "{FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{B56A6119-1B8F-44E4-9446-291E52F47D4C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Guess", "Guess", "{5FF9BF2A-5162-4F12-82B6-1693AD776636}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuessKernel", "Demos\Guess\GuessKernel.csproj", "{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}" +EndProject +Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "GuessKernelBoot", "Demos\Guess\GuessKernelBoot.Cosmos", "{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -615,6 +623,22 @@ Global {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|Any CPU.Build.0 = Release|Any CPU {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|x86.ActiveCfg = Release|Any CPU {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|x86.Build.0 = Release|Any CPU + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|x86.ActiveCfg = Debug|Any CPU + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|x86.Build.0 = Debug|Any CPU + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Release|Any CPU.Build.0 = Release|Any CPU + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Release|x86.ActiveCfg = Release|Any CPU + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Release|x86.Build.0 = Release|Any CPU + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Debug|x86.ActiveCfg = Debug|Any CPU + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Debug|x86.Build.0 = Debug|Any CPU + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Release|Any CPU.Build.0 = Debug|Any CPU + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Release|x86.ActiveCfg = Debug|Any CPU + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Release|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -685,5 +709,8 @@ Global {0B20C26F-CA92-4D88-8211-EC7B0A261337} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} {6D59FC7A-6F27-4140-BA41-F89126490C4C} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} + {5FF9BF2A-5162-4F12-82B6-1693AD776636} = {B56A6119-1B8F-44E4-9446-291E52F47D4C} + {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD} = {5FF9BF2A-5162-4F12-82B6-1693AD776636} + {77DD08F5-0751-4EFC-B222-78F9F06E1F7C} = {5FF9BF2A-5162-4F12-82B6-1693AD776636} EndGlobalSection EndGlobal diff --git a/Demos/Guess/Cosmos.bxrc b/Demos/Guess/Cosmos.bxrc deleted file mode 100644 index e69de29bb..000000000 diff --git a/Demos/Guess/Cosmos.targets b/Demos/Guess/Cosmos.targets deleted file mode 100644 index 9b6957357..000000000 --- a/Demos/Guess/Cosmos.targets +++ /dev/null @@ -1,57 +0,0 @@ - - - - Source - True - True - All - False - All - $([MSBuild]::GetRegistryValue("HKEY_LOCAL_MACHINE\Software\Cosmos", "UserKit")) - $(CosmosDir)\Build\Tools - $(CosmosDir)\Build\VSIP - $(BuildToolsDir)\Nasm\nasm.exe - AnyCPU - bin - $(VSIPDir)\Cosmos.Build.MSBuild.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/Guess/Guess.csproj b/Demos/Guess/Guess.csproj deleted file mode 100644 index 143418e2e..000000000 --- a/Demos/Guess/Guess.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard1.5 - - - - - - - - - diff --git a/Demos/Guess/GuessBoot.project.json b/Demos/Guess/GuessBoot.project.json deleted file mode 100644 index b388d70ef..000000000 --- a/Demos/Guess/GuessBoot.project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "runtimes": { - "win": {} - }, - "frameworks": { - "netstandard1.6": {} - } -} diff --git a/Demos/Guess/GuessKernel.csproj b/Demos/Guess/GuessKernel.csproj new file mode 100644 index 000000000..c15b3cf46 --- /dev/null +++ b/Demos/Guess/GuessKernel.csproj @@ -0,0 +1,17 @@ + + + + netstandard1.5 + + + + + + + + + + + + + diff --git a/Demos/Guess/GuessBoot.Cosmos b/Demos/Guess/GuessKernelBoot.Cosmos similarity index 53% rename from Demos/Guess/GuessBoot.Cosmos rename to Demos/Guess/GuessKernelBoot.Cosmos index 99ca7fc52..f1f2a4edf 100644 --- a/Demos/Guess/GuessBoot.Cosmos +++ b/Demos/Guess/GuessKernelBoot.Cosmos @@ -1,9 +1,10 @@ - + + - netstandard1.5 - {5b2c0369-7a84-4113-892c-f71b50e1da12} + Debug + AnyCPU + v4.6.2 - True Source @@ -20,21 +21,15 @@ VMware Use VMware Player or Workstation to deploy and debug. - - - Content - - + - - - - - - + + GuessKernel + {e35e0dbf-555f-4d38-8f28-acdfa9dc97bd} + True + - - + diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss index a27adf44f..3bfc24eab 100644 --- a/Setup/Cosmos.iss +++ b/Setup/Cosmos.iss @@ -129,7 +129,7 @@ UseRelativePaths=True [Run] Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "init ""{app}\Kernel\packages"" ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages" -Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Add -Name ""Cosmos"" -Source ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages" +Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Add -Name ""Cosmos Local Package Feed"" -Source ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages" Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a /u:Cosmos.VS.ProjectSystem"; Description: "Remove Cosmos Project System"; StatusMsg: "Removing Visual Studio Extension: Cosmos Project System" Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a Cosmos.VS.ProjectSystem.vsix"; WorkingDir: "{app}"; Description: "Install Cosmos Project System"; StatusMsg: "Installing Visual Studio Extension: Cosmos Project System" diff --git a/nuget.config b/nuget.config index f403dd086..b10bd9875 100644 --- a/nuget.config +++ b/nuget.config @@ -1,7 +1,7 @@  - +