Skip to content

Commit dc3923e

Browse files
wtgodbewtgodbe
authored
Merge branch 'main' into merge/release/9.0-to-main
2 parents e31c6a4 + e2db47c commit dc3923e

File tree

326 files changed

+1952
-1245
lines changed

Some content is hidden

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

326 files changed

+1952
-1245
lines changed

‎.azure/pipelines/ci-public.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,38 @@ stages:
640640
publishOnError: true
641641
includeForks: true
642642

643+
# Local development validation
644+
- template: jobs/default-build.yml
645+
parameters:
646+
jobName: Local_Windows
647+
jobDisplayName: 'Test: Windows local development validation'
648+
agentOs: Windows
649+
timeoutInMinutes: 240
650+
steps:
651+
- script: git submodule update --init
652+
displayName: Update submodules
653+
- script: ./restore.cmd
654+
displayName: Run restore.cmd
655+
- script: npm run build
656+
displayName: Build JS
657+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
658+
displayName: Build (Debug)
659+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Release
660+
displayName: Build (Release)
661+
- script: ./src/ProjectTemplates/build.cmd
662+
-test
663+
-NoRestore
664+
-NoBuild
665+
-NoBuildDeps
666+
-configuration Release
667+
displayName: Run project template tests
668+
669+
artifacts:
670+
- name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
671+
path: artifacts/log/
672+
publishOnError: true
673+
includeForks: true
674+
643675
# Source build
644676
- template: /eng/common/templates/job/source-build.yml
645677
parameters:

‎.azure/pipelines/ci.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,39 @@ extends:
701701
publishOnError: true
702702
includeForks: true
703703

704+
# Local development validation
705+
- ${{ if in(variables['Build.Reason'], 'PullRequest', 'Manual') }}:
706+
- template: .azure/pipelines/jobs/default-build.yml@self
707+
parameters:
708+
jobName: Local_Windows
709+
jobDisplayName: 'Test: Windows local development validation'
710+
agentOs: Windows
711+
timeoutInMinutes: 240
712+
steps:
713+
- script: git submodule update --init
714+
displayName: Update submodules
715+
- script: ./restore.cmd
716+
displayName: Run restore.cmd
717+
- script: npm run build
718+
displayName: Build JS
719+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
720+
displayName: Build (Debug)
721+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Release
722+
displayName: Build (Release)
723+
- script: ./src/ProjectTemplates/build.cmd
724+
-test
725+
-NoRestore
726+
-NoBuild
727+
-NoBuildDeps
728+
-configuration Release
729+
displayName: Run project template tests
730+
731+
artifacts:
732+
- name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
733+
path: artifacts/log/
734+
publishOnError: true
735+
includeForks: true
736+
704737
# Source build
705738
- template: /eng/common/templates-official/job/source-build.yml@self
706739
parameters:

‎Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@
130130
<!-- xUnit1004 = warns about skipped tests. Make this a non-fatal build warning. -->
131131
<WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
132132

133+
<!-- don't warn about calling ConfigureAwait in test methods. we already commonly get off the xunit threads because they cause issues. -->
134+
<NoWarn>$(NoWarn);xUnit1030</NoWarn>
135+
133136
<!-- don't warn about unnecessary trim warning suppressions. can be removed with preview 6. -->
134137
<NoWarn>$(NoWarn);IL2121</NoWarn>
135138

‎NuGet.config

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
<clear />
55
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
66
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
7+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
8+
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
79
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
810
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
911
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
10-
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
1112
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1213
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
13-
<!-- Used for the SiteExtension bits that are included in the 8.0 build -->
14-
<add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
15-
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
14+
<!-- Used for the SiteExtension bits -->
1615
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
17-
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
1816
<!-- Used for the Rich Navigation indexing task -->
1917
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
2018
</packageSources>

‎eng/Npm.Workspace.nodeproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<Message Text="Building NPM packages..." Importance="high" />
3838

39-
<Exec Condition="'$(ContinuousIntegrationBuild)' == 'true'"
39+
<Exec
4040
Command="node $(MSBuildThisFileDirectory)scripts/npm/pack-workspace.mjs --update-versions $(RepoRoot)package.json $(PackageVersion) $(PackageOutputPath) $(IntermediateOutputPath)"
4141
EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />
4242

@@ -58,6 +58,8 @@
5858
</PropertyGroup>
5959
<Message Text="Packing NPM packages..." Importance="high" />
6060
<MakeDir Directories="$(PackageOutputPath)" Condition="!Exists('$(PackageOutputPath)')" />
61+
<MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
62+
6163
<Exec
6264
Command="node $(MSBuildThisFileDirectory)scripts/npm/pack-workspace.mjs --create-packages $(RepoRoot)package.json $(PackageVersion) $(PackageOutputPath) $(IntermediateOutputPath)"
6365
EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
3636
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*9.0.*" />
37-
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
37+
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*10.0.*" />
3838

3939
<!-- Transivite dependency of Microsoft.CodeAnalysis.ExternalAccess.AspNetCore -> Microsoft.CodeAnalysis.Features.
4040
In product build the dependency is bumped to latest, which also bumps the version of DiaSymReader -->

0 commit comments

Comments
 (0)