Skip to content

Commit 029f661

Browse files
chenguohuichenguohui
authored
Merge branch 'dotnet:main' into loongarch64-main
2 parents ad7efda + a3c19b3 commit 029f661

File tree

144 files changed

+1634
-2047
lines changed

Some content is hidden

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

144 files changed

+1634
-2047
lines changed

‎.azure/pipelines/ci.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,11 @@ extends:
359359
--all
360360
--build-installers
361361
--no-build-java
362+
$(_ArcadePublishNonWindowsArg)
362363
-p:OnlyPackPlatformSpecificPackages=true
364+
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
363365
$(_BuildArgs)
366+
$(_PublishArgs)
364367
$(_InternalRuntimeDownloadArgs)
365368
artifacts:
366369
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
@@ -417,8 +420,11 @@ extends:
417420
--all
418421
--build-installers
419422
--no-build-java
423+
$(_ArcadePublishNonWindowsArg)
420424
-p:OnlyPackPlatformSpecificPackages=true
425+
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
421426
$(_BuildArgs)
427+
$(_PublishArgs)
422428
$(_InternalRuntimeDownloadArgs)
423429
artifacts:
424430
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)

‎.azure/pipelines/jobs/default-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ jobs:
210210
${{ step.env }}
211211
- ${{ if eq(parameters.steps, '')}}:
212212
- ${{ if eq(parameters.agentOs, 'Windows') }}:
213-
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
213+
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
214214
/p:DotNetSignType=$(_SignType)
215215
displayName: Run build.cmd
216216
env:
217217
COMPlus_DbgEnableMiniDump: 1
218218
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
219219
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
220220
- ${{ if ne(parameters.agentOs, 'Windows') }}:
221-
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
221+
- script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
222222
displayName: Run build.sh
223223
env:
224224
COMPlus_DbgEnableMiniDump: 1
@@ -451,15 +451,15 @@ jobs:
451451
${{ step.env }}
452452
- ${{ if eq(parameters.steps, '')}}:
453453
- ${{ if eq(parameters.agentOs, 'Windows') }}:
454-
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
454+
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
455455
/p:DotNetSignType=$(_SignType)
456456
displayName: Run build.cmd
457457
env:
458458
COMPlus_DbgEnableMiniDump: 1
459459
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
460460
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
461461
- ${{ if ne(parameters.agentOs, 'Windows') }}:
462-
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
462+
- script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
463463
displayName: Run build.sh
464464
env:
465465
COMPlus_DbgEnableMiniDump: 1

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
/src/Hosting/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
3030
/src/Http/ @BrennanConroy @halter73 @captainsafia
3131
/src/Http/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy
32-
/src/Http/Routing/ @javiercn
33-
/src/Http/Routing/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @javiercn
32+
/src/Http/Routing/ @halter73
33+
/src/Http/Routing/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @halter73
3434
/src/HttpClientFactory/ @captainsafia @halter73
3535
/src/HttpClientFactory/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73
3636
/src/Installers/ @dotnet/aspnet-build @wtgodbe

‎.github/workflows/update-selenium-and-playwright-dependencies.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Update Selenium and Playwright dependencies
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 1-7 * 1' # Run on the first monday of the month
6+
workflow_dispatch: # Allow manual runs
7+
8+
permissions:
9+
contents: write
10+
issues: write
11+
pull-requests: write
12+
13+
jobs:
14+
update-jquery-validate:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout code
19+
uses: actions/checkout@v4
20+
21+
- name: Update dependencies
22+
run: pwsh eng/scripts/update-selenium-and-playwright-versions.ps1
23+
env:
24+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎AspNetCore.sln‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,12 +1588,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\Installers
15881588
EndProject
15891589
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModule-Setup", "AspNetCoreModule-Setup", "{D30A658D-61F6-444B-9AC7-F66A1A1B86B6}"
15901590
EndProject
1591-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedFramework", "SharedFramework", "{31854B06-DC6B-4416-97C3-559CC390B8B4}"
1592-
EndProject
1593-
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFramework", "src\Installers\Windows\SharedFramework\SharedFramework.wixproj", "{C681D730-4505-42C6-9E6C-87F757C4FB32}"
1594-
EndProject
1595-
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkBundle", "src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj", "{D6C54D8B-043F-4877-B751-60E7390F9EC6}"
1596-
EndProject
15971591
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsHostingBundle", "src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj", "{6F1B115C-1903-40CB-837D-7961AB610F4E}"
15981592
EndProject
15991593
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "src\Servers\testassets\ServerComparison.TestSites\ServerComparison.TestSites.csproj", "{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}"
@@ -9727,26 +9721,6 @@ Global
97279721
{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.ActiveCfg = Release|Win32
97289722
{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Build.0 = Release|Win32
97299723
{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Deploy.0 = Release|Win32
9730-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|Any CPU.ActiveCfg = Debug|arm64
9731-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|arm64.ActiveCfg = Debug|arm64
9732-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|arm64.Build.0 = Debug|arm64
9733-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x64.ActiveCfg = Debug|arm64
9734-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x86.ActiveCfg = Debug|arm64
9735-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|Any CPU.ActiveCfg = Release|arm64
9736-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|arm64.ActiveCfg = Release|arm64
9737-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|arm64.Build.0 = Release|arm64
9738-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x64.ActiveCfg = Release|arm64
9739-
{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x86.ActiveCfg = Release|arm64
9740-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|Any CPU.ActiveCfg = Debug|arm64
9741-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|arm64.ActiveCfg = Debug|arm64
9742-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|arm64.Build.0 = Debug|arm64
9743-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x64.ActiveCfg = Debug|arm64
9744-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x86.ActiveCfg = Debug|arm64
9745-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|Any CPU.ActiveCfg = Release|arm64
9746-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|arm64.ActiveCfg = Release|arm64
9747-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|arm64.Build.0 = Release|arm64
9748-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x64.ActiveCfg = Release|arm64
9749-
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x86.ActiveCfg = Release|arm64
97509724
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|Any CPU.ActiveCfg = Debug|arm64
97519725
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.ActiveCfg = Debug|arm64
97529726
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.Build.0 = Debug|arm64
@@ -11771,9 +11745,6 @@ Global
1177111745
{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
1177211746
{B54A8F61-60DE-4AD9-87CA-D102F230678E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
1177311747
{D30A658D-61F6-444B-9AC7-F66A1A1B86B6} = {5E46DC83-C39C-4E3A-B242-C064607F4367}
11774-
{31854B06-DC6B-4416-97C3-559CC390B8B4} = {5E46DC83-C39C-4E3A-B242-C064607F4367}
11775-
{C681D730-4505-42C6-9E6C-87F757C4FB32} = {31854B06-DC6B-4416-97C3-559CC390B8B4}
11776-
{D6C54D8B-043F-4877-B751-60E7390F9EC6} = {31854B06-DC6B-4416-97C3-559CC390B8B4}
1177711748
{5244BC49-2568-4701-80A6-EAB8950AB5FA} = {31854B06-DC6B-4416-97C3-559CC390B8B4}
1177811749
{6F1B115C-1903-40CB-837D-7961AB610F4E} = {5E46DC83-C39C-4E3A-B242-C064607F4367}
1177911750
{56DFE643-7F0F-40C8-9F7F-8EA5357781EF} = {3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://dotnetbuilds.azureedge.net/public/</PublicBaseURL>
240240
<InternalBaseURL>https://dotnetbuilds.azureedge.net/internal/</InternalBaseURL>
241241
<!-- Allow overriding where installers are pulled in from previously completed jobs in Unified Build scenarios. -->
242-
<CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(InstallersOutputPath)</CrossArchitectureInstallerBasePath>
242+
<CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(ArtifactsShippingPackagesDir)</CrossArchitectureInstallerBasePath>
243243
</PropertyGroup>
244244

245245
<!-- Try various places to find the runtime. It's either released (use official version),

‎Directory.Build.targets‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,17 @@
172172
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
173173
</Target>
174174

175+
<!--
176+
Remove the implicit package reference for Microsoft.AspNetCore.App.Internal.Assets.
177+
Projects within the repo will consume framework assets by importing
178+
Microsoft.AspNetCore.App.Internal.Assets.targets directly
179+
-->
180+
<Target Name="_RemoveAspNetCoreAppInternalAssetsReference" AfterTargets="ProcessFrameworkReferences">
181+
<ItemGroup>
182+
<PackageReference Remove="Microsoft.AspNetCore.App.Internal.Assets" />
183+
</ItemGroup>
184+
</Target>
185+
175186
<Import Project="eng\Workarounds.targets" />
176187
<Import Project="artifacts\bin\GenerateFiles\Directory.Build.targets" Condition=" '$(MSBuildProjectName)' != 'GenerateFiles' " />
177188
<Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />

0 commit comments

Comments
 (0)