Skip to content

Commit 3e4a6e2

Browse files
Merging main into darc-main-e50bc623-700d-4240-9724-05fa48008b3e
2 parents 73c19f4 + 34920af commit 3e4a6e2

File tree

8 files changed

+422
-421
lines changed

8 files changed

+422
-421
lines changed

.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25259.3",
6+
"version": "1.1.0-beta.25264.3",
77
"commands": [
88
"darc"
99
]

documentation/general/dotnet-run-file.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ We call these *file-based programs* (as opposed to *project-based programs*).
77
dotnet run file.cs
88
```
99

10+
See also [IDE spec](https://github.com/dotnet/roslyn/blob/main/docs/features/file-based-programs-vscode.md).
11+
1012
## Motivation
1113

1214
File-based programs
@@ -71,7 +73,7 @@ Internally, the SDK CLI detects entry points by parsing all `.cs` files in the d
7173
and checking which ones contain top-level statements (`Main` methods are not supported for now as that would require full semantic analysis, not just parsing).
7274
Results of this detection are used to exclude other entry points from [builds](#multiple-entry-points) and [app directive collection](#directives-for-project-metadata).
7375
This means the CLI might consider a file to be an entry point which later the compiler doesn't
74-
(for example because its top-level statements are under `#if SYMBOL` and the build has `DefineConstants=SYMBOL`).
76+
(for example because its top-level statements are under `#if !SYMBOL` and the build has `DefineConstants=SYMBOL`).
7577
However such inconsistencies should be rare and hence that is a better trade off than letting the compiler decide which files are entry points
7678
because that could require multiple builds (first determine entry points and then re-build with app directives except those from other entry points).
7779
To avoid parsing all C# files twice (in CLI and in the compiler), the CLI could use the compiler server for parsing so the trees are reused

eng/Version.Details.xml

+281-281
Large diffs are not rendered by default.

eng/Versions.props

+132-132
Large diffs are not rendered by default.

eng/common/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ while [[ $# > 0 ]]; do
136136
restore=true
137137
pack=true
138138
;;
139-
-productBuild|-pb)
139+
-productbuild|-pb)
140140
build=true
141141
product_build=true
142142
restore=true

eng/common/core-templates/steps/source-build.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ steps:
5151
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
5252
--configuration $buildConfig \
5353
--restore --build --pack -bl \
54+
--source-build \
5455
${{ parameters.platform.buildArguments }} \
5556
$internalRuntimeDownloadArgs \
5657
$targetRidArgs \
5758
$baseRidArgs \
5859
$portableBuildArgs \
59-
/p:DotNetBuildSourceOnly=true \
60-
/p:DotNetBuildRepo=true \
6160
displayName: Build
6261

6362
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml

eng/common/darc-init.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function InstallDarcCli {
6868
fi
6969
fi
7070

71-
local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
71+
local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
7272

7373
echo "Installing Darc CLI version $darcVersion..."
7474
echo "You may need to restart your command shell if this is the first dotnet tool you have installed."

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25260.104",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.108",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

0 commit comments

Comments
 (0)