Install changes to remove dotnet cli.

include sqlite in vsix.

Cosmos.sln

@@ -145,7 +145,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.Singl
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FD6DCBF5-6451-4CA0-BD5D-5637BC846929}"
 	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
 		nuget.config = nuget.config
 	EndProjectSection
 EndProject

Setup/Cosmos.iss

@@ -33,6 +33,7 @@ AppPublisherURL=http://www.goCosmos.org/
 AppSupportURL=http://www.goCosmos.org/
 AppUpdatesURL=http://www.goCosmos.org/
 AppVersion={#ChangeSetVersion}
+SetupMutex=CosmosSetupMutexName,Global\CosmoSetupMutexName
 DefaultDirName={userappdata}\Cosmos User Kit
 DefaultGroupName=Cosmos User Kit
 OutputDir=.\Setup\Output
@@ -138,14 +139,17 @@ 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 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 /u:XSharp.VS"; Description: "Remove Cosmos X# Language"; StatusMsg: "Removing Visual Studio Extension: Cosmos X# Language"
-Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a Cosmos.VS.ProjectSystem.vsix"; WorkingDir: "{app}\VSIX\"; Description: "Install Cosmos Project System"; StatusMsg: "Installing Visual Studio Extension: Cosmos Project System"
-;Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a XSharp.VS.vsix"; WorkingDir: "{app}\VSIX\"; Description: "Install Cosmos X# Language"; StatusMsg: "Installing Visual Studio Extension: Cosmos X# Language"
+Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /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 /u:XSharp.VS"; Description: "Remove Cosmos X# Language Service"; StatusMsg: "Removing Visual Studio Extension: Cosmos X# Language Service"
+
+Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q Cosmos.VS.ProjectSystem.vsix"; WorkingDir: "{app}\VSIX\"; Description: "Install Cosmos Project System"; StatusMsg: "Installing Visual Studio Extension: Cosmos Project System"
+;Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q XSharp.VS.vsix"; WorkingDir: "{app}\VSIX\"; Description: "Install Cosmos X# Language Service"; StatusMsg: "Installing Visual Studio Extension: Cosmos X# Language Service"
 
 [UninstallRun]
-Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a /u:Cosmos.VS.ProjectSystem"; StatusMsg: "Removing Visual Studio Extension: Cosmos Project System"
-;Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a /u:XSharp.VS"; StatusMsg: "Removing Visual Studio Extension: Cosmos X# Language"
+Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:Cosmos.VS.ProjectSystem"; StatusMsg: "Removing Visual Studio Extension: Cosmos Project System"
+;Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:XSharp.VS"; StatusMsg: "Removing Visual Studio Extension: Cosmos X# Language Service"
 
 [Code]
 function ExecWithResult(const Filename, Params, WorkingDir: String; const ShowCmd: Integer;

install-VS2017.bat

@@ -7,7 +7,6 @@ set VSWhere=Build\Tools\vswhere.exe
 :NuGet
 echo Running NuGet restore
 %NuGet% restore Builder.sln
-%NuGet% restore Cosmos.sln
 
 :MSBuild
 echo Looking for MSBuild

source/Cosmos.Build.Builder/CosmosTask.cs

@@ -288,6 +288,15 @@ private void CreateScriptToUseChangesetWhichTaskIsUse()
       }
     }
 
+    private void Restore(string project)
+    {
+      string xNuget = Path.Combine(mCosmosDir, "Build", "Tools", "nuget.exe");
+      string xRestoreParams = $"restore {Quoted(project)}";
+      string xUpdateParams = $"update -self";
+      StartConsole(xNuget, xUpdateParams);
+      StartConsole(xNuget, xRestoreParams);
+    }
+
     private void Pack(string project, string destDir, string versionSuffix)
     {
       string xMSBuild = Path.Combine(Paths.VSPath, "MSBuild", "15.0", "Bin", "msbuild.exe");
@@ -298,31 +307,34 @@ private void Pack(string project, string destDir, string versionSuffix)
     private void Publish(string project, string destDir)
     {
       string xMSBuild = Path.Combine(Paths.VSPath, "MSBuild", "15.0", "Bin", "msbuild.exe");
-      string xParams = $"{Quoted(project)} /t:Publish /maxcpucount  /p:OutputPath={Quoted(destDir)}";
+      string xParams = $"{Quoted(project)} /t:Publish /maxcpucount /p:RuntimeIdentifier=win7-x86 /p:OutputPath={Quoted(destDir)}";
       StartConsole(xMSBuild, xParams);
     }
 
     private void CompileCosmos()
     {
-      Section("Compiling Cosmos");
-
       string xVSIPDir = Path.Combine(mCosmosDir, "Build", "VSIP");
+      string xPackagesDir = Path.Combine(xVSIPDir, "KernelPackages");
       string xVersionSuffix = App.IsUserKit ? "" : DateTime.Now.ToString("yyyyMMddHHmm");
 
       if (!Directory.Exists(xVSIPDir))
       {
         Directory.CreateDirectory(xVSIPDir);
       }
 
+      Section("Restoring Nuget Packages");
+      Restore(Path.Combine(mCosmosDir, @"Cosmos.sln"));
+
+      Section("Compiling Cosmos");
       MSBuild(Path.Combine(mCosmosDir, @"Build.sln"), "Debug");
 
+      Section("Compiling Tools");
       Publish(Path.Combine(mCosmosDir, "source", "Cosmos.Build.MSBuild"), Path.Combine(xVSIPDir, "MSBuild"));
       Publish(Path.Combine(mCosmosDir, "source", "IL2CPU"), Path.Combine(xVSIPDir, "IL2CPU"));
-      Publish(Path.Combine(mCosmosDir, "Tools", "NASM"), Path.Combine(xVSIPDir, "NASM"));
       Publish(Path.Combine(mCosmosDir, "source", "XSharp.Compiler"), Path.Combine(xVSIPDir, "XSharp"));
+      Publish(Path.Combine(mCosmosDir, "Tools", "NASM"), Path.Combine(xVSIPDir, "NASM"));
 
-      string xPackagesDir = Path.Combine(xVSIPDir, "KernelPackages");
-
+      Section("Compiling Kernel Packages");
       Pack(Path.Combine(mCosmosDir, "source", "Cosmos.Common"), xPackagesDir, xVersionSuffix);
       Pack(Path.Combine(mCosmosDir, "source", "Cosmos.Core"), xPackagesDir, xVersionSuffix);
       Pack(Path.Combine(mCosmosDir, "source", "Cosmos.Core.Common"), xPackagesDir, xVersionSuffix);

source/Cosmos.Core.Plugs/System/Runtime/CompilerServices/RuntimeHelpersImpl.cs

@@ -11,7 +11,9 @@ public static void cctor()
         {
         }
 
+#pragma warning disable 108,114
         public static bool Equals(object o1, object o2)
+#pragma warning restore 108,114
         {
             if (o1 == null
                 && o2 == null)

source/Cosmos.Debug.Symbols/DebugSymbolReader.cs

@@ -268,7 +268,6 @@ public static Type GetCatchType(Module aModule, ExceptionRegion aRegion)
             {
                 case HandleKind.TypeReference:
                     return MetadataHelper.GetTypeFromReference(xReader, aModule, (TypeReferenceHandle) aRegion.CatchType, 0);
-                    break;
                 case HandleKind.TypeDefinition:
                     break;
                 case HandleKind.FieldDefinition: