Skip to content

Commit c8abd69

Browse files
committed
Update gitpod config and get dev environment set up working again
MS decided to no longer allow downloads of the pinned SDK. Why can't this stuff just work nicely for a change, it just keeps breaking. Signed-off-by: Patrick Dwyer <[email protected]>
1 parent 4f9185d commit c8abd69

File tree

16 files changed

+23
-5249
lines changed

16 files changed

+23
-5249
lines changed

.github/workflows/dotnetcore.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v3
2020
- uses: actions/setup-dotnet@v2
2121
with:
22-
dotnet-version: '6.0.200'
22+
dotnet-version: '6.0.x'
2323

2424
- name: Build
2525
run: dotnet build /WarnAsError
@@ -37,7 +37,7 @@ jobs:
3737
- uses: actions/checkout@v3
3838
- uses: actions/setup-dotnet@v2
3939
with:
40-
dotnet-version: '6.0.200'
40+
dotnet-version: '6.0.x'
4141

4242
- name: Install protocol buffers compiler on Linux
4343
if: matrix.os == 'ubuntu-latest'
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@v3
5959
- uses: actions/setup-dotnet@v2
6060
with:
61-
dotnet-version: '6.0.200'
61+
dotnet-version: '6.0.x'
6262

6363
- name: Download DocFX
6464
run: |

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v3
3232
- uses: actions/setup-dotnet@v2
3333
with:
34-
dotnet-version: '6.0.200'
34+
dotnet-version: '6.0.x'
3535

3636
# For the following tests
3737
- name: Install protocol buffers compiler

.gitpod.Dockerfile

+14-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@ USER gitpod
44

55
# Install .NET SDK
66
# Source: https://docs.microsoft.com/dotnet/core/install/linux-scripted-manual#scripted-install
7-
#RUN mkdir -p /home/gitpod/dotnet && curl -fsSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --install-dir /home/gitpod/dotnet
8-
#ENV DOTNET_ROOT=/home/gitpod/dotnet
9-
#ENV PATH=$PATH:/home/gitpod/dotnet
7+
RUN mkdir -p /home/gitpod/dotnet && curl -fsSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --install-dir /home/gitpod/dotnet
8+
ENV DOTNET_ROOT=/home/gitpod/dotnet
9+
ENV PATH=/home/gitpod/dotnet:$PATH
1010

11-
# Refer to for reasons https://github.com/gitpod-io/template-dotnet-core-cli-csharp/commit/9d01b88fa900c7802103a13ca0cc18b2b02c4752
12-
ENV DOTNET_ROOT=/workspace/local/dotnet
13-
ENV PATH=$DOTNET_ROOT:$PATH
1411
ENV PATH=/workspace/local/bin:$PATH
12+
13+
# TODO(toru): Remove this hack when the kernel bug is resolved.
14+
# ref. https://github.com/gitpod-io/gitpod/issues/8901
15+
RUN bash \
16+
&& { echo 'if [ ! -z $GITPOD_REPO_ROOT ]; then'; \
17+
echo '\tCONTAINER_DIR=$(awk '\''{ print $6 }'\'' /proc/self/maps | grep ^\/run\/containerd | head -n 1 | cut -d '\''/'\'' -f 1-6)'; \
18+
echo '\tif [ ! -z $CONTAINER_DIR ]; then'; \
19+
echo '\t\t[[ ! -d $CONTAINER_DIR ]] && sudo mkdir -p $CONTAINER_DIR && sudo ln -s / $CONTAINER_DIR/rootfs'; \
20+
echo '\tfi'; \
21+
echo 'fi'; } >> /home/gitpod/.bashrc.d/110-dotnet
22+
RUN chmod +x /home/gitpod/.bashrc.d/110-dotnet

.gitpod.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
image:
22
file: .gitpod.Dockerfile
33

4-
# Refer to for reasons https://github.com/gitpod-io/template-dotnet-core-cli-csharp/commit/9d01b88fa900c7802103a13ca0cc18b2b02c4752
54
tasks:
65
- name: Restore dependencies
76
init: |
87
wget -O protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip
98
unzip protoc.zip -d /workspace/local
109
rm protoc.zip
11-
mkdir -p /workspace/local/dotnet && curl -fsSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0.200 --install-dir /workspace/local/dotnet
12-
dotnet tool install --tool-path /workspace/local/bin dotnet-reportgenerator-globaltool
13-
dotnet tool install --tool-path /workspace/local/bin dotnet-outdated-tool
10+
dotnet tool install --global dotnet-reportgenerator-globaltool
1411
dotnet restore
1512
vscode:
1613
extensions:

Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
3333
<IncludeSymbols>true</IncludeSymbols>
3434
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
35-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
36-
<RestoreLockedMode>true</RestoreLockedMode>
35+
<!-- <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile> -->
36+
<!-- <RestoreLockedMode>true</RestoreLockedMode> -->
3737
</PropertyGroup>
3838

3939
</Project>

global.json

-5
This file was deleted.

src/CycloneDX.Core/CycloneDX.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
<PrivateAssets>all</PrivateAssets>
1414
</PackageReference>
15-
<PackageReference Include="System.Text.Json" Version="6.0.2" />
1615
<PackageReference Include="JsonSchema.Net" Version="2.2.0" />
1716
<PackageReference Include="protobuf-net" Version="3.0.101" />
1817
<PackageReference Include="protobuf-net.BuildTools" Version="3.0.115" PrivateAssets="all" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" />
18+
<PackageReference Include="System.Text.Json" Version="6.0.5" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

src/CycloneDX.Core/packages.lock.json

-197
This file was deleted.

0 commit comments

Comments
 (0)