Skip to content
Closed
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
5 changes: 1 addition & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-android -->
<add key="darc-pub-dotnet-android-9f89a27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-9f89a27a/nuget/v3/index.json" />
<add key="darc-pub-dotnet-android-5649411-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-56494117-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-android-6b255ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-6b255ec4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-android-1361e50" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-1361e505/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-android -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-6542b70" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-6542b70a/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-5797627" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-57976277/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-macios -->
<!-- Begin: Package sources from dotnet-maui -->
<!-- End: Package sources from dotnet-maui -->
Expand Down
14 changes: 1 addition & 13 deletions docs/benchmarkdotnet.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
- [Running In Process](#running-in-process)
- [CoreRun](#corerun)
- [dotnet cli](#dotnet-cli)
- [Private CLR Build](#private-clr-build)

Check failure on line 30 in docs/benchmarkdotnet.md

View workflow job for this annotation

GitHub Actions / lint

Link fragments should be valid [Context: "[Private CLR Build](#private-clr-build)"]
- [Private CoreRT Build](#private-corert-build)

## Main Concepts
Expand Down Expand Up @@ -289,7 +289,7 @@

The `--runtimes` or just `-r` allows you to run the benchmarks for **multiple Runtimes**.

Available options are: Mono, wasmnet70, CoreRT, net462, net47, net471, net472, netcoreapp3.1, net6.0, net7.0, net8.0, and net9.0.
Available options are: Mono, wasmnet70, CoreRT, netcoreapp3.1, net6.0, net7.0, net8.0, and net9.0.

Example: run the benchmarks for .NET 7.0 and 8.0:

Expand Down Expand Up @@ -361,18 +361,6 @@

This is very useful when you want to compare different builds of .NET.

### Private CLR Build

It's possible to benchmark a private build of .NET Runtime. You just need to pass the value of `COMPLUS_Version` to BenchmarkDotNet. You can do that by either using `--clrVersion $theVersion` as an argument or `Job.ShortRun.With(new ClrRuntime(version: "$theVersion"))` in the code.

So if you made a change in CLR and want to measure the difference, you can run the benchmarks with:

```cmd
dotnet run -c Release -f net48 -- --clrVersion $theVersion
```

More info can be found in [BenchmarkDotNet issue #706](https://github.com/dotnet/BenchmarkDotNet/issues/706).

### Private CoreRT Build

To run benchmarks with private CoreRT build you need to provide the `IlcPath`. Example:
Expand Down
44 changes: 22 additions & 22 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.4.26210.111">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.4.26210.111">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="System.Threading.Channels" Version="11.0.0-preview.4.26210.111">
<Dependency Name="System.Threading.Channels" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.4.26210.111">
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="11.0.0-preview.4.26210.111">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Node.win-x64" Version="11.0.0-preview.4.26210.111">
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Node.win-x64" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26210.111">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26210.111">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.26204.1">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand All @@ -55,17 +55,17 @@
<Sha>6e563dcf3cbf4853316eb4724e49ec92caeabb07</Sha>
<Uri>https://github.com/dotnet/maui</Uri>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.4.26210.111">
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.5.26261.101">
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
<Uri>https://github.com/dotnet/dotnet</Uri>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.4.26210.111">
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26261.101">
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
<Uri>https://github.com/dotnet/dotnet</Uri>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="36.1.55">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="36.1.65">
<Uri>https://github.com/dotnet/android</Uri>
<Sha>9f89a27a70ce6828cffc2e66c967dd047b98656a</Sha>
<Sha>6b255ec42cef9f9f757400f6edec7af239cacd58</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.1">
<Sha>4c9d1b112c16716c2479e054e9ad4db8b5b8c70c</Sha>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
</PropertyGroup>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETILLinkTasksVersion>11.0.0-preview.4.26210.111</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.4.26210.111</MicrosoftNETILLinkPackageVersion>
<SystemThreadingChannelsPackageVersion>11.0.0-preview.4.26210.111</SystemThreadingChannelsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.4.26210.111</MicrosoftExtensionsLoggingPackageVersion>
<BenchmarkDotNetVersion>0.16.0-nightly.20260320.467</BenchmarkDotNetVersion>
<MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>11.0.0-preview.4.26210.111</MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>
<MicrosoftNETILLinkTasksVersion>11.0.0-preview.5.26261.101</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.5.26261.101</MicrosoftNETILLinkPackageVersion>
<SystemThreadingChannelsPackageVersion>11.0.0-preview.5.26261.101</SystemThreadingChannelsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.5.26261.101</MicrosoftExtensionsLoggingPackageVersion>
<BenchmarkDotNetVersion>0.16.0-nightly.20260518.1249</BenchmarkDotNetVersion>
<MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>11.0.0-preview.5.26261.101</MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>
<MicrosoftDotNetXHarnessCLIVersion>11.0.0-prerelease.26204.1</MicrosoftDotNetXHarnessCLIVersion>
</PropertyGroup>
<!--Package names-->
Expand Down
5 changes: 5 additions & 0 deletions eng/common/AGENTS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# `eng/common`

Files under `eng/common` come from [Arcade](https://github.com/dotnet/arcade).
Edits in `eng/common` will be overwritten by automation unless the changes are made directly in the Arcade repository.
For more information, see the [Arcade documentation](https://github.com/dotnet/arcade/tree/main/Documentation).
5 changes: 1 addition & 4 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ parameters:
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishing: false
enableBuildRetry: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
name: ''
componentGovernanceSteps: []
preSteps: []
artifactPublishSteps: []
runAsPublic: false
Expand Down Expand Up @@ -152,9 +152,6 @@ jobs:
- ${{ each step in parameters.steps }}:
- ${{ step }}

- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
parameters:
Expand Down
3 changes: 3 additions & 0 deletions eng/common/core-templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ parameters:
GitHubOrg: dotnet
MirrorRepo: ''
MirrorBranch: main
xLocCustomPowerShellScript: ''
condition: ''
JobNameSuffix: ''
is1ESPipeline: ''
Expand Down Expand Up @@ -97,6 +98,8 @@ jobs:
gitHubOrganization: ${{ parameters.GitHubOrg }}
mirrorRepo: ${{ parameters.MirrorRepo }}
mirrorBranch: ${{ parameters.MirrorBranch }}
${{ if ne(parameters.xLocCustomPowerShellScript, '') }}:
xLocCustomPowerShellScript: ${{ parameters.xLocCustomPowerShellScript }}
condition: ${{ parameters.condition }}

# Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
Expand Down
12 changes: 7 additions & 5 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,18 @@ jobs:
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
artifactName: AssetManifests
displayName: 'Publish Merged Manifest'
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
retryCountOnTaskFailure: 10 # for any files being locked
isProduction: false # just metadata for publishing

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish ReleaseConfigs Artifact
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
publishLocation: Container
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
artifactName: ReleaseConfigs
retryCountOnTaskFailure: 10 # for any files being locked
isProduction: false # just metadata for publishing

- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
Expand Down Expand Up @@ -218,4 +219,5 @@ jobs:
- template: /eng/common/core-templates/steps/publish-logs.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
StageLabel: 'BuildAssetRegistry'
JobLabel: 'Publish_Artifacts_Logs'
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
condition: succeededOrFailed()
targetPath: $(Build.ArtifactStagingDirectory)
artifactName: $(Agent.JobName)_Logs_Attempt$(System.JobAttempt)
sbomEnabled: false
isProduction: false # logs are non-production artifacts

steps:
- checkout: self
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/jobs/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ parameters:

artifacts: {}
is1ESPipeline: ''

# Publishing version w/default.
publishingVersion: 3

repositoryAlias: self
officialBuildId: ''

Expand Down Expand Up @@ -102,6 +106,7 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
continueOnError: ${{ parameters.continueOnError }}
publishingVersion: ${{ parameters.publishingVersion }}
dependsOn:
- ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
- ${{ each job in parameters.publishBuildAssetsDependsOn }}:
Expand Down
2 changes: 0 additions & 2 deletions eng/common/core-templates/post-build/common-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ variables:
- name: MaestroApiVersion
value: "2020-02-20"

- name: SourceLinkCLIVersion
value: 3.0.0
- name: SymbolToolVersion
value: 1.0.1
- name: BinlogToolVersion
Expand Down
Loading
Loading