Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
6 changes: 6 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
"commands": [
"slngen"
]
},
"microsoft.dotnet.helix.jobmonitor": {
"version": "11.0.0-beta.26272.3",
"commands": [
"dotnet-helix-job-monitor"
]
}
}
}
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
<add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
<add key="dotnet-diagnostics-tests" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-diagnostics-tests/nuget/v3/index.json" />
<!-- TODO: Remove -->
<add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
Comment on lines +25 to +26
Comment on lines +25 to +26
Comment on lines +25 to +26
Comment on lines +25 to +26
Comment on lines +25 to +26
Comment on lines +25 to +26
Comment on lines +25 to +26
Comment on lines +25 to +26
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
48 changes: 43 additions & 5 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,29 @@ This file should be imported by eng/Versions.props
<SystemTextRegularExpressionsTestDataPackageVersion>11.0.0-beta.26276.1</SystemTextRegularExpressionsTestDataPackageVersion>
<SystemWindowsExtensionsTestDataPackageVersion>11.0.0-beta.26276.1</SystemWindowsExtensionsTestDataPackageVersion>
<!-- dotnet-xharness dependencies -->
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.26279.1</MicrosoftDotNetXHarnessCLIPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.26279.1</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>11.0.0-prerelease.26279.1</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.26204.1</MicrosoftDotNetXHarnessCLIPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.26204.1</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>11.0.0-prerelease.26204.1</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
Comment on lines +117 to +119
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksArchivesPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetBuildTasksArchivesPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
Comment on lines +120 to +124
<MicrosoftDotNetBuildTasksPackagingPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixJobMonitorPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetHelixJobMonitorPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetPackageTestingPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetPackageTestingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.26264.2</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>11.0.0-beta.26265.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
Comment on lines +120 to +139
Comment on lines +120 to +139
Comment on lines +120 to +139
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down Expand Up @@ -161,8 +181,26 @@ This file should be imported by eng/Versions.props
<SystemReflectionMetadataVersion>$(SystemReflectionMetadataPackageVersion)</SystemReflectionMetadataVersion>
<SystemReflectionMetadataLoadContextVersion>$(SystemReflectionMetadataLoadContextPackageVersion)</SystemReflectionMetadataLoadContextVersion>
<SystemTextJsonVersion>$(SystemTextJsonPackageVersion)</SystemTextJsonVersion>
<!-- dotnet-hotreload-utils dependencies -->
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>$(MicrosoftDotNetHotReloadUtilsGeneratorBuildToolPackageVersion)</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>$(MicrosoftDotNetBuildTasksArchivesPackageVersion)</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksFeedVersion>$(MicrosoftDotNetBuildTasksFeedPackageVersion)</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>$(MicrosoftDotNetBuildTasksInstallersPackageVersion)</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>$(MicrosoftDotNetBuildTasksPackagingPackageVersion)</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>$(MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion)</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsVersion>$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)</MicrosoftDotNetBuildTasksWorkloadsVersion>
<MicrosoftDotNetCodeAnalysisVersion>$(MicrosoftDotNetCodeAnalysisPackageVersion)</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>$(MicrosoftDotNetGenAPIPackageVersion)</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>$(MicrosoftDotNetGenFacadesPackageVersion)</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetHelixJobMonitorVersion>$(MicrosoftDotNetHelixJobMonitorPackageVersion)</MicrosoftDotNetHelixJobMonitorVersion>
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
Comment on lines +184 to +197
<MicrosoftDotNetPackageTestingVersion>$(MicrosoftDotNetPackageTestingPackageVersion)</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetRemoteExecutorVersion>$(MicrosoftDotNetRemoteExecutorPackageVersion)</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetSharedFrameworkSdkVersion>$(MicrosoftDotNetSharedFrameworkSdkPackageVersion)</MicrosoftDotNetSharedFrameworkSdkVersion>
<MicrosoftDotNetXliffTasksVersion>$(MicrosoftDotNetXliffTasksPackageVersion)</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>$(MicrosoftDotNetXUnitConsoleRunnerPackageVersion)</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetXUnitExtensionsVersion>$(MicrosoftDotNetXUnitExtensionsPackageVersion)</MicrosoftDotNetXUnitExtensionsVersion>
<!-- dotnet-icu dependencies -->
<MicrosoftNETCoreRuntimeICUTransportVersion>$(MicrosoftNETCoreRuntimeICUTransportPackageVersion)</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- dotnet-llvm-project dependencies -->
Expand Down
112 changes: 58 additions & 54 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,77 +51,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
Comment on lines +54 to +64
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="3.2.2-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.3-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.3-beta.26264.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
Comment on lines 74 to 85
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="11.0.0-beta.26276.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -299,9 +299,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2cee83bf4841d72c9734a343f3003aeabdd46edf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>674b66fb89fae22b8823c85c73e7b79a2346f8c5</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 Expand Up @@ -421,5 +421,9 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>3d77251a3ee4b40d280dfc0f558f686e002a0f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.JobMonitor" Version="11.0.0-beta.26265.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f3ff9cd2ae04b357d169bcadee91d8c07f86bfe</Sha>
</Dependency>
Comment on lines +424 to +427
Comment on lines +424 to +427
</ToolsetDependencies>
</Dependencies>
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).
Loading
Loading