Browse Source

[main] Source code updates from dotnet/dotnet (#629)

* Update dependencies from https://github.com/dotnet/dotnet build 268047

* Update dependencies from https://github.com/dotnet/dotnet build 268099
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25263.104 -> 10.0.0-beta.25260.104)

* [VMR] Codeflow 362a422-ad85650

[[ commit created by automation ]]

* Update dependencies from https://github.com/dotnet/dotnet build 268384
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25263.108 -> 10.0.0-beta.25260.104)

* Update dependencies from https://github.com/dotnet/dotnet build 268651
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25265.101 -> 10.0.0-beta.25260.104)

* Update dependencies from https://github.com/dotnet/dotnet build 268722
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25266.103 -> 10.0.0-beta.25260.104)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
main
dotnet-maestro[bot] 2 weeks ago
committed by GitHub
parent
commit
7c4241a489
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      Directory.Build.props
  2. 6
      eng/Version.Details.xml
  3. 2
      eng/common/build.ps1
  4. 6
      eng/common/build.sh
  5. 3
      eng/common/core-templates/steps/source-build.yml
  6. 2
      eng/common/darc-init.sh
  7. 4
      eng/common/tools.ps1
  8. 2
      eng/common/tools.sh
  9. 6
      global.json

1
Directory.Build.props

@ -6,6 +6,7 @@
<Copyright>$(CopyrightMicrosoft)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<LangVersion>latest</LangVersion>
<PublishWindowsPdb>false</PublishWindowsPdb>
</PropertyGroup>
<PropertyGroup>

6
eng/Version.Details.xml

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="xdt" Sha="85778473549347b3e4bad3ea009e9438df7b11bb" BarId="267776" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="xdt" Sha="170498a9429a5553fe7ac0ec2341d19bbb97cbe8" BarId="268722" />
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25260.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

2
eng/common/build.ps1

@ -127,7 +127,7 @@ function Build {
/p:Deploy=$deploy `
/p:Test=$test `
/p:Pack=$pack `
/p:DotNetBuildRepo=$productBuild `
/p:DotNetBuild=$productBuild `
/p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest `
/p:Sign=$sign `

6
eng/common/build.sh

@ -129,14 +129,14 @@ while [[ $# > 0 ]]; do
-pack)
pack=true
;;
-sourcebuild|-sb)
-sourcebuild|-source-build|-sb)
build=true
source_build=true
product_build=true
restore=true
pack=true
;;
-productBuild|-pb)
-productbuild|-product-build|-pb)
build=true
product_build=true
restore=true
@ -241,7 +241,7 @@ function Build {
/p:RepoRoot="$repo_root" \
/p:Restore=$restore \
/p:Build=$build \
/p:DotNetBuildRepo=$product_build \
/p:DotNetBuild=$product_build \
/p:DotNetBuildSourceOnly=$source_build \
/p:Rebuild=$rebuild \
/p:Test=$test \

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

@ -51,13 +51,12 @@ steps:
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
--restore --build --pack -bl \
--source-build \
${{ parameters.platform.buildArguments }} \
$internalRuntimeDownloadArgs \
$targetRidArgs \
$baseRidArgs \
$portableBuildArgs \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \
displayName: Build
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml

2
eng/common/darc-init.sh

@ -68,7 +68,7 @@ function InstallDarcCli {
fi
fi
local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
echo "Installing Darc CLI version $darcVersion..."
echo "You may need to restart your command shell if this is the first dotnet tool you have installed."

4
eng/common/tools.ps1

@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
# True if the build is a product build
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
function Create-Directory ([string[]] $path) {
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
}
@ -853,7 +851,7 @@ function MSBuild-Core() {
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
# Skip this when the build is a child of the VMR orchestrator build.
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) {
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

2
eng/common/tools.sh

@ -507,7 +507,7 @@ function MSBuild-Core {
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
# Skip this when the build is a child of the VMR orchestrator build.
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

6
global.json

@ -1,12 +1,12 @@
{
"tools": {
"dotnet": "10.0.100-preview.3.25201.16"
"dotnet": "10.0.100-preview.5.25265.106"
},
"sdk": {
"version": "10.0.100-preview.3.25201.16",
"version": "10.0.100-preview.5.25265.106",
"allowPrerelease": true
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25267.102"
}
}
Loading…
Cancel
Save