Skip to content

Commit 9344590

Browse files
imcarolwangimcarolwang
authored
Merge branch 'main' into svcutilXmlSerializerRtm
2 parents 794b1fa + b788a6c commit 9344590

File tree

315 files changed

+4519
-5018
lines changed

Some content is hidden

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

315 files changed

+4519
-5018
lines changed

‎System.ServiceModel.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Encoding.MessageVersion.Int
4949
EndProject
5050
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extensibility.MessageEncoder.IntegrationTests", "src\System.Private.ServiceModel\tests\Scenarios\Extensibility\MessageEncoder\Extensibility.MessageEncoder.IntegrationTests.csproj", "{76361777-321D-4588-87F9-38992A758350}"
5151
EndProject
52-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extensibility.MessageInterceptor.IntegrationTests", "src\System.Private.ServiceModel\tests\Scenarios\Extensibility\MessageInterceptor\Extensibility.MessageInterceptor.IntegrationTests.csproj", "{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}"
53-
EndProject
5452
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extensibility.WebSockets.IntegrationTests", "src\System.Private.ServiceModel\tests\Scenarios\Extensibility\WebSockets\Extensibility.WebSockets.IntegrationTests.csproj", "{C8CA16D3-5B1E-4EC0-A817-205A798DC272}"
5553
EndProject
5654
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infrastructure.IntegrationTests", "src\System.Private.ServiceModel\tests\Scenarios\Infrastructure\Infrastructure.IntegrationTests.csproj", "{719E874A-AEFA-44D5-9530-9C41BD0FA4E8}"
@@ -209,10 +207,6 @@ Global
209207
{76361777-321D-4588-87F9-38992A758350}.Debug|Any CPU.Build.0 = Debug|Any CPU
210208
{76361777-321D-4588-87F9-38992A758350}.Release|Any CPU.ActiveCfg = Release|Any CPU
211209
{76361777-321D-4588-87F9-38992A758350}.Release|Any CPU.Build.0 = Release|Any CPU
212-
{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213-
{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}.Debug|Any CPU.Build.0 = Debug|Any CPU
214-
{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}.Release|Any CPU.ActiveCfg = Release|Any CPU
215-
{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}.Release|Any CPU.Build.0 = Release|Any CPU
216210
{C8CA16D3-5B1E-4EC0-A817-205A798DC272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
217211
{C8CA16D3-5B1E-4EC0-A817-205A798DC272}.Debug|Any CPU.Build.0 = Debug|Any CPU
218212
{C8CA16D3-5B1E-4EC0-A817-205A798DC272}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -337,7 +331,6 @@ Global
337331
{48C41A27-631F-45FA-ACD5-7D7EDD4A4931} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
338332
{36DD97F6-1F78-4843-A9C0-58C59D367603} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
339333
{76361777-321D-4588-87F9-38992A758350} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
340-
{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
341334
{C8CA16D3-5B1E-4EC0-A817-205A798DC272} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
342335
{719E874A-AEFA-44D5-9530-9C41BD0FA4E8} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
343336
{E878E412-F0AB-4D87-8A7A-3114AAC48CD5} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}

‎azure-pipelines-arcade-PR.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ stages:
149149
container: ubuntu_2004_20211215
150150
pool:
151151
name: NetCore-Public
152-
demands: ImageOverride -equals build.Ubuntu.1804.Amd64.Open
152+
demands: ImageOverride -equals build.Ubuntu.2004.Amd64.Open
153153
variables:
154154
- _TestArgs: /p:ServiceUri=$(_serviceUri) /p:Root_Certificate_Installed=true /p:Client_Certificate_Installed=true /p:SSL_Available=true
155155
- _serviceUri:
@@ -200,19 +200,20 @@ stages:
200200
--projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
201201
$(_TestArgs)
202202
/p:TestJob=Linux
203-
/p:RunWithCoreWcfService=$($Env:_RunWithCoreWcfService)
204203
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
205204
displayName: Linux - Run Helix Tests
206205
env:
207206
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
208207
ServiceHost: $(_serviceUri)
209208
RunAsPublic: $(_RunAsPublic)
210209
RunAsInternal: $(_RunAsInternal)
210+
RunWithCoreWcfService: $(_RunWithCoreWcfService)
211211
IsWindowsBuild: false
212212

213213
# Only build and test MacOS in PR and CI builds.
214214
- ${{ if eq(variables._RunAsPublic, True) }}:
215215
- job: MacOS
216+
condition: ne(variables._RunWithCoreWcfService, True)
216217
timeoutInMinutes: 90
217218
pool:
218219
name: NetCore-Public

‎eng/SendToHelix.proj

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,35 @@
1-
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
1+
<Project Sdk="Microsoft.DotNet.Helix.Sdk" InitialTargets="InstallDotNet;BuildProjects;Test">
22
<PropertyGroup>
33
<HelixSource Condition=" '$(RunAsPublic)' == 'true' ">pr/dotnet/wcf/$(BUILD_SOURCEBRANCH)/</HelixSource>
44
<HelixSource Condition=" '$(RunAsInternal)' == 'true' ">official/dotnet/wcf/$(BUILD_SOURCEBRANCH)/</HelixSource>
55
<HelixType>test/product/</HelixType>
66
<HelixBuild>$(BUILD_BUILDNUMBER)</HelixBuild>
77
<HelixBuild Condition="'$(HelixBuild)' == ''">123460.01</HelixBuild>
8-
<DotNetCliPackageType>sdk</DotNetCliPackageType>
9-
<DotNetCliVersion>8.0.100</DotNetCliVersion>
10-
<IncludeDotNetCli>true</IncludeDotNetCli>
118

9+
<!-- Read global.json so we know the version of the dotnet cli we need -->
10+
<GlobalJsonContent>$([System.IO.File]::ReadAllText('$(RepoRoot)global.json'))</GlobalJsonContent>
11+
<DotNetCliPackageType>sdk</DotNetCliPackageType>
12+
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F&lt;="dotnet": ").*(%3F=")'))</DotNetCliVersion>
13+
14+
<IncludeDotNetCli>true</IncludeDotNetCli>
1215
<EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
1316
<TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
14-
1517
<EnableXUnitReporter>true</EnableXUnitReporter>
1618
</PropertyGroup>
17-
19+
20+
<Target Name="InstallDotNet">
21+
<ItemGroup>
22+
<AdditionalDotNetPackage Include="8.0.8">
23+
<PackageType>aspnetcore-runtime</PackageType>
24+
<Channel>Current</Channel>
25+
</AdditionalDotNetPackage>
26+
</ItemGroup>
27+
</Target>
28+
29+
<Target Name="BuildProjects">
30+
<MSBuild Targets="Restore;Publish" Projects="..\src\System.Private.ServiceModel\tools\SelfHostedCoreWcfService\SelfHostedCoreWCFService.csproj"/>
31+
</Target>
32+
1833
<ItemGroup>
1934
<XUnitProject Include="..\src\System.Private.ServiceModel\tests\Scenarios\**\*.IntegrationTests.csproj">
2035
<TargetFramework>$(XUnitPublishTargetFramework)</TargetFramework>
@@ -53,19 +68,46 @@
5368
<Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
5469
<Creator Condition=" '$(Creator)' == ''">anon</Creator>
5570
</PropertyGroup>
56-
57-
<PropertyGroup Condition="!$(HelixTargetQueue.StartsWith('Windows'))">
71+
72+
<PropertyGroup>
73+
<RunWithCoreWCFService Condition="'$(RunWithCoreWCFService)' == ''">false</RunWithCoreWCFService>
74+
</PropertyGroup>
75+
76+
<PropertyGroup Condition="'$(TestJob)' != 'Windows'" >
5877
<HelixPreCommands>$(HelixPreCommands);chmod a+x $HELIX_CORRELATION_PAYLOAD/InstallRootCertificate.sh</HelixPreCommands>
5978
<HelixPreCommands>$(HelixPreCommands);sudo -E -n $HELIX_CORRELATION_PAYLOAD/InstallRootCertificate.sh --service-host $(ServiceHost) --cert-file /tmp/wcfrootca.crt</HelixPreCommands>
6079
</PropertyGroup>
6180

62-
<Target Name="Pack"/>
81+
<PropertyGroup Condition="'$(TestJob)' == 'Windows' AND '$(RunWithCoreWCFService)' == 'true'">
82+
<HelixPreCommands>$(HelixPreCommands);set PATH=%HELIX_CORRELATION_PAYLOAD%\dotnet-cli%3B%PATH%</HelixPreCommands>
83+
<!-- %3B is an escaped ; -->
84+
<HelixPreCommands>$(HelixPreCommands);set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\dotnet-cli;set DOTNET_CLI_TELEMETRY_OPTOUT=1</HelixPreCommands>
85+
<HelixPreCommands>$(HelixPreCommands);set DOTNET_CLI_HOME=%HELIX_WORKITEM_ROOT%\.dotnet</HelixPreCommands>
86+
<HelixPreCommands>$(HelixPreCommands);set NUGET_PACKAGES=%HELIX_WORKITEM_ROOT%\.nuget</HelixPreCommands>
87+
<HelixPreCommands>$(HelixPreCommands);set ServiceUri=localhost</HelixPreCommands>
88+
<HelixPreCommands>$(HelixPreCommands);set RunWithCoreWCF=true</HelixPreCommands>
89+
<HelixPreCommands>$(HelixPreCommands);%HELIX_CORRELATION_PAYLOAD%\SelfHostedCoreWCFService\$(Configuration)\net8.0\SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>
90+
</PropertyGroup>
91+
92+
<PropertyGroup Condition="'$(TestJob)' != 'Windows' AND '$(RunWithCoreWCFService)' == 'true'">
93+
<HelixPreCommands>$(HelixPreCommands);export PATH=$HELIX_CORRELATION_PAYLOAD/dotnet-cli:$PATH</HelixPreCommands>
94+
<HelixPreCommands>$(HelixPreCommands);export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/dotnet-cli;export DOTNET_CLI_TELEMETRY_OPTOUT=1</HelixPreCommands>
95+
<HelixPreCommands>$(HelixPreCommands);export DOTNET_CLI_HOME=$HELIX_WORKITEM_ROOT/.dotnet</HelixPreCommands>
96+
<HelixPreCommands>$(HelixPreCommands);export NUGET_PACKAGES=$HELIX_WORKITEM_ROOT/.nuget</HelixPreCommands>
97+
<HelixPreCommands>$(HelixPreCommands);export ServiceUri=localhost</HelixPreCommands>
98+
<HelixPreCommands>$(HelixPreCommands);export RunWithCoreWCF=true</HelixPreCommands>
99+
<HelixPreCommands>$(HelixPreCommands);dotnet exec --roll-forward Major $HELIX_CORRELATION_PAYLOAD/SelfHostedCoreWCFService/$(Configuration)/net8.0/SelfHostedCoreWCFService.dll bootstrap:true</HelixPreCommands>
100+
</PropertyGroup>
63101

64102
<ItemGroup>
65103
<!-- Directory that is zipped up and sent as a correlation payload to Helix -->
66104
<HelixCorrelationPayload Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.Private.ServiceModel\tools\scripts'))" >
67105
<PayloadDirectory>%(Identity)</PayloadDirectory>
68106
</HelixCorrelationPayload>
107+
108+
<HelixCorrelationPayload Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\artifacts\bin\SelfHostedCoreWCFService'))" >
109+
<Destination>SelfHostedCoreWCFService</Destination>
110+
</HelixCorrelationPayload>
69111
</ItemGroup>
70112

71113
<PropertyGroup>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24626.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25304.5">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
9+
<Sha>d3a9e0bf843815be1a2b30895e2060ef73735772</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24626.1">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25304.5">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
13+
<Sha>d3a9e0bf843815be1a2b30895e2060ef73735772</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24626.1">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25304.5">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
17+
<Sha>d3a9e0bf843815be1a2b30895e2060ef73735772</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24626.1">
19+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25304.5">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
21+
<Sha>d3a9e0bf843815be1a2b30895e2060ef73735772</Sha>
2222
</Dependency>
2323
</ToolsetDependencies>
2424
</Dependencies>

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121
<!-- Arcade dependencies -->
2222
<PropertyGroup>
23-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetGenFacadesPackageVersion>
24-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
25-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetGenAPIPackageVersion>
23+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25304.5</MicrosoftDotNetGenFacadesPackageVersion>
24+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25304.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
25+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25304.5</MicrosoftDotNetGenAPIPackageVersion>
2626
</PropertyGroup>
2727
<!-- Additional dependencies -->
2828
<PropertyGroup>
@@ -81,8 +81,8 @@
8181
<SystemFormatsAsn1PackageVersion>8.0.1</SystemFormatsAsn1PackageVersion>
8282
<SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
8383
<SystemTextEncodingsWebPackageVersion>8.0.0</SystemTextEncodingsWebPackageVersion>
84-
<CoreWCFPrimitivesPackageVersion>1.6.0</CoreWCFPrimitivesPackageVersion>
85-
<CoreWCFUnixDomainSocketPackageVersion>1.6.0</CoreWCFUnixDomainSocketPackageVersion>
86-
<CoreWCFNetFramingBasePackageVersion>1.6.0</CoreWCFNetFramingBasePackageVersion>
84+
<CoreWCFPrimitivesPackageVersion>1.7.0</CoreWCFPrimitivesPackageVersion>
85+
<CoreWCFUnixDomainSocketPackageVersion>1.7.0</CoreWCFUnixDomainSocketPackageVersion>
86+
<CoreWCFNetFramingBasePackageVersion>1.7.0</CoreWCFNetFramingBasePackageVersion>
8787
</PropertyGroup>
8888
</Project>

‎eng/common/CIBuild.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"

‎eng/common/build.ps1

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10+
[switch] $buildCheck = $false,
1011
[switch][Alias('r')]$restore,
1112
[switch] $deployDeps,
1213
[switch][Alias('b')]$build,
@@ -20,6 +21,7 @@ Param(
2021
[switch] $publish,
2122
[switch] $clean,
2223
[switch][Alias('pb')]$productBuild,
24+
[switch]$fromVMR,
2325
[switch][Alias('bl')]$binaryLog,
2426
[switch][Alias('nobl')]$excludeCIBinarylog,
2527
[switch] $ci,
@@ -71,6 +73,9 @@ function Print-Usage() {
7173
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7274
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7375
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
76+
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
77+
Write-Host " -buildCheck Sets /check msbuild parameter"
78+
Write-Host " -fromVMR Set when building from within the VMR"
7479
Write-Host ""
7580

7681
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +102,7 @@ function Build {
97102

98103
$bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
99104
$platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
105+
$check = if ($buildCheck) { '/check' } else { '' }
100106

101107
if ($projects) {
102108
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +119,7 @@ function Build {
113119
MSBuild $toolsetBuildProj `
114120
$bl `
115121
$platformArg `
122+
$check `
116123
/p:Configuration=$configuration `
117124
/p:RepoRoot=$RepoRoot `
118125
/p:Restore=$restore `
@@ -122,11 +129,13 @@ function Build {
122129
/p:Deploy=$deploy `
123130
/p:Test=$test `
124131
/p:Pack=$pack `
125-
/p:DotNetBuildRepo=$productBuild `
132+
/p:DotNetBuild=$productBuild `
133+
/p:DotNetBuildFromVMR=$fromVMR `
126134
/p:IntegrationTest=$integrationTest `
127135
/p:PerformanceTest=$performanceTest `
128136
/p:Sign=$sign `
129137
/p:Publish=$publish `
138+
/p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
130139
@properties
131140
}
132141

‎eng/common/build.sh

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ usage()
4242
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
45+
echo " --buildCheck <value> Sets /check msbuild parameter"
46+
echo " --fromVMR Set when building from within the VMR"
4547
echo ""
4648
echo "Command line arguments not listed above are passed thru to msbuild."
4749
echo "Arguments can also be passed in with a single hyphen."
@@ -63,6 +65,7 @@ restore=false
6365
build=false
6466
source_build=false
6567
product_build=false
68+
from_vmr=false
6669
rebuild=false
6770
test=false
6871
integration_test=false
@@ -76,6 +79,7 @@ clean=false
7679

7780
warn_as_error=true
7881
node_reuse=true
82+
build_check=false
7983
binary_log=false
8084
exclude_ci_binary_log=false
8185
pipelines_log=false
@@ -87,7 +91,7 @@ verbosity='minimal'
8791
runtime_source_feed=''
8892
runtime_source_feed_key=''
8993

90-
properties=''
94+
properties=()
9195
while [[ $# > 0 ]]; do
9296
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9397
case "$opt" in
@@ -127,19 +131,22 @@ while [[ $# > 0 ]]; do
127131
-pack)
128132
pack=true
129133
;;
130-
-sourcebuild|-sb)
134+
-sourcebuild|-source-build|-sb)
131135
build=true
132136
source_build=true
133137
product_build=true
134138
restore=true
135139
pack=true
136140
;;
137-
-productBuild|-pb)
141+
-productbuild|-product-build|-pb)
138142
build=true
139143
product_build=true
140144
restore=true
141145
pack=true
142146
;;
147+
-fromvmr|-from-vmr)
148+
from_vmr=true
149+
;;
143150
-test|-t)
144151
test=true
145152
;;
@@ -173,6 +180,9 @@ while [[ $# > 0 ]]; do
173180
node_reuse=$2
174181
shift
175182
;;
183+
-buildcheck)
184+
build_check=true
185+
;;
176186
-runtimesourcefeed)
177187
runtime_source_feed=$2
178188
shift
@@ -182,7 +192,7 @@ while [[ $# > 0 ]]; do
182192
shift
183193
;;
184194
*)
185-
properties="$properties $1"
195+
properties+=("$1")
186196
;;
187197
esac
188198

@@ -216,30 +226,38 @@ function Build {
216226
InitializeCustomToolset
217227

218228
if [[ ! -z "$projects" ]]; then
219-
properties="$properties /p:Projects=$projects"
229+
properties+=("/p:Projects=$projects")
220230
fi
221231

222232
local bl=""
223233
if [[ "$binary_log" == true ]]; then
224234
bl="/bl:\"$log_dir/Build.binlog\""
225235
fi
226236

237+
local check=""
238+
if [[ "$build_check" == true ]]; then
239+
check="/check"
240+
fi
241+
227242
MSBuild $_InitializeToolset \
228243
$bl \
244+
$check \
229245
/p:Configuration=$configuration \
230246
/p:RepoRoot="$repo_root" \
231247
/p:Restore=$restore \
232248
/p:Build=$build \
233-
/p:DotNetBuildRepo=$product_build \
249+
/p:DotNetBuild=$product_build \
234250
/p:DotNetBuildSourceOnly=$source_build \
251+
/p:DotNetBuildFromVMR=$from_vmr \
235252
/p:Rebuild=$rebuild \
236253
/p:Test=$test \
237254
/p:Pack=$pack \
238255
/p:IntegrationTest=$integration_test \
239256
/p:PerformanceTest=$performance_test \
240257
/p:Sign=$sign \
241258
/p:Publish=$publish \
242-
$properties
259+
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
260+
${properties[@]+"${properties[@]}"}
243261

244262
ExitWithExitCode 0
245263
}

‎eng/common/cibuild.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
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515

16-
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
16+
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@

0 commit comments

Comments
 (0)