Skip to content

Commit 98332af

Browse files
sander1095sander1095
committed
Merge branch 'main' into dotnetGH-59564-webapiaot-openapi
2 parents 8dc2ceb + aa5687c commit 98332af

File tree

219 files changed

+11939
-1133
lines changed

Some content is hidden

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

219 files changed

+11939
-1133
lines changed

‎.azure/pipelines/localization.yml

+39-10
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,42 @@ parameters:
2525
variables:
2626
- name: _TeamName
2727
value: AspNetCore
28-
- template: /eng/common/templates/variables/pool-providers.yml
29-
30-
jobs:
31-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
32-
- template: /eng/common/templates/job/onelocbuild.yml
33-
parameters:
34-
CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
35-
LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
36-
LclSource: lclFilesFromPackage
37-
MirrorRepo: aspnetcore
28+
- template: /eng/common/templates-official/variables/pool-providers.yml@self
29+
30+
31+
resources:
32+
repositories:
33+
# Repo: 1ESPipelineTemplates/1ESPipelineTemplates
34+
- repository: 1esPipelines
35+
type: git
36+
name: 1ESPipelineTemplates/1ESPipelineTemplates
37+
ref: refs/tags/release
38+
39+
extends:
40+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
41+
parameters:
42+
sdl:
43+
sourceAnalysisPool:
44+
name: $(DncEngInternalBuildPool)
45+
image: 1es-windows-2022
46+
os: windows
47+
codeql:
48+
compiled:
49+
enabled: false
50+
justificationForDisabling: "This pipeline doesn't build any code. The product code is already scanned in the main pipeline (aspnetcore-ci)"
51+
pool:
52+
name: $(DncEngInternalBuildPool)
53+
image: 1es-windows-2022
54+
os: windows
55+
56+
stages:
57+
- stage: build
58+
displayName: Build
59+
jobs:
60+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
61+
- template: /eng/common/templates-official/job/onelocbuild.yml@self
62+
parameters:
63+
CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
64+
LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
65+
LclSource: lclFilesFromPackage
66+
MirrorRepo: aspnetcore

‎.github/policies/resourceManagement.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -377,18 +377,18 @@ configuration:
377377
branch: main
378378
then:
379379
- addMilestone:
380-
milestone: 10.0-preview2
380+
milestone: 10.0-preview3
381381
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
382382
- if:
383383
- payloadType: Pull_Request
384384
- isAction:
385385
action: Closed
386386
- targetsBranch:
387-
branch: release/10.0-preview1
387+
branch: release/10.0-preview2
388388
then:
389389
- removeMilestone
390390
- addMilestone:
391-
milestone: 10.0-preview1
391+
milestone: 10.0-preview2
392392
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
393393
- if:
394394
- payloadType: Issues

‎AspNetCore.sln

+108-186
Large diffs are not rendered by default.

‎Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@
278278
</ItemGroup>
279279

280280
<PropertyGroup>
281-
<!-- Set the arcade before common targets so we compute ExcludeFromBuild before arcade uses it. -->
282-
<CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonTargets>
283-
<CustomBeforeMicrosoftCommonCrossTargetingTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonCrossTargetingTargets>
281+
<!-- Set the before common targets so we compute ExcludeFromBuild before arcade uses it. -->
282+
<CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets;$(CustomBeforeMicrosoftCommonTargets)</CustomBeforeMicrosoftCommonTargets>
283+
<CustomBeforeMicrosoftCommonCrossTargetingTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets;$(CustomBeforeMicrosoftCommonCrossTargetingTargets)</CustomBeforeMicrosoftCommonCrossTargetingTargets>
284284
</PropertyGroup>
285285

286286
<Import Project="eng\Workarounds.props" />

‎docs/area-owners.md

+31-23
Large diffs are not rendered by default.

‎eng/Dependencies.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ and are generated based on the last package release.
8686
<LatestPackageReference Include="System.Net.Http.Json" />
8787
<LatestPackageReference Include="System.Net.Sockets" />
8888
<LatestPackageReference Include="System.Net.ServerSentEvents" />
89-
<LatestPackageReference Include="System.Private.Uri" />
9089
<LatestPackageReference Include="System.Reflection.Metadata" />
9190
<LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
9291
<LatestPackageReference Include="System.Runtime.Caching" />
@@ -223,6 +222,7 @@ and are generated based on the last package release.
223222
<LatestPackageReference Include="StackExchange.Redis" />
224223
<LatestPackageReference Include="Swashbuckle.AspNetCore" />
225224
<LatestPackageReference Include="System.Reactive.Linq" />
225+
<LatestPackageReference Include="Verify.SourceGenerators" />
226226
<LatestPackageReference Include="Verify.Xunit" />
227227
<LatestPackageReference Include="xunit.abstractions" />
228228
<LatestPackageReference Include="xunit.analyzers" />

‎eng/Signing.props

+10-34
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,18 @@
1414
<UseDotNetCertificate>true</UseDotNetCertificate>
1515
</PropertyGroup>
1616

17-
<!-- Files that should be always be signed between in-build and post-build signing -->
17+
<!-- Files that should be always be signed -->
1818
<ItemGroup Label="Common Files to Sign">
19-
<CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
20-
<CommonFilesToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
21-
<CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.jar" />
22-
<CommonFilesToSign Include="$(ArtifactsDir)packages\$(Configuration)\**\*.zip" />
23-
<CommonFilesToSign Remove="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" Condition="'$(PostBuildSign)' != 'true'" />
19+
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
20+
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.exe" />
21+
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.msi" />
22+
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.jar" />
23+
<ItemsToSign Include="$(ArtifactsDir)packages\$(Configuration)\**\*.zip" />
24+
<ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
25+
<ItemsToSign Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" />
26+
<ItemsToSign Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" />
27+
<ItemsToSign Remove="$(ArtifactsPackagesDir)**\*symbols.nupkg" />
2428
</ItemGroup>
25-
<Choose>
26-
<!-- When post build signing is false - Sign as normal.
27-
When post build signing is true - Sign all of our signable artifacts
28-
that we would publish. Use a different ItemGroup name so that
29-
the signing stage signs nothing. We then set ItemToSign during
30-
publishing to this ItemGroup.
31-
-->
32-
<When Condition="'$(PostBuildSign)' != 'true'">
33-
<ItemGroup Label="Files To Sign">
34-
<ItemsToSign Include="@(CommonFilesToSign)" />
35-
<ItemsToSign Remove="$(ArtifactsPackagesDir)**\*symbols.nupkg" />
36-
</ItemGroup>
37-
</When>
38-
<When Condition="'$(PostBuildSign)' == 'true'">
39-
<PropertyGroup>
40-
<AllowEmptySignList>true</AllowEmptySignList>
41-
</PropertyGroup>
42-
<ItemGroup Label="Files To Sign">
43-
<!-- Sign symbol nupkgs so that shared files between layouts and msis end up identical. -->
44-
<ItemsToSignPostBuild Include="@(CommonFilesToSign)" />
45-
<ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" />
46-
<ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" />
47-
<!-- Wixlibs are signed because they are containers of other files -->
48-
<ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.wixlib" />
49-
</ItemGroup>
50-
</When>
51-
</Choose>
52-
5329

5430
<ItemGroup Label="File signing information">
5531
<!--

0 commit comments

Comments
 (0)