Skip to content

Commit 8c4b31d

Browse files
wiktorkwiktork
committed
Merge remote-tracking branch 'upstream/main' into dev/wiktork/release/9.x
2 parents 22beac8 + 2666784 commit 8c4b31d

File tree

17 files changed

+67
-51
lines changed

17 files changed

+67
-51
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,14 @@ pipelines:
6161
lastModifiedDate: 2024-03-26
6262
armory:
6363
lastModifiedDate: 2024-03-26
64+
1444:
65+
retail:
66+
source:
67+
credscan:
68+
lastModifiedDate: 2025-03-28
69+
eslint:
70+
lastModifiedDate: 2025-03-28
71+
psscriptanalyzer:
72+
lastModifiedDate: 2025-03-28
73+
armory:
74+
lastModifiedDate: 2025-03-28

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@
44
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
55
<Sha>4442a188f9200a57635373dcd640893c0e8dcc78</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25256.1">
7+
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25377.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
9-
<Sha>aebf15d23e5a25ab718e780a29d8aca9a5280425</Sha>
9+
<Sha>24de8bfbfd5795acd1dde863ed8172d538a9f585</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25256.1">
11+
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25377.1">
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
13-
<Sha>aebf15d23e5a25ab718e780a29d8aca9a5280425</Sha>
13+
<Sha>24de8bfbfd5795acd1dde863ed8172d538a9f585</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25256.1">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25375.2">
1616
<Uri>https://github.com/dotnet/command-line-api</Uri>
17-
<Sha>493a1d270887d7c51372fd17f774ea44b0c3101a</Sha>
17+
<Sha>e68587e7ac93a5b02feaa71bd714544e0e41d568</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
2121
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25076.3">
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25366.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
27+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25302.2">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25366.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
31+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25302.2">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25366.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
35+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25366.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
39+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25302.2">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25366.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
43+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.FileFormats" Version="1.0.625601">
45+
<Dependency Name="Microsoft.FileFormats" Version="1.0.637701">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
47-
<Sha>aebf15d23e5a25ab718e780a29d8aca9a5280425</Sha>
47+
<Sha>24de8bfbfd5795acd1dde863ed8172d538a9f585</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
5050
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25302.2</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25302.2</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25366.1</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25366.1</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.1-rtm.24610.9</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
5757
<!-- dotnet/command-line-api references -->
58-
<SystemCommandLineVersion>2.0.0-beta5.25256.1</SystemCommandLineVersion>
58+
<SystemCommandLineVersion>2.0.0-rc.1.25375.2</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
60-
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25256.1</MicrosoftDiagnosticsMonitoringVersion>
61-
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25256.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
60+
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25377.1</MicrosoftDiagnosticsMonitoringVersion>
61+
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25377.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
6262
<!-- dotnet/roslyn-analyzers -->
6363
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
6464
<!-- dotnet/runtime references -->
@@ -67,7 +67,7 @@
6767
<!-- dotnet/sdk references -->
6868
<VSRedistCommonNetCoreSdkPlaceholderx6490Version>9.0.200-rtm.25073.13</VSRedistCommonNetCoreSdkPlaceholderx6490Version>
6969
<!-- dotnet/symstore references -->
70-
<MicrosoftFileFormatsVersion>1.0.625601</MicrosoftFileFormatsVersion>
70+
<MicrosoftFileFormatsVersion>1.0.637701</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>
7272
<PropertyGroup Label="Runtime Versions">
7373
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

‎eng/common/core-templates/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139+
${{ else }}:
140+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137141
env:
138142
TeamName: $(_TeamName)
139143
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

‎eng/common/internal/NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<clear />
55
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
66
</packageSources>
7+
<packageSourceMapping>
8+
<clear />
9+
</packageSourceMapping>
710
</configuration>

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
416416

417417
# Locate Visual Studio installation or download x-copy msbuild.
418418
$vsInfo = LocateVisualStudio $vsRequirements
419-
if ($vsInfo -ne $null) {
419+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
420420
# Ensure vsInstallDir has a trailing slash
421421
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
422422
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

‎eng/dependabot/independent/NuGet.config

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎eng/dependabot/independent/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- Import references updated by Dependabot. -->
33

44
<PropertyGroup>
5-
<AzureCoreVersion>1.46.0</AzureCoreVersion>
6-
<AzureIdentityVersion>1.13.2</AzureIdentityVersion>
7-
<AzureStorageBlobsVersion>12.24.0</AzureStorageBlobsVersion>
8-
<AzureStorageQueuesVersion>12.22.0</AzureStorageQueuesVersion>
9-
<MicrosoftIdentityWebVersion>3.8.4</MicrosoftIdentityWebVersion>
5+
<AzureCoreVersion>1.47.1</AzureCoreVersion>
6+
<AzureIdentityVersion>1.14.2</AzureIdentityVersion>
7+
<AzureStorageBlobsVersion>12.25.0</AzureStorageBlobsVersion>
8+
<AzureStorageQueuesVersion>12.23.0</AzureStorageQueuesVersion>
9+
<MicrosoftIdentityWebVersion>3.11.0</MicrosoftIdentityWebVersion>
1010
<MicrosoftOpenApiReadersVersion>1.6.24</MicrosoftOpenApiReadersVersion>
1111
<SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
1212
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>

‎eng/dependabot/net8.0/NuGet.config

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎eng/dependabot/net8.0/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<!-- Microsoft.Extensions.Logging.Console -->
1111
<MicrosoftExtensionsLoggingConsole80Version>8.0.1</MicrosoftExtensionsLoggingConsole80Version>
1212
<!-- Microsoft.NETCore.App -->
13-
<MicrosoftNETCoreApp80Version>8.0.15</MicrosoftNETCoreApp80Version>
13+
<MicrosoftNETCoreApp80Version>8.0.18</MicrosoftNETCoreApp80Version>
1414
<!-- System.Text.Json -->
15-
<SystemTextJson80Version>8.0.5</SystemTextJson80Version>
15+
<SystemTextJson80Version>8.0.6</SystemTextJson80Version>
1616
</PropertyGroup>
1717
</Project>

0 commit comments

Comments
 (0)