From 896cd64e3bc2d59852225fe1b0f94b57c324242b Mon Sep 17 00:00:00 2001 From: Arthur Vickers Date: Wed, 16 Mar 2022 14:37:38 +0000 Subject: [PATCH] Revert "feat (codespaces) - Add initial support for codespaces (#27483)" This reverts commit 9599197715af8d9e205e9545fa21c8b492880e4c. --- .devcontainer/Dockerfile | 12 ----- .devcontainer/devcontainer.json | 45 ---------------- .devcontainer/docker-compose.yml | 35 ------------- .devcontainer/mssql/installSQLtools.sh | 15 ------ .devcontainer/mssql/postCreateCommand.sh | 67 ------------------------ .vscode/tasks.json | 56 -------------------- 6 files changed, 230 deletions(-) delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .devcontainer/docker-compose.yml delete mode 100644 .devcontainer/mssql/installSQLtools.sh delete mode 100644 .devcontainer/mssql/postCreateCommand.sh delete mode 100644 .vscode/tasks.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 0d69c885b2e..00000000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -# [Choice] .NET version: 6.0-focal, 5.0-focal, 3.1-focal -ARG VARIANT="6.0-focal" -FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT} - -# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 -ARG NODE_VERSION="none" -RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi - -# Install SQL Tools: SQLPackage and sqlcmd -COPY mssql/installSQLtools.sh installSQLtools.sh -RUN bash ./installSQLtools.sh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 1034072677b..00000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,45 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.222.0/containers/dotnet-mssql -{ - "name": "C# (.NET) and MS SQL", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "workspaceFolder": "/workspace", - "settings": { - "mssql.connections": [ - { - "server": "localhost,1433", - "database": "master", - "authenticationType": "SqlLogin", - "user": "sa", - "password": "Pass@word", - "emptyPasswordInput": false, - "savePassword": true, - "profileName": "mssql-container", - "trustServerCertificate": true - } - ], - "omnisharp.enableRoslynAnalyzers": true, - "omnisharp.enableEditorConfigSupport": true, - "omnisharp.enableImportCompletion": true, - "omnisharp.useModernNet": true, - "omnisharp.enableMsBuildLoadProjectsOnDemand": true - }, - "extensions": [ - "ms-dotnettools.csharp", - "ms-mssql.mssql", - "EditorConfig.EditorConfig", - "k--kato.docomment", - ], - "remoteEnv": { - "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}", - "DOTNET_MULTILEVEL_LOOKUP": "0", - "TARGET": "net7.0", - "DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true", - "Test__SqlServer__DefaultConnection ": "Server=localhost;Database=master;User Id=sa;password=Pass@word;Trusted_Connection=False;MultipleActiveResultSets=true;" - }, - "postCreateCommand": "bash .devcontainer/mssql/postCreateCommand.sh 'Pass@word' './bin/Debug/' './.devcontainer/mssql/'", - "features": { - "powershell": "latest" - } -} \ No newline at end of file diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml deleted file mode 100644 index 12a0ae525a3..00000000000 --- a/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -version: '3' - -services: - app: - build: - context: . - dockerfile: Dockerfile - args: - # Update 'VARIANT' to pick a version of .NET: 3.1-focal, 5.0-focal, 6.0-focal - VARIANT: "6.0-focal" - # Optional version of Node.js - NODE_VERSION: "none" - - volumes: - - ..:/workspace:cached - - # Overrides default command so things don't shut down after the process ends. - command: sleep infinity - - # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function. - network_mode: service:db - # Uncomment the next line to use a non-root user for all processes. - # user: vscode - - # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. - # (Adding the "ports" property to this file will not forward from a Codespace.) - - db: - image: mcr.microsoft.com/mssql/server:2019-latest - restart: unless-stopped - environment: - SA_PASSWORD: Pass@word - ACCEPT_EULA: Y - # Add "forwardPorts": ["1433"] to **devcontainer.json** to forward MSSQL locally. - # (Adding the "ports" property to this file will not forward from a Codespace.) diff --git a/.devcontainer/mssql/installSQLtools.sh b/.devcontainer/mssql/installSQLtools.sh deleted file mode 100644 index d45e44b2e97..00000000000 --- a/.devcontainer/mssql/installSQLtools.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -echo "Installing mssql-tools" -curl -sSL https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT) -DISTRO=$(lsb_release -is | tr '[:upper:]' '[:lower:]') -CODENAME=$(lsb_release -cs) -echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-${DISTRO}-${CODENAME}-prod ${CODENAME} main" > /etc/apt/sources.list.d/microsoft.list -apt-get update -ACCEPT_EULA=Y apt-get -y install unixodbc-dev msodbcsql17 libunwind8 mssql-tools - -echo "Installing sqlpackage" -curl -sSL -o sqlpackage.zip "https://aka.ms/sqlpackage-linux" -mkdir /opt/sqlpackage -unzip sqlpackage.zip -d /opt/sqlpackage -rm sqlpackage.zip -chmod a+x /opt/sqlpackage/sqlpackage diff --git a/.devcontainer/mssql/postCreateCommand.sh b/.devcontainer/mssql/postCreateCommand.sh deleted file mode 100644 index 4aac9edeb29..00000000000 --- a/.devcontainer/mssql/postCreateCommand.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -dacpac="false" -sqlfiles="false" -SApassword=$1 -dacpath=$2 -sqlpath=$3 - -echo "SELECT * FROM SYS.DATABASES" | dd of=testsqlconnection.sql -for i in {1..60}; -do - /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SApassword -d master -i testsqlconnection.sql > /dev/null - if [ $? -eq 0 ] - then - echo "SQL server ready" - break - else - echo "Not ready yet..." - sleep 1 - fi -done -rm testsqlconnection.sql - -for f in $dacpath/* -do - if [ $f == $dacpath/*".dacpac" ] - then - dacpac="true" - echo "Found dacpac $f" - fi -done - -for f in $sqlpath/* -do - if [ $f == $sqlpath/*".sql" ] - then - sqlfiles="true" - echo "Found SQL file $f" - fi -done - -if [ $sqlfiles == "true" ] -then - for f in $sqlpath/* - do - if [ $f == $sqlpath/*".sql" ] - then - echo "Executing $f" - /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SApassword -d master -i $f - fi - done -fi - -if [ $dacpac == "true" ] -then - for f in $dacpath/* - do - if [ $f == $dacpath/*".dacpac" ] - then - dbname=$(basename $f ".dacpac") - echo "Deploying dacpac $f" - /opt/sqlpackage/sqlpackage /Action:Publish /SourceFile:$f /TargetServerName:localhost /TargetDatabaseName:$dbname /TargetUser:sa /TargetPassword:$SApassword - fi - done -fi - -echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc -source ~/.bashrc \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index b264106bb75..00000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "Restore projects", - "type": "shell", - "command": "./restore.sh", - "windows": { - "command": ".\\restore.cmd" - }, - "group": "build", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Build entire repository", - "type": "shell", - "command": "./build.sh", - "windows": { - "command": ".\\build.cmd" - }, - "group": "build", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Build and run all tests", - "type": "shell", - "command": "/test.sh -test", - "windows": { - "command": ".\\test.cmd -test" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Pack assets", - "type": "shell", - "command": "./eng/build.sh --pack", - "windows": { - "command": ".\\eng\\build.cmd -pack" - }, - "presentation": { - "reveal": "always", - "panel": "new" - } - } - ] -} \ No newline at end of file