Skip to content

Commit a59eeba

Browse files
[main] Source code updates from dotnet/dotnet (#78692)
* [VMR] Codeflow 2b6024e-2b6024e [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 269352 No dependency updates to commit --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 3fdea4a commit a59eeba

File tree

6 files changed

+17
-8
lines changed

6 files changed

+17
-8
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
1313
done
1414

1515
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
16-
"$scriptroot/eng/build.sh" --build --solution Roslyn.sln $@
16+
"$scriptroot/eng/build.sh" --build --solution Roslyn.sln "$@"

eng/DotNetBuild.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<GitHubRepositoryName>roslyn</GitHubRepositoryName>
77
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
8-
<ReportPrebuiltUsage Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DotNetBuildOrchestrator)</ReportPrebuiltUsage>
8+
<ReportPrebuiltUsage Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DotNetBuildFromVMR)</ReportPrebuiltUsage>
99
<SetUpSourceBuildIntermediateNupkgCache>false</SetUpSourceBuildIntermediateNupkgCache>
1010
<CreateIntermediatePackage>false</CreateIntermediatePackage>
1111
</PropertyGroup>

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="a4d6fdc935d5da12efb00a0b3b693ff1439e0b41" BarId="269082" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="445fb3a55b402cbe3a43576105e6fdc6686c8e4c" BarId="269352" />
44
<ProductDependencies>
55
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
66
<Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">

eng/build.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ param (
4444
[switch]$useGlobalNuGetCache = $true,
4545
[switch]$warnAsError = $false,
4646
[switch][Alias('pb')]$productBuild = $false,
47+
[switch]$fromVMR = $false,
4748
[switch]$oop64bit = $true,
4849
[switch]$lspEditor = $false,
4950
[string]$solution = "Roslyn.sln",
@@ -113,6 +114,7 @@ function Print-Usage() {
113114
Write-Host " -useGlobalNuGetCache Use global NuGet cache."
114115
Write-Host " -warnAsError Treat all warnings as errors"
115116
Write-Host " -productBuild Build the repository in product-build mode"
117+
Write-Host " -fromVMR Set when building from within the VMR"
116118
Write-Host " -solution Solution to build (default is Roslyn.sln)"
117119
Write-Host ""
118120
Write-Host "Official build settings:"
@@ -287,6 +289,7 @@ function BuildSolution() {
287289
/p:VisualStudioDropAccessToken=$officialVisualStudioDropAccessToken `
288290
/p:DotNetBuildRepo=$productBuild `
289291
/p:DotNetBuild=$productBuild `
292+
/p:DotNetBuildFromVMR=$fromVMR `
290293
$suppressExtensionDeployment `
291294
$msbuildWarnAsError `
292295
$generateDocumentationFile `

eng/build.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ usage()
3939
echo " --warnAsError Treat all warnings as errors"
4040
echo " --sourceBuild Build the repository in source-only mode"
4141
echo " --productBuild Build the repository in product-build mode."
42+
echo " --fromVMR Build the repository in product-build mode."
4243
echo " --solution Solution to build (default is Compilers.slnf)"
4344
echo ""
4445
echo "Command line arguments starting with '/p:' are passed through to MSBuild."
@@ -79,9 +80,10 @@ run_analyzers=false
7980
skip_documentation=false
8081
prepare_machine=false
8182
warn_as_error=false
82-
properties=""
83+
properties=()
8384
source_build=false
8485
product_build=false
86+
from_vmr=false
8587
solution_to_build="Compilers.slnf"
8688

8789
args=""
@@ -182,13 +184,16 @@ while [[ $# > 0 ]]; do
182184
--productbuild|--product-build|-pb)
183185
product_build=true
184186
;;
187+
--fromvmr|--from-vmr)
188+
from_vmr=true
189+
;;
185190
--solution)
186191
solution_to_build=$2
187192
args="$args $1"
188193
shift
189194
;;
190195
/p:*)
191-
properties="$properties $1"
196+
properties+=("$1")
192197
;;
193198
*)
194199
echo "Invalid argument: $1"
@@ -313,11 +318,12 @@ function BuildSolution {
313318
/p:DotNetBuildSourceOnly=$source_build \
314319
/p:DotNetBuildRepo=$product_build \
315320
/p:DotNetBuild=$product_build \
321+
/p:DotNetBuildFromVMR=$from_vmr \
316322
$test_runtime \
317323
$mono_tool \
318324
$generate_documentation_file \
319325
$roslyn_use_hard_links \
320-
$properties
326+
"${properties[@]}"
321327
}
322328

323329
function GetCompilerTestAssembliesIncludePaths {

eng/targets/TargetFrameworks.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
bootstrap toolset in other repos doing (1). Those can be using a NetPrevious runtime hence
3636
the toolset must support that.
3737
-->
38-
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' != 'true'">
38+
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' != 'true'">
3939
<PropertyGroup>
4040
<!-- TODO until we figure out what is up with NetPrevious -->
4141
<NetPrevious>$(NetMinimum)</NetPrevious>
@@ -50,7 +50,7 @@
5050
<!--
5151
2. Source build the product: this is the all up build of the product which needs only NetCurrent
5252
-->
53-
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' == 'true'">
53+
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' == 'true'">
5454
<PropertyGroup>
5555
<NetRoslyn>$(NetCurrent)</NetRoslyn>
5656
<NetRoslynSourceBuild>$(NetCurrent)</NetRoslynSourceBuild>

0 commit comments

Comments
 (0)