Skip to content

Commit 7fcd07d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[feature/10.0] Update dependencies from dotnet/dotnet (#8258)
[feature/10.0] Update dependencies from dotnet/dotnet - Delete src/arcade/eng/common It got accidentally added due to a darc bug, see dotnet/arcade-services#4837
1 parent 6443ba0 commit 7fcd07d

File tree

13 files changed

+44
-358
lines changed

13 files changed

+44
-358
lines changed

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25263.104">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25267.102">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
5+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25223.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
@@ -12,55 +12,55 @@
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
1313
<Sha>06dd01b14c537a9d512feec44452f9dd255f32a7</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25263.104">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25267.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
17+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25263.104">
21+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25267.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
23+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25263.104">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25267.102">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
27+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25263.104">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25267.102">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
31+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25263.104">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25267.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
35+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25263.104">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25267.102">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
39+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25263.104">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25267.102">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
43+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.622301">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
4747
<Sha>06dd01b14c537a9d512feec44452f9dd255f32a7</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25263.104">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25267.102">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
51+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25263.104">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25267.102">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
55+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.5.25263.104">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.5.25267.102">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
59+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25263.104">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25267.102">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>5d437e96e412b189af05abb84753996de9aa698f</Sha>
63+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25223.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
5353
<MicrosoftFileFormatsVersion>1.0.622301</MicrosoftFileFormatsVersion>
5454
<!-- dotnet/dotnet references -->
55-
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.5.25263.104</MicrosoftAspNetCoreAppRuntimewinx64Version>
56-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25263.104</MicrosoftCodeAnalysisNetAnalyzersVersion>
57-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25263.104</MicrosoftDotNetBuildTasksArchivesVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25263.104</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25263.104</MicrosoftDotNetXUnitExtensionsVersion>
60-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25263.104</MicrosoftNETCoreAppRuntimewinx64Version>
61-
<SystemCommandLineVersion>2.0.0-beta5.25263.104</SystemCommandLineVersion>
62-
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25263.104</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
63-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.5.25263.104</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
64-
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25263.104</VSRedistCommonNetCoreSharedFrameworkx64100Version>
55+
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.5.25267.102</MicrosoftAspNetCoreAppRuntimewinx64Version>
56+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25267.102</MicrosoftCodeAnalysisNetAnalyzersVersion>
57+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25267.102</MicrosoftDotNetBuildTasksArchivesVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25267.102</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25267.102</MicrosoftDotNetXUnitExtensionsVersion>
60+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25267.102</MicrosoftNETCoreAppRuntimewinx64Version>
61+
<SystemCommandLineVersion>2.0.0-beta5.25267.102</SystemCommandLineVersion>
62+
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25267.102</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
63+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.5.25267.102</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
64+
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25267.102</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6565
</PropertyGroup>
6666
<PropertyGroup Label="Runtime Versions">
6767
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

‎eng/common/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function Build {
127127
/p:Deploy=$deploy `
128128
/p:Test=$test `
129129
/p:Pack=$pack `
130-
/p:DotNetBuildRepo=$productBuild `
130+
/p:DotNetBuild=$productBuild `
131131
/p:IntegrationTest=$integrationTest `
132132
/p:PerformanceTest=$performanceTest `
133133
/p:Sign=$sign `

‎eng/common/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ while [[ $# > 0 ]]; do
129129
-pack)
130130
pack=true
131131
;;
132-
-sourcebuild|-sb)
132+
-sourcebuild|-source-build|-sb)
133133
build=true
134134
source_build=true
135135
product_build=true
136136
restore=true
137137
pack=true
138138
;;
139-
-productbuild|-pb)
139+
-productbuild|-product-build|-pb)
140140
build=true
141141
product_build=true
142142
restore=true
@@ -241,7 +241,7 @@ function Build {
241241
/p:RepoRoot="$repo_root" \
242242
/p:Restore=$restore \
243243
/p:Build=$build \
244-
/p:DotNetBuildRepo=$product_build \
244+
/p:DotNetBuild=$product_build \
245245
/p:DotNetBuildSourceOnly=$source_build \
246246
/p:Rebuild=$rebuild \
247247
/p:Test=$test \

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ steps:
5151
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
5252
--configuration $buildConfig \
5353
--restore --build --pack -bl \
54+
--source-build \
5455
${{ parameters.platform.buildArguments }} \
5556
$internalRuntimeDownloadArgs \
5657
$targetRidArgs \
5758
$baseRidArgs \
5859
$portableBuildArgs \
59-
/p:DotNetBuildSourceOnly=true \
60-
/p:DotNetBuildRepo=true \
6160
displayName: Build
6261

6362
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml

‎eng/common/tools.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
6868
# True if the build is a product build
6969
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
7070

71-
[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
72-
7371
function Create-Directory ([string[]] $path) {
7472
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
7573
}
@@ -853,7 +851,7 @@ function MSBuild-Core() {
853851

854852
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
855853
# Skip this when the build is a child of the VMR orchestrator build.
856-
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
854+
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) {
857855
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
858856
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
859857
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

‎eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function MSBuild-Core {
507507

508508
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
509509
# Skip this when the build is a child of the VMR orchestrator build.
510-
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
510+
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then
511511
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
512512
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
513513
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.4.25209.42",
3+
"dotnet": "10.0.100-preview.5.25265.106",
44
"runtimes": {
55
"aspnetcore": [
66
"$(MicrosoftAspNetCoreApp80Version)",
@@ -26,7 +26,7 @@
2626
},
2727
"msbuild-sdks": {
2828
"Microsoft.Build.NoTargets": "3.7.0",
29-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.104",
30-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.104"
29+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25267.102",
30+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25267.102"
3131
}
3232
}

‎src/arcade/eng/common/core-templates/job/source-build.yml

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)