Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
83dba30
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 4, 2025
80356ff
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 4, 2025
bec1cf9
Merge branch 'net10.0' into darc-net10.0-3e2d6574-3e2e-4233-aab9-99cf…
dalexsoto Sep 5, 2025
ccaf3fb
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 6, 2025
a7bb7c4
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 6, 2025
790fe9b
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 7, 2025
def976e
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 7, 2025
c547449
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 8, 2025
e583c4f
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 8, 2025
ba2508f
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 9, 2025
2a26b46
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 9, 2025
4a8ff71
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 10, 2025
c572635
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 10, 2025
2ebcebf
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 11, 2025
e573e54
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 11, 2025
2f9e9c3
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 13, 2025
c578acb
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 13, 2025
1baa682
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 14, 2025
e236717
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 14, 2025
f6363cc
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Sep 16, 2025
c1e7bf3
Re-generate global.json for PR #23751: [net10.0] Update dependencies …
Sep 16, 2025
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
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<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>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25457.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25457.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25457.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25457.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rc.2.25457.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-rc.2.25457.102</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-rc.2.25457.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25457.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25457.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-rc.2.25457.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.10770-ci.xcode26-0-net10-0</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
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.1.25427.104">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.2.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rc.2.25427.104">
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rc.2.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.2.25427.104">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.2.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</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.25427.104">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25427.104">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</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.9227">
Expand Down Expand Up @@ -89,31 +89,31 @@
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>45f6d652d5dda6309b14a5a3641e73b688bb5adc</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rc.2.25427.104">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rc.2.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25427.104">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25427.104">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-rc.2.25427.104">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-rc.2.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25427.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>dbb478b6aafa222529ae95be344a1b91485c4adf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25427.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25457.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
<Sha>8ea69c337be69385ff7eb44b2a54db78010110d8</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
4 changes: 0 additions & 4 deletions eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ parameters:
# container and pool.
platform: {}

# Optional list of directories to ignore for component governance scans.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: ''

# If set to true and running on a non-public project,
Expand Down Expand Up @@ -97,4 +94,3 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
platform: ${{ parameters.platform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5 changes: 0 additions & 5 deletions eng/common/core-templates/jobs/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ parameters:
# one job runs on 'defaultManagedPlatform'.
platforms: []

# Optional list of directories to ignore for component governance scans.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: ''

# If set to true and running on a non-public project,
Expand All @@ -34,7 +31,6 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ platform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}

- ${{ if eq(length(parameters.platforms), 0) }}:
Expand All @@ -43,5 +39,4 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ parameters.defaultManagedPlatform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
18 changes: 0 additions & 18 deletions eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ parameters:
# for details. The entire object is described in the 'job' template for simplicity, even though
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
platform: {}

# Optional list of directories to ignore for component governance scans.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: false

steps:
Expand Down Expand Up @@ -67,17 +63,3 @@ steps:
continueOnError: true
condition: succeededOrFailed()
sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
- template: /eng/common/core-templates/steps/component-governance.yml
parameters:
displayName: Component Detection (Exclude upstream cache)
is1ESPipeline: ${{ parameters.is1ESPipeline }}
${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}:
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
${{ else }}:
componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }}
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}
2 changes: 1 addition & 1 deletion eng/common/sdk-task.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ show_usage() {

echo "Advanced settings:"
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
echo " --noWarnAsError Do not warn as error
echo " --noWarnAsError Do not warn as error"
echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
}
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.1.25427.104",
"version": "10.0.100-rc.2.25457.102",
"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.1.25427.104"
"dotnet": "10.0.100-rc.2.25457.102"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25457.102"
}
}
Loading