Skip to content

Commit 47d1dbe

Browse files
am11am11
committed
Merge dotnet/main into feature/minipal
2 parents 350dd4f + f9dfd41 commit 47d1dbe

305 files changed

Lines changed: 5880 additions & 3596 deletions

File tree

Some content is hidden

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

‎.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": "1.0.0-prerelease.21561.1",
18+
"version": "1.0.0-prerelease.21572.4",
1919
"commands": [
2020
"xharness"
2121
]

‎Directory.Build.props‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,11 @@
266266
<!-- Indicates this is not an officially supported release. Release branches should set this to false. -->
267267
<!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
268268
<IsPrerelease>true</IsPrerelease>
269-
<IsExperimentalAssembly>$(MSBuildProjectName.Contains('Experimental'))</IsExperimentalAssembly>
270269
<IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly>
271-
<!-- Experimental packages should not be stable -->
272-
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and ($(IsExperimentalAssembly) or $(IsPrivateAssembly))">true</SuppressFinalPackageVersion>
273-
<IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly>
270+
<!-- Private packages should not be stable -->
271+
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsPrivateAssembly)">true</SuppressFinalPackageVersion>
274272
<!-- We don't want Private packages to be shipped to NuGet.org -->
275-
<IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)">false</IsShippingPackage>
273+
<IsShippingPackage Condition="$(IsPrivateAssembly)">false</IsShippingPackage>
276274
<PlaceholderFile>$(RepositoryEngineeringDir)_._</PlaceholderFile>
277275
</PropertyGroup>
278276

‎docs/project/list-of-diagnostics.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,16 @@ The diagnostic id values reserved for .NET Libraries analyzer warnings are `SYSL
130130
| __`SYSLIB1027`__ | *_`SYSLIB1024`-`SYSLIB1029` reserved for logging._* |
131131
| __`SYSLIB1028`__ | *_`SYSLIB1024`-`SYSLIB1029` reserved for logging._* |
132132
| __`SYSLIB1029`__ | *_`SYSLIB1024`-`SYSLIB1029` reserved for logging._* |
133-
| __`SYSLIB1030`__ | [System.Text.Json.SourceGeneration] Did not generate serialization metadata for type. |
134-
| __`SYSLIB1031`__ | [System.Text.Json.SourceGeneration] Duplicate type name. |
135-
| __`SYSLIB1032`__ | *_`SYSLIB1032`-`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
136-
| __`SYSLIB1033`__ | *_`SYSLIB1032`-`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
137-
| __`SYSLIB1034`__ | *_`SYSLIB1032`-`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
138-
| __`SYSLIB1035`__ | *_`SYSLIB1032`-`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
139-
| __`SYSLIB1036`__ | *_`SYSLIB1032`-`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
140-
| __`SYSLIB1037`__ | *_`SYSLIB1032`-`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
141-
| __`SYSLIB1038`__ | *_`SYSLIB1032`-`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
142-
| __`SYSLIB1039`__ | *_`SYSLIB1032`-`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
133+
| __`SYSLIB1030`__ | JsonSourceGenerator did not generate serialization metadata for type |
134+
| __`SYSLIB1031`__ | JsonSourceGenerator encountered a duplicate JsonTypeInfo property name |
135+
| __`SYSLIB1032`__ | JsonSourceGenerator encountered a context class that is not partial |
136+
| __`SYSLIB1033`__ | JsonSourceGenerator encountered a type that has multiple [JsonConstructor] annotations|
137+
| __`SYSLIB1034`__ | *_`SYSLIB1034` reserved for System.Text.Json.SourceGeneration._* |
138+
| __`SYSLIB1035`__ | JsonSourceGenerator encountered a type that has multiple [JsonExtensionData] annotations |
139+
| __`SYSLIB1036`__ | JsonSourceGenerator encountered an invalid [JsonExtensionData] annotation |
140+
| __`SYSLIB1037`__ | JsonSourceGenerator encountered a type with init-only properties for which deserialization is not supported |
141+
| __`SYSLIB1038`__ | JsonSourceGenerator encountered a property annotated with [JsonInclude] that has inaccessible accessors |
142+
| __`SYSLIB1039`__ | *_`SYSLIB1039` reserved for System.Text.Json.SourceGeneration._* |
143143
| __`SYSLIB1040`__ | Invalid RegexGenerator attribute |
144144
| __`SYSLIB1041`__ | Multiple RegexGenerator attribute |
145145
| __`SYSLIB1042`__ | Invalid RegexGenerator arguments |

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<Uri>https://github.com/dotnet/arcade</Uri>
5555
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21559.3">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21568.2">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
59+
<Sha>7097001cd87357ebc6fb82f3c7a801efeed70e3f</Sha>
6060
</Dependency>
6161
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21559.3">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -202,13 +202,13 @@
202202
<Uri>https://github.com/dotnet/linker</Uri>
203203
<Sha>f2dd65f51f6096f25e00e0d1e4c6af0e85d41865</Sha>
204204
</Dependency>
205-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21561.1">
205+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21572.4">
206206
<Uri>https://github.com/dotnet/xharness</Uri>
207-
<Sha>42da0d206c22393c081abc4b6a48a181e17bb372</Sha>
207+
<Sha>7aa4d338b58a2b21974933802bd731a64c36c1d8</Sha>
208208
</Dependency>
209-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21561.1">
209+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21572.4">
210210
<Uri>https://github.com/dotnet/xharness</Uri>
211-
<Sha>42da0d206c22393c081abc4b6a48a181e17bb372</Sha>
211+
<Sha>7aa4d338b58a2b21974933802bd731a64c36c1d8</Sha>
212212
</Dependency>
213213
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.21559.3">
214214
<Uri>https://github.com/dotnet/arcade</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.21559.3</MicrosoftDotNetXUnitExtensionsVersion>
6666
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21559.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
6767
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksArchivesVersion>
68-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksInstallersVersion>
68+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21568.2</MicrosoftDotNetBuildTasksInstallersVersion>
6969
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksPackagingVersion>
7070
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksTemplatingVersion>
7171
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
@@ -154,8 +154,8 @@
154154
<!-- Testing -->
155155
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
156156
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
157-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21561.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
158-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21561.1</MicrosoftDotNetXHarnessCLIVersion>
157+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21572.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
158+
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21572.4</MicrosoftDotNetXHarnessCLIVersion>
159159
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.21558.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
160160
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
161161
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>

‎eng/outerBuild.targets‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<Project>
2-
<Target Name="GenerateReferenceAssemblySource" DependsOnTargets="GetProjectWithBestTargetFrameworks">
2+
<Target Name="SetBuildTargetFramework">
3+
<PropertyGroup>
4+
<BuildTargetFramework Condition="'$(BuildTargetFramework)' == ''">$(NetCoreAppCurrent)</BuildTargetFramework>
5+
</PropertyGroup>
6+
</Target>
7+
8+
<Target Name="GenerateReferenceAssemblySource" DependsOnTargets="SetBuildTargetFramework;GetProjectWithBestTargetFrameworks">
39
<MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
410
Targets="GenerateReferenceAssemblySource"
511
BuildInParallel="$(BuildInParallel)">

‎eng/pipelines/runtime-manual.yml‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -280,56 +280,19 @@ jobs:
280280
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
281281
eq(variables['isManualOrIsNotPR'], true),
282282
eq(variables['isFullMatrix'], true))
283-
${{ if eq(variables['isFullMatrix'], true) }}:
284-
# extra steps, run tests
285-
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
286-
extraStepsParameters:
287-
creator: dotnet-bot
288-
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
289-
extraHelixArguments: /p:BrowserHost=windows
290-
scenarios:
291-
- normal
292-
- wasmtestonbrowser
293-
condition: >-
294-
or(
295-
eq(variables['librariesContainsChange'], true),
296-
eq(variables['monoContainsChange'], true),
297-
eq(variables['isManualOrIsNotPR'], true),
298-
eq(variables['isFullMatrix'], true))
299-
300-
- template: /eng/pipelines/common/platform-matrix.yml
301-
parameters:
302-
jobTemplate: /eng/pipelines/common/global-build-job.yml
303-
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
304-
buildConfig: release
305-
runtimeFlavor: mono
306-
platforms:
307-
- Browser_wasm_win
308-
variables:
309-
# map dependencies variables to local variables
310-
- name: wasmbuildtestsContainsChange
311-
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'] ]
312-
jobParameters:
313-
testGroup: innerloop
314-
nameSuffix: Windows_wasm_WBT
315-
buildArgs: -subset mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:TestWasmBuildTests=true /p:TestAssemblies=false
316-
timeoutInMinutes: 180
317-
condition: >-
318-
or(
319-
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'], true),
320-
eq(variables['isManualOrIsNotPR'], true),
321-
eq(variables['isFullMatrix'], true))
322283
# extra steps, run tests
323284
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
324285
extraStepsParameters:
325286
creator: dotnet-bot
326287
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
327288
extraHelixArguments: /p:BrowserHost=windows
328289
scenarios:
329-
- buildwasmapps
290+
- normal
291+
- wasmtestonbrowser
330292
condition: >-
331293
or(
332-
eq(variables['wasmbuildtestsContainsChange'], true),
294+
eq(variables['librariesContainsChange'], true),
295+
eq(variables['monoContainsChange'], true),
333296
eq(variables['isManualOrIsNotPR'], true),
334297
eq(variables['isFullMatrix'], true))
335298
@@ -343,37 +306,74 @@ jobs:
343306
- Browser_wasm_win
344307
variables:
345308
# map dependencies variables to local variables
346-
- name: librariesContainsChange
347-
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
348-
- name: monoContainsChange
349-
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
309+
- name: wasmbuildtestsContainsChange
310+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'] ]
350311
jobParameters:
351312
testGroup: innerloop
352-
nameSuffix: Windows_wasm_AOT
353-
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
313+
nameSuffix: Windows_wasm_WBT
314+
buildArgs: -subset mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:TestWasmBuildTests=true /p:TestAssemblies=false
354315
timeoutInMinutes: 180
355316
condition: >-
356317
or(
357-
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
358-
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
359-
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
318+
eq(dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'], true),
360319
eq(variables['isManualOrIsNotPR'], true),
361320
eq(variables['isFullMatrix'], true))
362321
# extra steps, run tests
363322
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
364323
extraStepsParameters:
365324
creator: dotnet-bot
366325
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
367-
extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
326+
extraHelixArguments: /p:BrowserHost=windows
368327
scenarios:
369-
- normal
328+
- buildwasmapps
370329
condition: >-
371330
or(
372-
eq(variables['librariesContainsChange'], true),
373-
eq(variables['monoContainsChange'], true),
331+
eq(variables['wasmbuildtestsContainsChange'], true),
374332
eq(variables['isManualOrIsNotPR'], true),
375333
eq(variables['isFullMatrix'], true))
376334
335+
# Disabled due to https://github.com/dotnet/runtime/issues/61721
336+
#- template: /eng/pipelines/common/platform-matrix.yml
337+
#parameters:
338+
#jobTemplate: /eng/pipelines/common/global-build-job.yml
339+
#helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
340+
#buildConfig: release
341+
#runtimeFlavor: mono
342+
#platforms:
343+
#- Browser_wasm_win
344+
#variables:
345+
## map dependencies variables to local variables
346+
#- name: librariesContainsChange
347+
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
348+
#- name: monoContainsChange
349+
#value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
350+
#jobParameters:
351+
#testGroup: innerloop
352+
#nameSuffix: Windows_wasm_AOT
353+
#buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
354+
#timeoutInMinutes: 180
355+
#condition: >-
356+
#or(
357+
#eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
358+
#eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
359+
#eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
360+
#eq(variables['isManualOrIsNotPR'], true),
361+
#eq(variables['isFullMatrix'], true))
362+
## extra steps, run tests
363+
#extraStepsTemplate: /eng/pipelines/libraries/helix.yml
364+
#extraStepsParameters:
365+
#creator: dotnet-bot
366+
#testRunNamePrefixSuffix: Mono_$(_BuildConfig)
367+
#extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
368+
#scenarios:
369+
#- normal
370+
#condition: >-
371+
#or(
372+
#eq(variables['librariesContainsChange'], true),
373+
#eq(variables['monoContainsChange'], true),
374+
#eq(variables['isManualOrIsNotPR'], true),
375+
#eq(variables['isFullMatrix'], true))
376+
377377
#
378378
# Build for Browser/wasm, with EnableAggressiveTrimming=true
379379
#

0 commit comments

Comments
 (0)