Skip to content

Commit a083307

Browse files
sander1095sander1095
committed
Merge remote-tracking branch 'origin/main' into fix-openapi-description-bug-minimal-api
2 parents 6fcf274 + f25dc7b commit a083307

File tree

260 files changed

+2412
-1048
lines changed

Some content is hidden

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

260 files changed

+2412
-1048
lines changed

‎.github/policies/resourceManagement.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Policybot docs live at https://eng.ms/docs/more/github-inside-microsoft/policies/resource-management
12
id:
23
name: GitOps.PullRequestIssueManagement
34
description: GitOps.PullRequestIssueManagement primitive
@@ -550,7 +551,7 @@ configuration:
550551
then:
551552
- removeMilestone
552553
- addMilestone:
553-
milestone: 9.0.3
554+
milestone: 9.0.4
554555
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
555556
- if:
556557
- payloadType: Pull_Request
@@ -561,7 +562,7 @@ configuration:
561562
then:
562563
- removeMilestone
563564
- addMilestone:
564-
milestone: 8.0.14
565+
milestone: 8.0.15
565566
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
566567
- if:
567568
- payloadType: Issues

‎eng/Publishing.props‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,17 @@
1212
'$(PostBuildSign)' != 'true' and
1313
'$(DotNetBuildRepo)' != 'true'">false</EnableDefaultArtifacts>
1414

15-
<PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == '' and
16-
('$(OS)' == 'Windows_NT' or '$(DotNetBuildOrchestrator)' == 'true')">true</PublishInstallerBaseVersion>
1715
<!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
1816
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
17+
<!--
18+
Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
19+
- If we're building outside of the VMR, publish these assets from the Windows job.
20+
- If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
21+
-->
22+
<PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
23+
or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
24+
and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
25+
<PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
1926
</PropertyGroup>
2027

2128
<!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->
@@ -24,10 +31,10 @@
2431
<FilesToPublishToSymbolServer Include="$(ArtifactsDir)symbols\**\*.pdb" />
2532

2633
<!-- Prepare for _PublishInstallersAndChecksums target. -->
27-
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.jar" UploadPathSegment="jar" />
28-
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.pom" UploadPathSegment="jar" />
34+
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.jar" UploadPathSegment="jar" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" />
35+
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.pom" UploadPathSegment="jar" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" />
2936
<!-- All builds produce npm assets - only publish them once -->
30-
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.tgz" UploadPathSegment="npm" Condition="'$(OS)' == 'Windows_NT' or '$(DotNetBuildOrchestrator)' == 'true'" />
37+
<_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.tgz" UploadPathSegment="npm" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" />
3138
<_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.version" UploadPathSegment="Runtime" Condition="'$(PublishInstallerBaseVersion)' == 'true'" />
3239

3340
<!-- The following installers create checksums -->

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,39 @@
4848
<!-- Transitive dependency of System.Security.Cryptography.Pkcs.5.0.*. -->
4949
<UsagePattern IdentityGlob="System.Formats.Asn1/6.0.0" />
5050
<UsagePattern IdentityGlob="System.Formats.Asn1/5.0.0" />
51+
52+
<!-- Transitive dependency of Microsoft.CodeAnalysis.Workspaces.Common, which gets bumped to latest in full product build -->
53+
<UsagePattern IdentityGlob="Microsoft.NETCore.Targets/1.1.0" />
54+
<UsagePattern IdentityGlob="System.Buffers/4.4.0" />
55+
<UsagePattern IdentityGlob="System.Collections/4.3.0" />
56+
<UsagePattern IdentityGlob="System.Collections.Immutable/1.5.0" />
57+
<UsagePattern IdentityGlob="System.Composition.AttributedModel/1.0.31" />
58+
<UsagePattern IdentityGlob="System.Composition.Convention/1.0.31" />
59+
<UsagePattern IdentityGlob="System.Composition.Hosting/1.0.31" />
60+
<UsagePattern IdentityGlob="System.Composition.Runtime/1.0.31" />
61+
<UsagePattern IdentityGlob="System.Composition.TypedParts/1.0.31" />
62+
<UsagePattern IdentityGlob="System.Diagnostics.Debug/4.3.0" />
63+
<UsagePattern IdentityGlob="System.Diagnostics.Tools/4.3.0" />
64+
<UsagePattern IdentityGlob="System.Globalization/4.3.0" />
65+
<UsagePattern IdentityGlob="System.IO/4.3.0" />
66+
<UsagePattern IdentityGlob="System.Linq/4.3.0" />
67+
<UsagePattern IdentityGlob="System.Linq.Expressions/4.3.0" />
68+
<UsagePattern IdentityGlob="System.Memory/4.5.3" />
69+
<UsagePattern IdentityGlob="System.ObjectModel/4.3.0" />
70+
<UsagePattern IdentityGlob="System.Reflection/4.3.0" />
71+
<UsagePattern IdentityGlob="System.Reflection.Emit/4.3.0" />
72+
<UsagePattern IdentityGlob="System.Reflection.Emit.ILGeneration/4.3.0" />
73+
<UsagePattern IdentityGlob="System.Reflection.Emit.Lightweight/4.3.0" />
74+
<UsagePattern IdentityGlob="System.Reflection.Extensions/4.3.0" />
75+
<UsagePattern IdentityGlob="System.Reflection.Metadata/1.6.0" />
76+
<UsagePattern IdentityGlob="System.Reflection.Primitives/4.3.0" />
77+
<UsagePattern IdentityGlob="System.Reflection.TypeExtensions/4.3.0" />
78+
<UsagePattern IdentityGlob="System.Resources.ResourceManager/4.3.0" />
79+
<UsagePattern IdentityGlob="System.Runtime/4.3.0" />
80+
<UsagePattern IdentityGlob="System.Runtime.Extensions/4.3.0" />
81+
<UsagePattern IdentityGlob="System.Text.Encoding/4.3.0" />
82+
<UsagePattern IdentityGlob="System.Threading/4.3.0" />
83+
<UsagePattern IdentityGlob="System.Threading.Tasks/4.3.0" />
5184
</IgnorePatterns>
5285

5386
<!-- Transitive dependencies, suppressed as per https://github.com/dotnet/aspnetcore/pull/57887#issuecomment-2362241518-->

0 commit comments

Comments
 (0)