Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
2245892
Change product TFM from net10.0 to net11.0 for .NET 11 scouting
T-Gro Feb 12, 2026
975dacf
[feature/net11-scouting] Update dependencies from dotnet/arcade (#19295)
dotnet-maestro[bot] Feb 25, 2026
b46ffa3
Merge branch 'main' into feature/net11-scouting
T-Gro Feb 25, 2026
03fb573
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Mar 2, 2026
f52adae
[automated] Merge branch 'main' => 'feature/net11-scouting' (#19376)
github-actions[bot] Mar 6, 2026
053869a
Reset files to feature/net11-scouting
github-actions[bot] Mar 6, 2026
55edff4
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Mar 10, 2026
27d8a90
Merge main and resolve conflicts
T-Gro Mar 10, 2026
932d6e1
Merge remote-tracking branch 'origin/feature/net11-scouting' into mer…
T-Gro Mar 10, 2026
d57cf0c
Merge remote-tracking branch 'origin/main' into merge/main-to-feature…
T-Gro Mar 10, 2026
442cc53
Fix duplicate PackageReference from merge (RoslynForTestingButNotForV…
T-Gro Mar 10, 2026
e70a74b
Merge pull request #19399 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Mar 10, 2026
087b67f
Reset files to feature/net11-scouting
github-actions[bot] Mar 10, 2026
6e860f5
Merge pull request #19416 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Mar 10, 2026
6ac62b1
Reset files to feature/net11-scouting
github-actions[bot] Mar 10, 2026
f54c924
Merge main into feature/net11-scouting: resolve version conflicts
T-Gro Mar 11, 2026
3fedb6c
Merge feature/net11-scouting into merge branch
T-Gro Mar 13, 2026
d4462ec
Merge main into feature/net11-scouting: resolve version conflicts
T-Gro Mar 13, 2026
e3cb9e6
Merge main into feature/net11-scouting: resolve Arcade SDK version co…
T-Gro Mar 13, 2026
e5c3c2b
Merge remote-tracking branch 'origin/main' into feature/net11-scouting
T-Gro Mar 13, 2026
75e3a0d
Merge remote-tracking branch 'origin/main' into merge/main-to-feature…
T-Gro Mar 13, 2026
cd25d9c
Merge remote-tracking branch 'origin/main' into feature/net11-scouting
T-Gro Mar 13, 2026
ea1b216
Remove accidentally committed .copilot-pid file
T-Gro Mar 13, 2026
965c647
Retry CI: Linux job was abandoned (agent lost contact)
T-Gro Mar 16, 2026
6c088dc
Merge main into feature/net11-scouting: resolve version conflicts
T-Gro Mar 17, 2026
67eaf5d
Merge main: resolve Arcade/MSBuild/Roslyn version conflicts
T-Gro Mar 17, 2026
bef6ded
Merge feature/net11-scouting into merge branch
T-Gro Mar 17, 2026
a0f5650
Merge main into merge/main-to-feature/net11-scouting
T-Gro Mar 17, 2026
2df5755
[feature/net11-scouting] Update dependencies from dotnet/arcade (#19433)
dotnet-maestro[bot] Mar 23, 2026
ff2c061
Merge pull request #19419 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Mar 23, 2026
32070d4
Merge remote-tracking branch 'origin/main' into feature/net11-scouting
T-Gro Mar 23, 2026
3b76e8a
Merge origin/main into feature/net11-scouting
T-Gro Mar 24, 2026
7c435ab
[automated] Merge branch 'main' => 'feature/net11-scouting' (#19458)
github-actions[bot] Mar 24, 2026
ea8c230
Reset files to feature/net11-scouting
github-actions[bot] Mar 24, 2026
5604cf0
Merge pull request #19491 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Mar 30, 2026
4676438
Merge origin/main: resolve conflicts, keep net11 dependency versions
T-Gro Mar 31, 2026
30c7093
Merge remote-tracking branch 'origin/main' into merge/main-to-feature…
T-Gro Apr 3, 2026
1bbb9e3
Merge pull request #19517 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Apr 9, 2026
e1ac42f
Reset files to feature/net11-scouting
github-actions[bot] Apr 9, 2026
5aeb645
[feature/net11-scouting] Update dependencies from dotnet/arcade (#19514)
dotnet-maestro[bot] Apr 10, 2026
0ce85ce
Merge origin/main into feature/net11-scouting
T-Gro Apr 10, 2026
8573f50
Fix CI: restore FSBuildVersion=101 and PreReleaseIteration=4 from fea…
T-Gro Apr 10, 2026
ff68e5d
Fix CI: restore .NET 11 SDK after merge from main
T-Gro Apr 10, 2026
9db7cdd
Merge feature/net11-scouting: resolve dependency version conflicts
T-Gro Apr 13, 2026
f74ded4
Merge remote-tracking branch 'origin/main' into merge/main-to-feature…
T-Gro Apr 13, 2026
5a3bd7d
[feature/net11-scouting] Update dependencies from dotnet/arcade (#19575)
dotnet-maestro[bot] Apr 14, 2026
9b3cf57
Merge pull request #19561 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Apr 14, 2026
773b8cc
Reset files to feature/net11-scouting
github-actions[bot] Apr 14, 2026
4251d54
Merge pull request #19582 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Apr 15, 2026
aa96b15
Reset files to feature/net11-scouting
github-actions[bot] Apr 15, 2026
6156944
Merge pull request #19589 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Apr 16, 2026
d00bdfd
Reset files to feature/net11-scouting
github-actions[bot] Apr 16, 2026
30c6b9f
Merge pull request #19601 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Apr 19, 2026
49abee6
Reset files to feature/net11-scouting
github-actions[bot] Apr 19, 2026
cd47523
Merge pull request #19616 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Apr 20, 2026
73ed8a5
Reset files to feature/net11-scouting
github-actions[bot] Apr 20, 2026
ed695e2
Merge pull request #19618 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Apr 21, 2026
8b65bab
Reset files to feature/net11-scouting
github-actions[bot] Apr 21, 2026
0baa2b5
Merge pull request #19623 from dotnet/merge/main-to-feature/net11-sco…
T-Gro Apr 22, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/TargetFrameworks.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<PropertyGroup>
<!-- Default target framework for F# products - only set if not already provided -->
<FSharpNetCoreProductTargetFramework Condition="'$(FSharpNetCoreProductTargetFramework)' == ''">net10.0</FSharpNetCoreProductTargetFramework>
<FSharpNetCoreProductTargetFramework Condition="'$(FSharpNetCoreProductTargetFramework)' == ''">net11.0</FSharpNetCoreProductTargetFramework>

<!-- Derive major version by stripping 'net' prefix and '.0' suffix (e.g., net10.0 -> 10) -->
<FSharpNetCoreProductMajorVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(FSharpNetCoreProductTargetFramework)', '^net(\d+)\.0$', '$1'))</FSharpNetCoreProductMajorVersion>
Expand Down
18 changes: 9 additions & 9 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26220.5</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26211.1</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- dotnet-msbuild dependencies -->
<MicrosoftBuildPackageVersion>18.6.1</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.6.1</MicrosoftBuildFrameworkPackageVersion>
Expand All @@ -19,14 +19,14 @@ This file should be imported by eng/Versions.props
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26180.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26180.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
<!-- dotnet-roslyn dependencies -->
<MicrosoftCodeAnalysisPackageVersion>5.7.0-1.26220.12</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.7.0-1.26220.12</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.7.0-1.26220.12</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.7.0-1.26220.12</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.7.0-1.26220.12</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.7.0-1.26220.12</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.7.0-1.26220.12</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.7.0-1.26220.12</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.7.0-1.26210.5</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.7.0-1.26210.5</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.7.0-1.26210.5</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.7.0-1.26210.5</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.7.0-1.26210.5</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.7.0-1.26210.5</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.7.0-1.26210.5</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.7.0-1.26210.5</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!-- dotnet-runtime dependencies -->
<SystemCollectionsImmutablePackageVersion>10.0.2</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>10.0.2</SystemCompositionPackageVersion>
Expand Down
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,37 @@
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>e5ebe15655a6be2b2e3209464d0cde1b8825ab57</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.7.0-1.26220.12">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.7.0-1.26210.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5e5ee328113910b2d963ccb8870a810563778cae</Sha>
<Sha>0eca297f565449839436b91fe4aa180f9bcdedd2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.7.0-1.26220.12">
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.7.0-1.26210.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5e5ee328113910b2d963ccb8870a810563778cae</Sha>
<Sha>0eca297f565449839436b91fe4aa180f9bcdedd2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.7.0-1.26220.12">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.7.0-1.26210.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5e5ee328113910b2d963ccb8870a810563778cae</Sha>
<Sha>0eca297f565449839436b91fe4aa180f9bcdedd2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.7.0-1.26220.12">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.7.0-1.26210.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5e5ee328113910b2d963ccb8870a810563778cae</Sha>
<Sha>0eca297f565449839436b91fe4aa180f9bcdedd2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.7.0-1.26220.12">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.7.0-1.26210.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5e5ee328113910b2d963ccb8870a810563778cae</Sha>
<Sha>0eca297f565449839436b91fe4aa180f9bcdedd2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.7.0-1.26220.12">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.7.0-1.26210.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5e5ee328113910b2d963ccb8870a810563778cae</Sha>
<Sha>0eca297f565449839436b91fe4aa180f9bcdedd2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.7.0-1.26220.12">
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.7.0-1.26210.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5e5ee328113910b2d963ccb8870a810563778cae</Sha>
<Sha>0eca297f565449839436b91fe4aa180f9bcdedd2</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.7.0-1.26220.12">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.7.0-1.26210.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5e5ee328113910b2d963ccb8870a810563778cae</Sha>
<Sha>0eca297f565449839436b91fe4aa180f9bcdedd2</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Collections.Immutable" Version="10.0.2">
Expand Down Expand Up @@ -76,9 +76,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26220.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26211.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>54892fe0f027f2f08c59cf0802a2d7f488632e2f</Sha>
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26180.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
9 changes: 7 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,12 @@
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
<SystemMemoryVersion>4.6.3</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.2</SystemRuntimeCompilerServicesUnsafeVersion>
<!-- System.* packages from dotnet/runtime are managed in Version.Details.xml / Version.Details.props for source-build. -->
<!-- System.* packages from dotnet/runtime, aligned with MSBuild and Roslyn deps. -->
<SystemPackagesVersion>10.0.2</SystemPackagesVersion>
<SystemCollectionsImmutableVersion>$(SystemPackagesVersion)</SystemCollectionsImmutableVersion>
<SystemCompositionVersion>$(SystemPackagesVersion)</SystemCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackagesVersion)</SystemDiagnosticsDiagnosticSourceVersion>
<SystemReflectionMetadataVersion>$(SystemPackagesVersion)</SystemReflectionMetadataVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -156,7 +161,7 @@
<!-- Making diff way too large, update separately later. e.g. to 6.0.0-rtm.21518.12 and 9.0.0-rc.2.24462.10 or via darc -->
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
<MicrosoftTestPlatformVersion>17.14.1</MicrosoftTestPlatformVersion>
<MicrosoftTestPlatformVersion>18.0.1</MicrosoftTestPlatformVersion>
<MicrosoftTestingExtensionsHangDumpVersion>2.0.2</MicrosoftTestingExtensionsHangDumpVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<XunitVersion>3.2.2</XunitVersion>
Expand Down
17 changes: 2 additions & 15 deletions eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
Expand Down Expand Up @@ -174,16 +173,4 @@ foreach ($dotnetVersion in $dotnetVersions) {
}
}

# Check for dotnet-eng and add dotnet-eng-internal if present
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
if ($dotnetEngSource -ne $null) {
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
}

# Check for dotnet-tools and add dotnet-tools-internal if present
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
if ($dotnetToolsSource -ne $null) {
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
}

$doc.Save($filename)
17 changes: 2 additions & 15 deletions eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/usr/bin/env bash

# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
Expand Down Expand Up @@ -174,18 +173,6 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
fi
done

# Check for dotnet-eng and add dotnet-eng-internal if present
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
if [ "$?" == "0" ]; then
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
fi

# Check for dotnet-tools and add dotnet-tools-internal if present
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
if [ "$?" == "0" ]; then
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
fi

# I want things split line by line
PrevIFS=$IFS
IFS=$'\n'
Expand Down
2 changes: 2 additions & 0 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Param(
[string][Alias('v')]$verbosity = "minimal",
[string] $msbuildEngine = $null,
[bool] $warnAsError = $true,
[string] $warnNotAsError = '',
[bool] $nodeReuse = $true,
[switch] $buildCheck = $false,
[switch][Alias('r')]$restore,
Expand Down Expand Up @@ -70,6 +71,7 @@ function Print-Usage() {
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
Write-Host " -warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
Expand Down
8 changes: 7 additions & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ usage()
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
echo " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
echo " --buildCheck <value> Sets /check msbuild parameter"
echo " --fromVMR Set when building from within the VMR"
echo ""
Expand Down Expand Up @@ -78,6 +79,7 @@ ci=false
clean=false

warn_as_error=true
warn_not_as_error=''
node_reuse=true
build_check=false
binary_log=false
Expand All @@ -92,7 +94,7 @@ runtime_source_feed=''
runtime_source_feed_key=''

properties=()
while [[ $# > 0 ]]; do
while [[ $# -gt 0 ]]; do
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
case "$opt" in
-help|-h)
Expand Down Expand Up @@ -176,6 +178,10 @@ while [[ $# > 0 ]]; do
warn_as_error=$2
shift
;;
-warnnotaserror)
warn_not_as_error=$2
shift
;;
-nodereuse)
node_reuse=$2
shift
Expand Down
8 changes: 8 additions & 0 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ parameters:
# publishing defaults
artifacts: ''
enableMicrobuild: false
enablePreviewMicrobuild: false
microbuildPluginVersion: 'latest'
enableMicrobuildForMacAndLinux: false
microbuildUseESRP: true
enablePublishBuildArtifacts: false
Expand Down Expand Up @@ -71,6 +73,8 @@ jobs:
templateContext: ${{ parameters.templateContext }}

variables:
- name: AllowPtrToDetectTestRunRetryFiles
value: true
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
- name: DOTNET_CLI_TELEMETRY_PROFILE
value: '$(Build.Repository.Uri)'
Expand Down Expand Up @@ -128,6 +132,8 @@ jobs:
- template: /eng/common/core-templates/steps/install-microbuild.yml
parameters:
enableMicrobuild: ${{ parameters.enableMicrobuild }}
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
continueOnError: ${{ parameters.continueOnError }}
Expand All @@ -150,6 +156,8 @@ jobs:
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
parameters:
enableMicrobuild: ${{ parameters.enableMicrobuild }}
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
continueOnError: ${{ parameters.continueOnError }}

Expand Down
12 changes: 6 additions & 6 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ jobs:
fetchDepth: 3
clean: true

- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
- ${{ if eq(parameters.publishingVersion, 3) }}:
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
- ${{ if eq(parameters.publishingVersion, 3) }}:
- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
Expand All @@ -117,15 +117,15 @@ jobs:
flattenFolders: true
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- task: NuGetAuthenticate@1

# Populate internal runtime variables.
- template: /eng/common/templates/steps/enable-internal-sources.yml
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
parameters:
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)

- template: /eng/common/templates/steps/enable-internal-runtimes.yml

- task: AzureCLI@2
Expand All @@ -145,7 +145,7 @@ jobs:

condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- task: powershell@2
displayName: Create ReleaseConfigs Artifact
inputs:
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
is1ESPipeline: ${{ parameters.is1ESPipeline }}

# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
Expand Down
Loading
Loading