Skip to content

[feature/10.0] Update dependencies from dotnet/dotnet #8258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: feature/10.0
Choose a base branch
from
Open
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
48 changes: 24 additions & 24 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25263.104">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25223.1">
<Uri>https://github.com/dotnet/diagnostics</Uri>
Expand All @@ -12,55 +12,55 @@
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>06dd01b14c537a9d512feec44452f9dd255f32a7</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25263.104">
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25263.104">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25263.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25263.104">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25263.104">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25263.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25263.104">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="Microsoft.FileFormats" Version="1.0.622301">
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>06dd01b14c537a9d512feec44452f9dd255f32a7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25263.104">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25263.104">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.5.25263.104">
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.5.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25263.104">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25267.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
20 changes: 10 additions & 10 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25223.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
<MicrosoftFileFormatsVersion>1.0.622301</MicrosoftFileFormatsVersion>
<!-- dotnet/dotnet references -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.5.25263.104</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25263.104</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25263.104</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25263.104</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25263.104</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25263.104</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemCommandLineVersion>2.0.0-beta5.25263.104</SystemCommandLineVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25263.104</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.5.25263.104</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25263.104</VSRedistCommonNetCoreSharedFrameworkx64100Version>
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.5.25267.102</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25267.102</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25267.102</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25267.102</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25267.102</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25267.102</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemCommandLineVersion>2.0.0-beta5.25267.102</SystemCommandLineVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25267.102</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.5.25267.102</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25267.102</VSRedistCommonNetCoreSharedFrameworkx64100Version>
</PropertyGroup>
<PropertyGroup Label="Runtime Versions">
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 `
Expand Down
6 changes: 3 additions & 3 deletions eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-preview.4.25209.42",
"dotnet": "10.0.100-preview.5.25265.106",
"runtimes": {
"aspnetcore": [
"$(MicrosoftAspNetCoreApp80Version)",
Expand All @@ -26,7 +26,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.104"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25267.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25267.102"
}
}
96 changes: 0 additions & 96 deletions src/arcade/eng/common/core-templates/job/source-build.yml

This file was deleted.

Loading
Loading