Skip to content

Commit 6db16a5

Browse files
nohwndnohwnd
authored
Merge branch 'main' into dotnet-test-integration
2 parents c28a02c + 7361d85 commit 6db16a5

File tree

228 files changed

+4504
-4094
lines changed

Some content is hidden

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

228 files changed

+4504
-4094
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.24577.1",
6+
"version": "1.1.0-beta.24603.4",
77
"commands": [
88
"darc"
99
]

‎.vsts-ci.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ extends:
6565
containers:
6666
alpine319WithNode:
6767
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
68-
cblMariner20Fpm:
69-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
7068
centosStream9:
7169
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
7270
debian12Amd64:
@@ -75,8 +73,6 @@ extends:
7573
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
7674
mariner20CrossArm:
7775
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
78-
ubuntu2204DebPkg:
79-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
8076
sdl:
8177
sourceAnalysisPool:
8278
name: $(DncEngInternalBuildPool)
@@ -200,21 +196,20 @@ extends:
200196
runTests: false
201197
### PORTABLE ###
202198
- categoryName: Portable
203-
container: ubuntu2204DebPkg
204199
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
205200
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
206201
officialBuildProperties: $(_officialBuildProperties)
207202
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
208203
runTests: false
209204
- categoryName: Portable
210-
container: cblMariner20Fpm
205+
container: centosStream9
211206
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
212207
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
213208
officialBuildProperties: $(_officialBuildProperties)
214209
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
215210
runTests: false
216211
- categoryName: Portable
217-
container: cblMariner20Fpm
212+
container: centosStream9
218213
buildArchitecture: arm64
219214
runtimeIdentifier: linux-arm64
220215
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
@@ -291,6 +286,19 @@ extends:
291286
publishArgument: $(_publishArgument)
292287
officialBuildProperties: $(_officialBuildProperties)
293288
runTests: false
289+
### ARM64 TESTBUILD ###
290+
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
291+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
292+
parameters:
293+
pool:
294+
name: Azure Pipelines
295+
vmImage: macOS-latest
296+
os: macOS
297+
helixTargetQueue: osx.13.arm64
298+
macOSJobParameterSets:
299+
- categoryName: TestBuild
300+
buildArchitecture: arm64
301+
runtimeIdentifier: osx-arm64
294302

295303
############### SOURCE BUILD ###############
296304
- template: /eng/common/templates-official/job/source-build.yml@self

‎.vsts-pr.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ stages:
6363
vmImage: macOS-latest
6464
os: macOS
6565
helixTargetQueue: osx.13.amd64.open
66+
### ARM64 ###
67+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
68+
parameters:
69+
pool:
70+
name: Azure Pipelines
71+
vmImage: macOS-latest
72+
os: macOS
73+
helixTargetQueue: osx.13.arm64.open
74+
macOSJobParameterSets:
75+
- categoryName: TestBuild
76+
buildArchitecture: arm64
77+
runtimeIdentifier: osx-arm64
6678

6779
############### SOURCE BUILD ###############
6880
- template: /eng/common/templates/job/source-build.yml@self

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
7070
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
7171
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
72-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.23" />
72+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.26" />
7373
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7474
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7575
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

‎build/RunTestsOnHelix.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ export MicrosoftNETBuildExtensionsTargets=$HELIX_CORRELATION_PAYLOAD/ex/msbuildE
99
export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/d
1010
export PATH=$DOTNET_ROOT:$PATH
1111

12-
export TestExecutionDirectory=$(pwd)/testExecutionDirectory
13-
mkdir $TestExecutionDirectory
12+
export TestExecutionDirectory=$(realpath "$(mktemp -d "${TMPDIR:-/tmp}"/dotnetSdkTests.XXXXXXXX)")
1413
export DOTNET_CLI_HOME=$TestExecutionDirectory/.dotnet
1514
cp -a $HELIX_CORRELATION_PAYLOAD/t/TestExecutionDirectoryFiles/. $TestExecutionDirectory/
1615

@@ -36,4 +35,4 @@ dotnet nuget remove source dotnet-libraries-transport --configfile $TestExecutio
3635
dotnet nuget remove source dotnet-tools-transport --configfile $TestExecutionDirectory/NuGet.config
3736
dotnet nuget remove source dotnet-libraries --configfile $TestExecutionDirectory/NuGet.config
3837
dotnet nuget remove source dotnet-eng --configfile $TestExecutionDirectory/NuGet.config
39-
dotnet nuget list source --configfile $TestExecutionDirectory/NuGet.config
38+
dotnet nuget list source --configfile $TestExecutionDirectory/NuGet.config

‎eng/ManualVersions.props‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.45</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.45</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.45</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.45</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.45</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.45</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.45</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.43</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.43</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.43</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.43</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.43</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.43</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.43</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.54</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.54</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.54</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.54</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.54</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.54</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.54</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.52</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.52</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.52</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.52</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.52</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.52</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.52</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
2626
</PropertyGroup>
2727

2828
</Project>

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
3838
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
3939

40+
<!-- Transitive dependencies from MSBuild -->
41+
<UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
42+
4043
<!-- Transitive dependencies from roslyn -->
4144
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
4245
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />

0 commit comments

Comments
 (0)