Skip to content

Commit ff67f8d

Browse files
captainsafiacaptainsafia
committed
Merge branch 'main' of https://github.com/dotnet/aspnetcore into cs/minimal-sse-result
2 parents 664aa6d + 7f26caa commit ff67f8d

File tree

212 files changed

+11100
-1119
lines changed

Some content is hidden

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

212 files changed

+11100
-1119
lines changed

‎.azure/pipelines/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ variables:
7979
- name: WindowsArm64InstallersLogArgs
8080
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
8181
- name: _InternalRuntimeDownloadArgs
82-
value: -RuntimeSourceFeed https://ci.dot.net/internal
82+
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
8383
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
8484
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
8585
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
8686
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
8787
- name: _InternalRuntimeDownloadCodeSignArgs
8888
value: $(_InternalRuntimeDownloadArgs)
89-
/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
89+
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
9090
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
9191
- group: DotNet-HelixApi-Access
9292
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:

‎.github/policies/resourceManagement.yml‎

Lines changed: 3 additions & 3 deletions
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‎

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

‎Directory.Build.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@
234234
</PropertyGroup>
235235

236236
<PropertyGroup>
237-
<OfficialBaseURL>https://builds.dotnet.microsoft.com/dotnet/</OfficialBaseURL>
237+
<OfficialBaseURL>https://dotnetcli.blob.core.windows.net/dotnet/</OfficialBaseURL>
238238
<!-- Allow overriding the public base URL for Unified Build scenarios to pull assets from a local build. -->
239-
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://ci.dot.net/public/</PublicBaseURL>
240-
<InternalBaseURL>https://ci.dot.net/internal/</InternalBaseURL>
239+
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://dotnetbuilds.blob.core.windows.net/public/</PublicBaseURL>
240+
<InternalBaseURL>https://dotnetbuilds.blob.core.windows.net/internal/</InternalBaseURL>
241241
<!-- Allow overriding where installers are pulled in from previously completed jobs in Unified Build scenarios. -->
242242
<AddVersionToCrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' != ''">true</AddVersionToCrossArchitectureInstallerBasePath>
243243
<CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(ArtifactsShippingPackagesDir)</CrossArchitectureInstallerBasePath>
@@ -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‎

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

‎eng/Dependencies.props‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 10 additions & 34 deletions
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)