Skip to content

Commit 4361470

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Merge release/10.0 into darc-release/10.0-dff90b19-95ba-456f-a4a6-a82885e38181
2 parents ddb80d6 + ec71a92 commit 4361470

File tree

10 files changed

+280
-241
lines changed

10 files changed

+280
-241
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "10.0.0-prerelease.25506.2",
18+
"version": "10.0.0-prerelease.25527.1",
1919
"commands": [
2020
"xharness"
2121
]

‎NuGet.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
</fallbackPackageFolders>
88
<packageSources>
99
<clear />
10+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
11+
<!-- Begin: Package sources from dotnet-dotnet -->
12+
<add key="darc-pub-dotnet-dotnet-79c85d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-79c85d96/nuget/v3/index.json" />
13+
<!-- End: Package sources from dotnet-dotnet -->
14+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1015
<!--
1116
'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
1217
one as a template. The following line is a marker to insert the test restore sources.

‎eng/Version.Details.props‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props
4040
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion>19.1.0-alpha.1.25461.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion>
4141
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>19.1.0-alpha.1.25461.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>
4242
<!-- dotnet/dotnet dependencies -->
43-
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25509.106</MicrosoftCodeAnalysisPackageVersion>
44-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25509.106</MicrosoftCodeAnalysisAnalyzersPackageVersion>
45-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25509.106</MicrosoftCodeAnalysisCSharpPackageVersion>
46-
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.100-rtm.25509.106</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
47-
<MicrosoftDotNetApiCompatTaskPackageVersion>10.0.100-rtm.25509.106</MicrosoftDotNetApiCompatTaskPackageVersion>
48-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetArcadeSdkPackageVersion>
49-
<MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetBuildTasksArchivesPackageVersion>
50-
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetBuildTasksFeedPackageVersion>
51-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetBuildTasksInstallersPackageVersion>
52-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetBuildTasksPackagingPackageVersion>
53-
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
54-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
55-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25509.106</MicrosoftDotNetCecilPackageVersion>
57-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetCodeAnalysisPackageVersion>
58-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetGenAPIPackageVersion>
59-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetHelixSdkPackageVersion>
61-
<MicrosoftDotNetPackageTestingPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetPackageTestingPackageVersion>
62-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetRemoteExecutorPackageVersion>
63-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
64-
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetXliffTasksPackageVersion>
65-
<MicrosoftDotNetXUnitAssertPackageVersion>2.9.3-beta.25509.106</MicrosoftDotNetXUnitAssertPackageVersion>
66-
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.25509.106</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
67-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetXUnitExtensionsPackageVersion>
68-
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25509.106</MicrosoftNetCompilersToolsetPackageVersion>
69-
<MicrosoftNETSdkILPackageVersion>10.0.0-rtm.25509.106</MicrosoftNETSdkILPackageVersion>
70-
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.100-rtm.25509.106</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
71-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rtm.25509.106</MicrosoftNETCoreAppRefPackageVersion>
72-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rtm.25509.106</MicrosoftNETCoreILAsmPackageVersion>
73-
<NuGetFrameworksPackageVersion>7.0.0-rc.1006</NuGetFrameworksPackageVersion>
74-
<NuGetPackagingPackageVersion>7.0.0-rc.1006</NuGetPackagingPackageVersion>
75-
<NuGetProjectModelPackageVersion>7.0.0-rc.1006</NuGetProjectModelPackageVersion>
76-
<NuGetVersioningPackageVersion>7.0.0-rc.1006</NuGetVersioningPackageVersion>
77-
<runtimenativeSystemIOPortsPackageVersion>10.0.0-rtm.25509.106</runtimenativeSystemIOPortsPackageVersion>
78-
<SystemCommandLinePackageVersion>2.0.0-rtm.25509.106</SystemCommandLinePackageVersion>
79-
<SystemReflectionMetadataPackageVersion>10.0.0-rtm.25509.106</SystemReflectionMetadataPackageVersion>
80-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rtm.25509.106</SystemReflectionMetadataLoadContextPackageVersion>
81-
<SystemTextJsonPackageVersion>10.0.0-rtm.25509.106</SystemTextJsonPackageVersion>
43+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25515.111</MicrosoftCodeAnalysisPackageVersion>
44+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25515.111</MicrosoftCodeAnalysisAnalyzersPackageVersion>
45+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25515.111</MicrosoftCodeAnalysisCSharpPackageVersion>
46+
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.100</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
47+
<MicrosoftDotNetApiCompatTaskPackageVersion>10.0.100</MicrosoftDotNetApiCompatTaskPackageVersion>
48+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetArcadeSdkPackageVersion>
49+
<MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksArchivesPackageVersion>
50+
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksFeedPackageVersion>
51+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksInstallersPackageVersion>
52+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksPackagingPackageVersion>
53+
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
54+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
55+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25515.111</MicrosoftDotNetCecilPackageVersion>
57+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetCodeAnalysisPackageVersion>
58+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetGenAPIPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetHelixSdkPackageVersion>
61+
<MicrosoftDotNetPackageTestingPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetPackageTestingPackageVersion>
62+
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetRemoteExecutorPackageVersion>
63+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
64+
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetXliffTasksPackageVersion>
65+
<MicrosoftDotNetXUnitAssertPackageVersion>2.9.3-beta.25515.111</MicrosoftDotNetXUnitAssertPackageVersion>
66+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.25515.111</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
67+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetXUnitExtensionsPackageVersion>
68+
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25515.111</MicrosoftNetCompilersToolsetPackageVersion>
69+
<MicrosoftNETSdkILPackageVersion>10.0.0</MicrosoftNETSdkILPackageVersion>
70+
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.100-rtm.25515.111</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
71+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
72+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0</MicrosoftNETCoreILAsmPackageVersion>
73+
<NuGetFrameworksPackageVersion>7.0.0-rc.1611</NuGetFrameworksPackageVersion>
74+
<NuGetPackagingPackageVersion>7.0.0-rc.1611</NuGetPackagingPackageVersion>
75+
<NuGetProjectModelPackageVersion>7.0.0-rc.1611</NuGetProjectModelPackageVersion>
76+
<NuGetVersioningPackageVersion>7.0.0-rc.1611</NuGetVersioningPackageVersion>
77+
<runtimenativeSystemIOPortsPackageVersion>10.0.0</runtimenativeSystemIOPortsPackageVersion>
78+
<SystemCommandLinePackageVersion>2.0.0</SystemCommandLinePackageVersion>
79+
<SystemReflectionMetadataPackageVersion>10.0.0</SystemReflectionMetadataPackageVersion>
80+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0</SystemReflectionMetadataLoadContextPackageVersion>
81+
<SystemTextJsonPackageVersion>10.0.0</SystemTextJsonPackageVersion>
8282
<!-- dotnet/runtime-assets dependencies -->
8383
<MicrosoftDotNetCilStripSourcesPackageVersion>10.0.0-beta.25418.1</MicrosoftDotNetCilStripSourcesPackageVersion>
8484
<MicrosoftNETHostModelTestDataPackageVersion>10.0.0-beta.25418.1</MicrosoftNETHostModelTestDataPackageVersion>
@@ -96,9 +96,9 @@ This file should be imported by eng/Versions.props
9696
<SystemTextRegularExpressionsTestDataPackageVersion>10.0.0-beta.25418.1</SystemTextRegularExpressionsTestDataPackageVersion>
9797
<SystemWindowsExtensionsTestDataPackageVersion>10.0.0-beta.25418.1</SystemWindowsExtensionsTestDataPackageVersion>
9898
<!-- dotnet/xharness dependencies -->
99-
<MicrosoftDotNetXHarnessCLIPackageVersion>10.0.0-prerelease.25506.2</MicrosoftDotNetXHarnessCLIPackageVersion>
100-
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>10.0.0-prerelease.25506.2</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
101-
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>10.0.0-prerelease.25506.2</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
99+
<MicrosoftDotNetXHarnessCLIPackageVersion>10.0.0-prerelease.25527.1</MicrosoftDotNetXHarnessCLIPackageVersion>
100+
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>10.0.0-prerelease.25527.1</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
101+
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>10.0.0-prerelease.25527.1</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
102102
<!-- _git/dotnet-optimization dependencies -->
103103
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
104104
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>

0 commit comments

Comments
 (0)