Skip to content

Commit faa291c

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into dev/Jason/UpdateTfm
2 parents 93cd030 + bc05780 commit faa291c

File tree

99 files changed

+2736
-887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+2736
-887
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25052.5",
6+
"version": "1.1.0-beta.25056.6",
77
"commands": [
88
"darc"
99
]

‎eng/Version.Details.xml

Lines changed: 120 additions & 120 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
2929
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
3030
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
31-
<MicrosoftTestingPlatformVersion>1.6.0-preview.25054.4</MicrosoftTestingPlatformVersion>
31+
<MicrosoftTestingPlatformVersion>1.6.0-preview.25056.11</MicrosoftTestingPlatformVersion>
3232
</PropertyGroup>
3333
<PropertyGroup Label="Servicing version information">
3434
<VersionFeature21>30</VersionFeature21>
@@ -59,7 +59,7 @@
5959
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
6060
<SystemCommandLineVersion>2.0.0-beta4.24528.1</SystemCommandLineVersion>
6161
<SystemCommandLineRenderingVersion>0.4.0-alpha.24528.1</SystemCommandLineRenderingVersion>
62-
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24623.2</MicrosoftDeploymentDotNetReleasesVersion>
62+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24630.1</MicrosoftDeploymentDotNetReleasesVersion>
6363
<MicrosoftDiaSymReaderVersion>2.2.0-beta.24622.1</MicrosoftDiaSymReaderVersion>
6464
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
6565
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
@@ -75,15 +75,15 @@
7575
</PropertyGroup>
7676
<PropertyGroup>
7777
<!-- Dependency from https://github.com/dotnet/arcade-services -->
78-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25052.5</MicrosoftDotNetDarcLibVersion>
78+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25056.6</MicrosoftDotNetDarcLibVersion>
7979
</PropertyGroup>
8080
<PropertyGroup>
8181
<!-- Dependency from https://github.com/dotnet/aspire -->
8282
<AspirePackageVersion>9.1.0-preview.1.24555.3</AspirePackageVersion>
8383
</PropertyGroup>
8484
<PropertyGroup>
8585
<!-- Dependency from https://github.com/dotnet/winforms -->
86-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24631.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
86+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.25054.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
8787
</PropertyGroup>
8888
<PropertyGroup>
8989
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -136,9 +136,9 @@
136136
</PropertyGroup>
137137
<PropertyGroup>
138138
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
139-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.25054.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
140-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.25054.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
141-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.25054.1</MicrosoftWindowsDesktopAppRefPackageVersion>
139+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.25056.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
140+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.25056.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
141+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.25056.2</MicrosoftWindowsDesktopAppRefPackageVersion>
142142
</PropertyGroup>
143143
<PropertyGroup>
144144
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -185,20 +185,20 @@
185185
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
186186
187187
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
188-
<MicrosoftBuildVersion>17.14.0-preview-25053-07</MicrosoftBuildVersion>
189-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25053-07</MicrosoftBuildLocalizationVersion>
188+
<MicrosoftBuildVersion>17.14.0-preview-25056-07</MicrosoftBuildVersion>
189+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25056-07</MicrosoftBuildLocalizationVersion>
190190
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
191191
<MinimumVSVersion>17.12</MinimumVSVersion>
192192
</PropertyGroup>
193193
<PropertyGroup>
194194
<!-- Dependencies from https://github.com/dotnet/templating -->
195-
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.25053.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
195+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.25055.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
196196
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
197197
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
198198
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
199199
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
200200
<!-- test dependencies -->
201-
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.25053.1</MicrosoftTemplateEngineMocksPackageVersion>
201+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.25055.1</MicrosoftTemplateEngineMocksPackageVersion>
202202
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
203203
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
204204
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -209,41 +209,41 @@
209209
</PropertyGroup>
210210
<PropertyGroup>
211211
<!-- Dependencies from https://github.com/dotnet/roslyn -->
212-
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25054.1</MicrosoftNetCompilersToolsetVersion>
213-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25054.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25054.1</MicrosoftCodeAnalysisPackageVersion>
215-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25054.1</MicrosoftCodeAnalysisCSharpPackageVersion>
216-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25054.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25054.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25054.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25054.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
212+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25055.1</MicrosoftNetCompilersToolsetVersion>
213+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25055.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214+
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisPackageVersion>
215+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisCSharpPackageVersion>
216+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
223-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreAppRefPackageVersion>
224-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
225-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
226-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
227-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
228-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
229-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreTestHostPackageVersion>
230-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
231-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.25054.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
232-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.25054.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
233-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.25054.1</dotnetdevcertsPackageVersion>
234-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.25054.1</dotnetuserjwtsPackageVersion>
235-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.25054.1</dotnetusersecretsPackageVersion>
223+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreAppRefPackageVersion>
224+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
225+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
226+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
227+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
228+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreAnalyzersPackageVersion>
229+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreTestHostPackageVersion>
230+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
231+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.25056.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
232+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.25056.9</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
233+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.25056.9</dotnetdevcertsPackageVersion>
234+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.25056.9</dotnetuserjwtsPackageVersion>
235+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.25056.9</dotnetusersecretsPackageVersion>
236236
</PropertyGroup>
237237
<PropertyGroup>
238238
<!-- Dependencies from https://github.com/dotnet/razor -->
239-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25052.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
240-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25052.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
241-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25052.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
239+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25056.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
240+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25056.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
241+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25056.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
242242
</PropertyGroup>
243243
<PropertyGroup>
244244
<!-- Dependencies from https://github.com/dotnet/wpf -->
245-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.25054.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
246-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.25054.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
245+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.25056.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
246+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.25056.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
247247
</PropertyGroup>
248248
<PropertyGroup Label="Template versions">
249249
<!-- 10.0 Template versions -->
@@ -262,10 +262,10 @@
262262
</PropertyGroup>
263263
<PropertyGroup>
264264
<!-- Dependencies from https://github.com/dotnet/arcade -->
265-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25053.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
266-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25053.3</MicrosoftDotNetSignToolVersion>
267-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25053.3</MicrosoftDotNetXliffTasksVersion>
268-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25053.3</MicrosoftDotNetXUnitExtensionsVersion>
265+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
266+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25056.1</MicrosoftDotNetSignToolVersion>
267+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25056.1</MicrosoftDotNetXliffTasksVersion>
268+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25056.1</MicrosoftDotNetXUnitExtensionsVersion>
269269
</PropertyGroup>
270270
<PropertyGroup>
271271
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
@@ -285,7 +285,7 @@
285285
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
286286
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
287287
<MoqPackageVersion>4.18.4</MoqPackageVersion>
288-
<MSTestVersion>3.8.0-preview.25054.4</MSTestVersion>
288+
<MSTestVersion>3.8.0-preview.25056.11</MSTestVersion>
289289
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
290290
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
291291
</PropertyGroup>

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ parameters:
4444
displayName: Publish installers and checksums
4545
type: boolean
4646
default: true
47+
48+
- name: requireDefaultChannels
49+
displayName: Fail the build if there are no default channel(s) registrations for the current build
50+
type: boolean
51+
default: false
4752

4853
- name: SDLValidationParameters
4954
type: object
@@ -312,5 +317,6 @@ stages:
312317
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
313318
-AzdoToken '$(System.AccessToken)'
314319
-WaitPublishingFinish true
320+
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
315321
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
316322
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/cross/build-rootfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ elif [[ -n "$__CodeName" ]]; then
800800
PYTHON=${PYTHON_EXECUTABLE:-python3}
801801

802802
# shellcheck disable=SC2086,SC2046
803-
echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --rootfsdir "$__RootfsDir" --artool "$AR" \
803+
echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
804804
$(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
805805
$__UbuntuPackages
806806

0 commit comments

Comments
 (0)