Skip to content

Commit 50ba0db

Browse files
authored
Merge branch 'main' into merge/release/7.0.3xx-to-main
2 parents 6390db5 + afe25ac commit 50ba0db

File tree

336 files changed

+5517
-5259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+5517
-5259
lines changed

.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"microsoft.dotnet.darc": {
6+
"version": "1.1.0-beta.23101.1",
7+
"commands": [
8+
"darc"
9+
]
10+
}
11+
}
12+
}

.devcontainer/devcontainer.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

.devcontainer/source-build-scripts/buildTarball.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

.devcontainer/source-build-scripts/createTarball.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

.devcontainer/source-build-tarball/devcontainer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

.devcontainer/source-build/devcontainer.json

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
######## ######## ### ######## ######## ## ## #### ######
3+
## ## ## ## ## ## ## ## ## ## ## ## ##
4+
## ## ## ## ## ## ## ## ## ## ## ##
5+
######## ###### ## ## ## ## ## ######### ## ######
6+
## ## ## ######### ## ## ## ## ## ## ##
7+
## ## ## ## ## ## ## ## ## ## ## ## ##
8+
## ## ######## ## ## ######## ## ## ## #### ######
9+
-->
10+
11+
This Codespace can help you debug the source build of .NET. In case you have run this from a
12+
`dotnet/installer` PR branch, it will contain the VMR (`dotnet/dotnet`) checked out into
13+
`/workspaces/dotnet` with the PR changes pulled into it. You can then attempt to source-build
14+
the VMR which is what the VMR leg in the installer PR build doing. This build takes about 45
15+
minutes and, after completion, produces an archived .NET SDK in `/workspaces/artifacts/x64/Release`.
16+
17+
To build the VMR, run following:
18+
```bash
19+
cd /workspaces/dotnet
20+
unset RepositoryName
21+
./build.sh --online
22+
```
23+
24+
> Please note that, at this time, the build modifies some of the checked-in sources so it might
25+
be preferential to rebuild the Codespace between attempts.
26+
27+
For more details, see the instructions at https://github.com/dotnet/dotnet.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Container suitable for investigating issues with source build
2+
// Contains the VMR (dotnet/dotnet) with applied changes from the current PR
3+
// The container supports source-building the SDK
4+
{
5+
"name": "VMR with PR changes",
6+
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36",
7+
"hostRequirements": {
8+
// A completely source built .NET is >64 GB with all the repos/artifacts
9+
"storage": "128gb"
10+
},
11+
"customizations": {
12+
"vscode": {
13+
"extensions": [
14+
"ms-dotnettools.csharp"
15+
]
16+
},
17+
"codespaces": {
18+
"openFiles": [
19+
"installer/.devcontainer/vmr-source-build/README.md"
20+
]
21+
}
22+
},
23+
"onCreateCommand": "${containerWorkspaceFolder}/installer/.devcontainer/vmr-source-build/init.sh",
24+
"workspaceFolder": "/workspaces"
25+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
source="${BASH_SOURCE[0]}"
6+
script_root="$( cd -P "$( dirname "$source" )" && pwd )"
7+
8+
installer_dir=$(realpath "$script_root/../..")
9+
workspace_dir=$(realpath "$installer_dir/../")
10+
tmp_dir=$(realpath "$workspace_dir/tmp")
11+
vmr_dir=$(realpath "$workspace_dir/dotnet")
12+
13+
mkdir -p "$tmp_dir"
14+
15+
# Codespaces performs a shallow fetch only
16+
git -C "$installer_dir" fetch --all --unshallow
17+
18+
# We will try to figure out, which branch is the current (PR) branch based off of
19+
# We need this to figure out, which VMR branch to use
20+
vmr_branch=$(git log --pretty=format:'%D' HEAD^ | grep 'origin/' | head -n1 | sed 's@origin/@@' | sed 's@,.*@@')
21+
22+
pushd "$installer_dir"
23+
"./eng/vmr-sync.sh" \
24+
--vmr "$vmr_dir" \
25+
--tmp "$tmp_dir" \
26+
--branch "$vmr_branch" \
27+
--debug
28+
popd
29+
30+
# Run prep.sh
31+
unset RepositoryName
32+
pushd "$vmr_dir"
33+
./prep.sh
34+
popd

0 commit comments

Comments
 (0)