Improve vscode dotnet support (#8384)
* Run make ensure on devcontainer creation Added an ensure target to the dotnet makefile to run `dotnet restore`. * Add dotnet test explorer and set default vscode settings for it * Ensure PULUMI_LOCAL_NUGET exists * Add missing mkdirs
This commit is contained in:
parent
0343a6de76
commit
c6240cf38d
|
@ -16,10 +16,9 @@
|
||||||
|
|
||||||
"remoteUser": "user",
|
"remoteUser": "user",
|
||||||
|
|
||||||
"extensions": ["golang.go", "ms-dotnettools.csharp", "ms-python.python"],
|
"extensions": ["golang.go", "ms-dotnettools.csharp", "ms-python.python", "formulahendry.dotnet-test-explorer"],
|
||||||
|
|
||||||
// We want to dotnet restore all projects on startup so that omnisharp doesn't complain about lots of missing types on startup.
|
"postCreateCommand": "make ensure",
|
||||||
"postCreateCommand": "find -name \"*.??proj\" | xargs -L1 dotnet restore",
|
|
||||||
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"extensions.ignoreRecommendations": true
|
"extensions.ignoreRecommendations": true
|
||||||
|
|
5
.github/workflows/master.yml
vendored
5
.github/workflows/master.yml
vendored
|
@ -160,6 +160,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}
|
dotnet-version: ${{ matrix.dotnet-version }}
|
||||||
|
- run: mkdir -p ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- name: Set up Node ${{ matrix.node-version }}
|
- name: Set up Node ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -229,6 +230,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}
|
dotnet-version: ${{ matrix.dotnet-version }}
|
||||||
|
- run: mkdir -p ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- name: Set up Node ${{ matrix.node-version }}
|
- name: Set up Node ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -303,6 +305,9 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet }}
|
dotnet-version: ${{ matrix.dotnet }}
|
||||||
|
- name: Create Local Nuget
|
||||||
|
run: mkdir -p "${{ env.PULUMI_LOCAL_NUGET }}"
|
||||||
|
shell: bash
|
||||||
- run: dotnet nuget add source ${{ env.PULUMI_LOCAL_NUGET }}
|
- run: dotnet nuget add source ${{ env.PULUMI_LOCAL_NUGET }}
|
||||||
- name: Use Node.js ${{ matrix.node-version }}
|
- name: Use Node.js ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
|
8
.github/workflows/prerelease.yml
vendored
8
.github/workflows/prerelease.yml
vendored
|
@ -143,6 +143,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}
|
dotnet-version: ${{ matrix.dotnet-version }}
|
||||||
|
- run: mkdir -p ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- name: Set up Node ${{ matrix.node-version }}
|
- name: Set up Node ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -206,6 +207,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}
|
dotnet-version: ${{ matrix.dotnet-version }}
|
||||||
|
- run: mkdir -p ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- name: Set up Node ${{ matrix.node-version }}
|
- name: Set up Node ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -280,6 +282,9 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet }}
|
dotnet-version: ${{ matrix.dotnet }}
|
||||||
|
- name: Create Local Nuget
|
||||||
|
run: mkdir -p "${{ env.PULUMI_LOCAL_NUGET }}"
|
||||||
|
shell: bash
|
||||||
- run: dotnet nuget add source ${{ env.PULUMI_LOCAL_NUGET }}
|
- run: dotnet nuget add source ${{ env.PULUMI_LOCAL_NUGET }}
|
||||||
- name: Use Node.js ${{ matrix.node-version }}
|
- name: Use Node.js ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -295,9 +300,6 @@ jobs:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
- name: Clean
|
- name: Clean
|
||||||
run: dotnet nuget locals all --clear
|
run: dotnet nuget locals all --clear
|
||||||
- name: Create Local Nuget
|
|
||||||
run: mkdir -p "D:\\Pulumi\\nuget"
|
|
||||||
shell: bash
|
|
||||||
- name: Install Python Deps
|
- name: Install Python Deps
|
||||||
run: |
|
run: |
|
||||||
pip3 install pyenv-win
|
pip3 install pyenv-win
|
||||||
|
|
5
.github/workflows/release.yml
vendored
5
.github/workflows/release.yml
vendored
|
@ -236,6 +236,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}
|
dotnet-version: ${{ matrix.dotnet-version }}
|
||||||
|
- run: mkdir -p ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- name: Set up Node ${{ matrix.node-version }}
|
- name: Set up Node ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -305,6 +306,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}
|
dotnet-version: ${{ matrix.dotnet-version }}
|
||||||
|
- run: mkdir -p ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- name: Set up Node ${{ matrix.node-version }}
|
- name: Set up Node ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -386,6 +388,9 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet }}
|
dotnet-version: ${{ matrix.dotnet }}
|
||||||
|
- name: Create Local Nuget
|
||||||
|
run: mkdir -p "${{ env.PULUMI_LOCAL_NUGET }}"
|
||||||
|
shell: bash
|
||||||
- run: dotnet nuget add source ${{ env.PULUMI_LOCAL_NUGET }}
|
- run: dotnet nuget add source ${{ env.PULUMI_LOCAL_NUGET }}
|
||||||
- name: Use Node.js ${{ matrix.node-version }}
|
- name: Use Node.js ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
|
|
@ -82,6 +82,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}
|
dotnet-version: ${{ matrix.dotnet-version }}
|
||||||
|
- run: mkdir -p ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- name: Set up Node ${{ matrix.node-version }}
|
- name: Set up Node ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -170,6 +171,7 @@ jobs:
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}
|
dotnet-version: ${{ matrix.dotnet-version }}
|
||||||
|
- run: mkdir -p ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
- run: dotnet nuget add source ${{ runner.temp }}/opt/pulumi/nuget
|
||||||
- name: Set up Node ${{ matrix.node-version }}
|
- name: Set up Node ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v1
|
uses: actions/setup-node@v1
|
||||||
|
@ -279,6 +281,9 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
pip3 install pyenv-win
|
pip3 install pyenv-win
|
||||||
pip3 install pipenv
|
pip3 install pipenv
|
||||||
|
- name: Create Local Nuget
|
||||||
|
run: mkdir -p "${{ env.PULUMI_LOCAL_NUGET }}"
|
||||||
|
shell: bash
|
||||||
- run: dotnet nuget add source ${{ env.PULUMI_LOCAL_NUGET }}
|
- run: dotnet nuget add source ${{ env.PULUMI_LOCAL_NUGET }}
|
||||||
- name: Set Build Env Vars
|
- name: Set Build Env Vars
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
@ -11,4 +11,7 @@
|
||||||
// Experimental but seems to work and means we don't need a vscode instance per go.mod file.
|
// Experimental but seems to work and means we don't need a vscode instance per go.mod file.
|
||||||
"experimentalWorkspaceModule": true,
|
"experimentalWorkspaceModule": true,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"omnisharp.defaultLaunchSolution": "sdk/dotnet/dotnet.sln",
|
||||||
|
"dotnet-test-explorer.testProjectPath": "sdk/dotnet",
|
||||||
}
|
}
|
|
@ -14,6 +14,10 @@ include ../../build/common.mk
|
||||||
# `test_all` without the dependencies.
|
# `test_all` without the dependencies.
|
||||||
TEST_ALL_DEPS = install
|
TEST_ALL_DEPS = install
|
||||||
|
|
||||||
|
ensure::
|
||||||
|
# We want to dotnet restore all projects on startup so that omnisharp doesn't complain about lots of missing types on startup.
|
||||||
|
dotnet restore dotnet.sln
|
||||||
|
|
||||||
build::
|
build::
|
||||||
# From the nuget docs:
|
# From the nuget docs:
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue