Tweak some things to fix build

cibuild.sh

@@ -110,9 +110,9 @@ dotnet restore ${RESTORE_ARGS} ${THIS_DIR}/CrossPlatform.sln
 BUILD_ARGS="--no-restore -c ${BUILD_CONFIGURATION} -r ${RUNTIME_ID} /nologo /consoleloggerparameters:Verbosity=minimal;summary /filelogger /fileloggerparameters:Verbosity=normal;logFile=${BUILD_LOG_PATH} /maxcpucount:1"
 
 echo "Building bootstrap csc"
-dotnet publish ${SRC_PATH}/Compilers/csc/csc -o ${BOOTSTRAP_PATH}/csc ${BUILD_ARGS}
+dotnet publish ${SRC_PATH}/Compilers/CSharp/csc -o ${BOOTSTRAP_PATH}/csc ${BUILD_ARGS}
 echo "Building bootstrap vbc"
-dotnet publish ${SRC_PATH}/Compilers/vbc/vbc -o ${BOOTSTRAP_PATH}/vbc ${BUILD_ARGS}
+dotnet publish ${SRC_PATH}/Compilers/VisualBasic/vbc -o ${BOOTSTRAP_PATH}/vbc ${BUILD_ARGS}
 rm -rf ${BINARIES_PATH}/${BUILD_CONFIGURATION}
 BUILD_ARGS+=" /p:CscToolPath=${BOOTSTRAP_PATH}/csc /p:CscToolExe=csc /p:VbcToolPath=${BOOTSTRAP_PATH}/vbc /p:VbcToolExe=vbc"
 

src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Microsoft.CodeAnalysis.CompilerServer</RootNamespace>
     <LargeAddressAware>true</LargeAddressAware>
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
-    <RuntimeIdentifiers>win7;ubuntu.14.04;osx.10.10</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64</RuntimeIdentifiers>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
   </PropertyGroup>