Skip to content

Commit 8db717b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#79744)
[main] Source code updates from dotnet/dotnet - Remove properties that now live in Version.Details.props - Update Versions.props - Add Microsoft.Extensions.FileSystemGlobbing to V.D.xml
1 parent 8faa318 commit 8db717b

File tree

3 files changed

+107
-41
lines changed

3 files changed

+107
-41
lines changed

‎eng/Version.Details.props‎

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,97 @@
1-
<!-- will get filled in the next backflow -->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
This file is auto-generated by the Maestro dependency flow system.
4+
Do not edit it manually, as it will get overwritten by automation.
5+
This file should be imported by eng/Versions.props
6+
-->
7+
<Project>
8+
<PropertyGroup>
9+
<!-- dotnet/roslyn dependencies -->
10+
<MicrosoftCodeAnalysisPackageVersion>3.11.0</MicrosoftCodeAnalysisPackageVersion>
11+
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-1.24061.4</MicrosoftNetCompilersToolsetPackageVersion>
12+
<!-- dotnet/dotnet dependencies -->
13+
<SystemCommandLinePackageVersion>2.0.0-rc.1.25401.103</SystemCommandLinePackageVersion>
14+
<!-- dotnet/runtime dependencies -->
15+
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
16+
<MicrosoftExtensionsConfigurationPackageVersion>9.0.0</MicrosoftExtensionsConfigurationPackageVersion>
17+
<MicrosoftExtensionsDependencyInjectionPackageVersion>9.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
18+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
19+
<MicrosoftExtensionsLoggingPackageVersion>9.0.0</MicrosoftExtensionsLoggingPackageVersion>
20+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.0</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
21+
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
22+
<MicrosoftExtensionsOptionsPackageVersion>9.0.0</MicrosoftExtensionsOptionsPackageVersion>
23+
<MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion>
24+
<MicrosoftExtensionsPrimitivesPackageVersion>9.0.0</MicrosoftExtensionsPrimitivesPackageVersion>
25+
<SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
26+
<SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>
27+
<SystemCompositionPackageVersion>9.0.0</SystemCompositionPackageVersion>
28+
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0</SystemConfigurationConfigurationManagerPackageVersion>
29+
<SystemDiagnosticsDiagnosticSourcePackageVersion>9.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
30+
<SystemDiagnosticsEventLogPackageVersion>9.0.0</SystemDiagnosticsEventLogPackageVersion>
31+
<SystemIOHashingPackageVersion>9.0.0</SystemIOHashingPackageVersion>
32+
<SystemIOPipelinesPackageVersion>9.0.0</SystemIOPipelinesPackageVersion>
33+
<SystemReflectionMetadataPackageVersion>9.0.0</SystemReflectionMetadataPackageVersion>
34+
<SystemResourcesExtensionsPackageVersion>9.0.0</SystemResourcesExtensionsPackageVersion>
35+
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
36+
<SystemSecurityPermissionsPackageVersion>9.0.0</SystemSecurityPermissionsPackageVersion>
37+
<SystemTextEncodingsWebPackageVersion>9.0.0</SystemTextEncodingsWebPackageVersion>
38+
<SystemTextJsonPackageVersion>9.0.0</SystemTextJsonPackageVersion>
39+
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
40+
<SystemWindowsExtensionsPackageVersion>9.0.0</SystemWindowsExtensionsPackageVersion>
41+
<!-- dotnet/arcade dependencies -->
42+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25367.5</MicrosoftDotNetArcadeSdkPackageVersion>
43+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25367.5</MicrosoftDotNetHelixSdkPackageVersion>
44+
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25367.5</MicrosoftDotNetXliffTasksPackageVersion>
45+
<!-- dotnet/symreader dependencies -->
46+
<MicrosoftDiaSymReaderPackageVersion>2.0.0</MicrosoftDiaSymReaderPackageVersion>
47+
<!-- dotnet/roslyn-analyzers dependencies -->
48+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0</MicrosoftCodeAnalysisAnalyzersPackageVersion>
49+
<MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>3.3.0</MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>
50+
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.0-preview.25375.1</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
51+
</PropertyGroup>
52+
<!--Property group for alternate package version names-->
53+
<PropertyGroup>
54+
<!-- dotnet/roslyn dependencies -->
55+
<MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisPackageVersion)</MicrosoftCodeAnalysisVersion>
56+
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
57+
<!-- dotnet/dotnet dependencies -->
58+
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
59+
<!-- dotnet/runtime dependencies -->
60+
<MicrosoftBclAsyncInterfacesVersion>$(MicrosoftBclAsyncInterfacesPackageVersion)</MicrosoftBclAsyncInterfacesVersion>
61+
<MicrosoftExtensionsConfigurationVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationVersion>
62+
<MicrosoftExtensionsDependencyInjectionVersion>$(MicrosoftExtensionsDependencyInjectionPackageVersion)</MicrosoftExtensionsDependencyInjectionVersion>
63+
<MicrosoftExtensionsFileSystemGlobbingVersion>$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)</MicrosoftExtensionsFileSystemGlobbingVersion>
64+
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLoggingPackageVersion)</MicrosoftExtensionsLoggingVersion>
65+
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)</MicrosoftExtensionsLoggingAbstractionsVersion>
66+
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsolePackageVersion)</MicrosoftExtensionsLoggingConsoleVersion>
67+
<MicrosoftExtensionsOptionsVersion>$(MicrosoftExtensionsOptionsPackageVersion)</MicrosoftExtensionsOptionsVersion>
68+
<MicrosoftExtensionsOptionsConfigurationExtensionVersion>$(MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion)</MicrosoftExtensionsOptionsConfigurationExtensionVersion>
69+
<MicrosoftExtensionsPrimitivesVersion>$(MicrosoftExtensionsPrimitivesPackageVersion)</MicrosoftExtensionsPrimitivesVersion>
70+
<SystemCollectionsImmutableVersion>$(SystemCollectionsImmutablePackageVersion)</SystemCollectionsImmutableVersion>
71+
<SystemComponentModelCompositionVersion>$(SystemComponentModelCompositionPackageVersion)</SystemComponentModelCompositionVersion>
72+
<SystemCompositionVersion>$(SystemCompositionPackageVersion)</SystemCompositionVersion>
73+
<SystemConfigurationConfigurationManagerVersion>$(SystemConfigurationConfigurationManagerPackageVersion)</SystemConfigurationConfigurationManagerVersion>
74+
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemDiagnosticsDiagnosticSourcePackageVersion)</SystemDiagnosticsDiagnosticSourceVersion>
75+
<SystemDiagnosticsEventLogVersion>$(SystemDiagnosticsEventLogPackageVersion)</SystemDiagnosticsEventLogVersion>
76+
<SystemIOHashingVersion>$(SystemIOHashingPackageVersion)</SystemIOHashingVersion>
77+
<SystemIOPipelinesVersion>$(SystemIOPipelinesPackageVersion)</SystemIOPipelinesVersion>
78+
<SystemReflectionMetadataVersion>$(SystemReflectionMetadataPackageVersion)</SystemReflectionMetadataVersion>
79+
<SystemResourcesExtensionsVersion>$(SystemResourcesExtensionsPackageVersion)</SystemResourcesExtensionsVersion>
80+
<SystemSecurityCryptographyProtectedDataVersion>$(SystemSecurityCryptographyProtectedDataPackageVersion)</SystemSecurityCryptographyProtectedDataVersion>
81+
<SystemSecurityPermissionsVersion>$(SystemSecurityPermissionsPackageVersion)</SystemSecurityPermissionsVersion>
82+
<SystemTextEncodingsWebVersion>$(SystemTextEncodingsWebPackageVersion)</SystemTextEncodingsWebVersion>
83+
<SystemTextJsonVersion>$(SystemTextJsonPackageVersion)</SystemTextJsonVersion>
84+
<SystemThreadingTasksDataflowVersion>$(SystemThreadingTasksDataflowPackageVersion)</SystemThreadingTasksDataflowVersion>
85+
<SystemWindowsExtensionsVersion>$(SystemWindowsExtensionsPackageVersion)</SystemWindowsExtensionsVersion>
86+
<!-- dotnet/arcade dependencies -->
87+
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
88+
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
89+
<MicrosoftDotNetXliffTasksVersion>$(MicrosoftDotNetXliffTasksPackageVersion)</MicrosoftDotNetXliffTasksVersion>
90+
<!-- dotnet/symreader dependencies -->
91+
<MicrosoftDiaSymReaderVersion>$(MicrosoftDiaSymReaderPackageVersion)</MicrosoftDiaSymReaderVersion>
92+
<!-- dotnet/roslyn-analyzers dependencies -->
93+
<MicrosoftCodeAnalysisAnalyzersVersion>$(MicrosoftCodeAnalysisAnalyzersPackageVersion)</MicrosoftCodeAnalysisAnalyzersVersion>
94+
<MicrosoftCodeAnalysisAnalyzerUtilitiesVersion>$(MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion)</MicrosoftCodeAnalysisAnalyzerUtilitiesVersion>
95+
<MicrosoftCodeAnalysisNetAnalyzersVersion>$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)</MicrosoftCodeAnalysisNetAnalyzersVersion>
96+
</PropertyGroup>
97+
</Project>

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="6a953e76162f3f079405f80e28664fa51b136740" BarId="276981" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="8b29a1682219da555ee27e4fdda55dc3884b316f" BarId="277635" />
44
<ProductDependencies>
55
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
66
<Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">
77
<Uri>https://github.com/dotnet/roslyn</Uri>
88
<Sha>ae1fff344d46976624e68ae17164e0607ab68b10</Sha>
99
</Dependency>
10-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25377.103">
10+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25401.103">
1111
<Uri>https://github.com/dotnet/dotnet</Uri>
12-
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
12+
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
1313
</Dependency>
1414
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
1515
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">
@@ -24,6 +24,10 @@
2424
<Uri>https://github.com/dotnet/runtime</Uri>
2525
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
2626
</Dependency>
27+
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0">
28+
<Uri>https://github.com/dotnet/runtime</Uri>
29+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
30+
</Dependency>
2731
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
2832
<Uri>https://github.com/dotnet/runtime</Uri>
2933
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
@@ -76,6 +80,7 @@
7680
<Uri>https://github.com/dotnet/runtime</Uri>
7781
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
7882
</Dependency>
83+
<!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild in VS (would lead to NGEN failures on insertion). -->
7984
<Dependency Name="System.Text.Json" Version="9.0.0">
8085
<Uri>https://github.com/dotnet/runtime</Uri>
8186
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>

‎eng/Versions.props‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
33
<Project>
4+
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
45
<!--
56
Roslyn version
67
-->
@@ -44,53 +45,17 @@
4445
<SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
4546
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
4647
</PropertyGroup>
47-
<!--
48-
Versions managed by Arcade (see Versions.Details.xml)
49-
-->
5048
<PropertyGroup>
51-
<SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
52-
<SystemCompositionVersion>9.0.0</SystemCompositionVersion>
53-
<SystemConfigurationConfigurationManagerVersion>9.0.0</SystemConfigurationConfigurationManagerVersion>
54-
<SystemDiagnosticsEventLogVersion>9.0.0</SystemDiagnosticsEventLogVersion>
55-
<SystemCollectionsImmutableVersion>9.0.0</SystemCollectionsImmutableVersion>
56-
<SystemComponentModelCompositionVersion>9.0.0</SystemComponentModelCompositionVersion>
57-
<SystemDiagnosticsDiagnosticSourceVersion>9.0.0</SystemDiagnosticsDiagnosticSourceVersion>
58-
<SystemIOHashingVersion>9.0.0</SystemIOHashingVersion>
59-
<SystemIOPipelinesVersion>9.0.0</SystemIOPipelinesVersion>
60-
<SystemReflectionMetadataVersion>9.0.0</SystemReflectionMetadataVersion>
61-
<SystemResourcesExtensionsVersion>9.0.0</SystemResourcesExtensionsVersion>
62-
<SystemSecurityCryptographyProtectedDataVersion>9.0.0</SystemSecurityCryptographyProtectedDataVersion>
63-
<SystemSecurityPermissionsVersion>9.0.0</SystemSecurityPermissionsVersion>
64-
<SystemTextEncodingsWebVersion>9.0.0</SystemTextEncodingsWebVersion>
65-
<!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild in VS (would lead to NGEN failures on insertion). -->
66-
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
67-
<SystemThreadingTasksDataflowVersion>9.0.0</SystemThreadingTasksDataflowVersion>
68-
<SystemWindowsExtensionsVersion>9.0.0</SystemWindowsExtensionsVersion>
69-
<MicrosoftBclAsyncInterfacesVersion>9.0.0</MicrosoftBclAsyncInterfacesVersion>
70-
<MicrosoftCodeAnalysisAnalyzersVersion>5.0.0-1.25277.114</MicrosoftCodeAnalysisAnalyzersVersion>
71-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25375.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
72-
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
73-
<MicrosoftExtensionsConfigurationVersion>9.0.0</MicrosoftExtensionsConfigurationVersion>
74-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0</MicrosoftExtensionsDependencyInjectionVersion>
75-
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
76-
<MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>
77-
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
78-
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0</MicrosoftExtensionsLoggingConsoleVersion>
79-
<MicrosoftExtensionsOptionsConfigurationExtensionVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionVersion>
80-
<MicrosoftExtensionsOptionsVersion>9.0.0</MicrosoftExtensionsOptionsVersion>
81-
<MicrosoftExtensionsPrimitivesVersion>9.0.0</MicrosoftExtensionsPrimitivesVersion>
8249
<MicrosoftVSSDKBuildToolsVersion>17.14.1043-preview2</MicrosoftVSSDKBuildToolsVersion>
8350
<vswhereVersion>3.1.7</vswhereVersion>
8451
<!--
8552
MicrosoftDevDivOptimizationDataPowerShellVersion and NewtonsoftJsonVersion are used in eng/InternalTools.props. The file is an extensibility port from eng/common/internal/Tools.csproj (managed by Arcade)
8653
So it's not affected by our central package management
8754
-->
88-
<MicrosoftIdentityClientVersion>4.61.3</MicrosoftIdentityClientVersion>
8955
<MicrosoftDevDivOptimizationDataPowerShellVersion>1.0.865</MicrosoftDevDivOptimizationDataPowerShellVersion>
9056
<MicrosoftIdentityModelJsonWebTokensVersion>6.34.0</MicrosoftIdentityModelJsonWebTokensVersion>
91-
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
92-
<SystemIdentityModelTokensJwtVersion>6.34.0</SystemIdentityModelTokensJwtVersion>
9357
<MicrosoftIdentityClientVersion>4.61.3</MicrosoftIdentityClientVersion>
58+
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
9459
<SystemIdentityModelTokensJwtVersion>6.34.0</SystemIdentityModelTokensJwtVersion>
9560
</PropertyGroup>
9661
<!--

0 commit comments

Comments
 (0)