diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c49dc84..ec9cef0 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,10 +1,20 @@ # [Choice] .NET version: 6.0-focal, 7.0-bullseye -ARG VARIANT="6.0-focal" -FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT} +#RUN curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +ARG VARIANT="dev-6.0-focal" +FROM mcr.microsoft.com/devcontainers/dotnet:${VARIANT} # Add .NET global tools path ENV PATH $PATH:/home/vscode/.dotnet:/home/vscode/.dotnet/tools +# Import Microsoft Signing Keys +# https://learn.microsoft.com/dotnet/core/install/linux-ubuntu#unable-to-locate--some-packages-could-not-be-installed +RUN sudo apt-get install -y gpg wget \ + && wget https://packages.microsoft.com/keys/microsoft.asc \ + && cat microsoft.asc | gpg --dearmor -o microsoft.asc.gpg \ + && sudo mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \ + && sudo chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg + # Install additional OS packages RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends software-properties-common diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e658155..347fc24 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -7,7 +7,7 @@ services: dockerfile: Dockerfile args: # Update 'VARIANT' to pick a version of .NET: 6.0-focal, 7.0-bullseye - VARIANT: "6.0-focal" + VARIANT: "dev-6.0-focal" volumes: - ..:/workspace:cached diff --git a/.devcontainer/sql/postCreateCommand.sh b/.devcontainer/sql/postCreateCommand.sh index 43eb03a..2d8a238 100644 --- a/.devcontainer/sql/postCreateCommand.sh +++ b/.devcontainer/sql/postCreateCommand.sh @@ -6,6 +6,7 @@ dacpath=$2 sqlpath=$3 echo "SELECT * FROM SYS.DATABASES" | dd of=testsqlconnection.sql + for i in {1..60}; do sqlcmd -S localhost -U sa -P $SApassword -d master -i testsqlconnection.sql > /dev/null diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5b5f7ed --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +# Git will always convert line endings to LF on checkout. +# Used for files that must keep LF endings, even on Windows. +*.sh text eol=lf \ No newline at end of file diff --git a/app/BlazorLibrary/wwwroot/appsettings.json b/app/BlazorLibrary/wwwroot/appsettings.json index 41e0341..5b5257a 100644 --- a/app/BlazorLibrary/wwwroot/appsettings.json +++ b/app/BlazorLibrary/wwwroot/appsettings.json @@ -1,3 +1,3 @@ { - "ApiUrl": "http://127.0.0.1:5001" + "ApiUrl": "http://127.0.0.1:5000" } \ No newline at end of file