Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 10 additions & 11 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is auto-generated by the Maestro dependency flow system.
Do not edit it manually, as it will get overwritten by automation.
Expand All @@ -7,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25420.109</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25420.109</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25420.109</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25420.109</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rc.2.25420.109</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-rc.2.25420.109</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-rc.2.25420.109</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25420.109</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25420.109</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-rc.2.25420.109</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25427.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25427.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25427.104</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25427.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rc.2.25427.104</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-rc.2.25427.104</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-rc.2.25427.104</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rc.1.25427.104</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25427.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-rc.2.25427.104</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9219</MicrosoftiOSSdknet90_185PackageVersion>
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9500-xcode26.0</MicrosoftiOSSdknet90_260PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.2.25420.109">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.1.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rc.2.25420.109">
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rc.2.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.2.25420.109">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.2.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25420.109">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25420.109">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9219">
Expand Down Expand Up @@ -72,31 +72,31 @@
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>904bc14f638857853863a9280925a1a8f423e8a1</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rc.2.25420.109">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rc.2.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25420.109">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25420.109">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-rc.2.25420.109">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-rc.2.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25412.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>fe850ca677efa9ed62009b929f55ff59d5e24c0e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25420.109">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25427.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/source-index-stage1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ jobs:

- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
parameters:
binLogPath: ${{ parameters.binLogPath }}
binLogPath: ${{ parameters.binLogPath }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
sourceIndexUploadPackageVersion: 2.0.0-20250818.1
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
binlogPath: artifacts/log/Debug/Build.binlog

Expand Down
3 changes: 2 additions & 1 deletion eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ Param(
[switch] $restore,
[switch] $prepareMachine,
[switch][Alias('nobl')]$excludeCIBinaryLog,
[switch]$noWarnAsError,
[switch] $help,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)

$ci = $true
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
$warnAsError = $true
$warnAsError = if ($noWarnAsError) { $false } else { $true }

. $PSScriptRoot\tools.ps1

Expand Down
7 changes: 6 additions & 1 deletion eng/common/sdk-task.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ show_usage() {

echo "Advanced settings:"
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
echo " --noWarnAsError Do not warn as error
echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
}
Expand Down Expand Up @@ -52,6 +53,7 @@ exclude_ci_binary_log=false
restore=false
help=false
properties=''
warnAsError=true

while (($# > 0)); do
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
Expand All @@ -73,6 +75,10 @@ while (($# > 0)); do
exclude_ci_binary_log=true
shift 1
;;
--noWarnAsError)
warnAsError=false
shift 1
;;
--help)
help=true
shift 1
Expand All @@ -85,7 +91,6 @@ while (($# > 0)); do
done

ci=true
warnAsError=true

if $help; then
show_usage
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){

if (!(Test-Path $vsWhereExe)) {
Create-Directory $vsWhereDir
Write-Host 'Downloading vswhere $vswhereVersion'
Write-Host "Downloading vswhere $vswhereVersion"
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
Retry({
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "10.0.100-rc.2.25420.109",
"version": "10.0.100-rc.1.25427.104",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "10.0.100-rc.2.25420.109"
"dotnet": "10.0.100-rc.1.25427.104"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104"
}
}
Loading