Skip to content

Commit 8b0dee8

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into dev/v-wuzhai/enable-nullable
2 parents 12ee199 + 189e2d8 commit 8b0dee8

File tree

634 files changed

+11940
-8609
lines changed

Some content is hidden

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

634 files changed

+11940
-8609
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.24554.3",
6+
"version": "1.1.0-beta.24609.2",
77
"commands": [
88
"darc"
99
]

‎.devcontainer/vmr/init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ vmr_branch=$(git -C "$sdk_dir" log --pretty=format:'%D' HEAD^ \
2525
| sed 's@origin/@@' \
2626
| sed 's@,.*@@')
2727

28-
"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --debug
28+
"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --ci --debug
2929

3030
cd "$vmr_dir"

‎.vsts-ci.yml

Lines changed: 22 additions & 16 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,17 +286,28 @@ 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 ###############
296-
# Temporarily removed until the SDK can target net10. The assets produced by upstream repos
297-
# are net10, but this repo needs net9.
298-
# - template: /eng/common/templates-official/job/source-build.yml@self
299-
# parameters:
300-
# platform:
301-
# name: Managed
302-
# container: centosStream9
303-
# jobProperties:
304-
# timeoutInMinutes: 30
304+
- template: /eng/common/templates-official/job/source-build.yml@self
305+
parameters:
306+
platform:
307+
name: Managed
308+
container: centosStream9
309+
jobProperties:
310+
timeoutInMinutes: 30
305311

306312
############### DOTNET-FORMAT ###############
307313
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:

‎.vsts-pr.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,27 @@ 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 ###############
68-
# Temporarily removed until the SDK can target net10. The assets produced by upstream repos
69-
# are net10, but this repo needs net9.
70-
# - template: /eng/common/templates-official/job/source-build.yml@self
71-
# parameters:
72-
# platform:
73-
# name: Managed
74-
# container: centosStream9
75-
# jobProperties:
76-
# timeoutInMinutes: 30
80+
- template: /eng/common/templates/job/source-build.yml@self
81+
parameters:
82+
platform:
83+
name: Managed
84+
container: centosStream9
85+
jobProperties:
86+
timeoutInMinutes: 30
7787

7888
############### DOTNET-FORMAT ###############
7989
- template: /eng/dotnet-format/dotnet-format-integration.yml

‎Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<SdkTargetFramework>net10.0</SdkTargetFramework>
3838
<!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
3939
<NetCurrent>net10.0</NetCurrent>
40+
<NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetToolMinimum>
4041
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
4142
<VisualStudioServiceTargetFramework>net8.0</VisualStudioServiceTargetFramework>
4243

‎Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
5353
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
5454
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
55-
and '$(MSBuildProjectName)' != 'toolset-tasks'
56-
and '$(MSBuildProjectName)' != 'core-sdk-tasks'">
55+
and '$(MSBuildProjectName)' != 'sdk-tasks'">
5756
<FrameworkReference
5857
Update="Microsoft.NETCore.App"
5958
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"

‎Directory.Packages.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@
6363
<PackageVersion Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion)" />
6464
<PackageVersion Include="Microsoft.TemplateEngine.TestHelper" Version="$(MicrosoftTemplateEngineTestHelperPackageVersion)" />
6565
<PackageVersion Include="Microsoft.TemplateSearch.Common" Version="$(MicrosoftTemplateSearchCommonPackageVersion)" />
66+
<PackageVersion Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
67+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
6668
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
6769
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6870
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
6971
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
70-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.9" />
72+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.26" />
7173
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7274
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7375
<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

‎documentation/project-docs/developer-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ This should print `Hello World!`.
166166

167167
## Locked files
168168

169-
If you see error like ` error MSB3021: Unable to copy file "toolset-tasks.dll" to "toolset-tasks.dll". The process cannot access the file 'toolset-tasks.dll' because it is being used by another process.`
169+
If you see error like ` error MSB3021: Unable to copy file "sdk-tasks.dll" to "sdk-tasks.dll". The process cannot access the file 'sdk-tasks.dll' because it is being used by another process.`
170170

171171
You could run the following to stop all dotnet related processes
172172

‎eng/Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
1212
'$(OS)' == 'Windows_NT' and
1313
'$(Architecture)' == 'x64'">
14-
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSMSBuildExtensions\VSMSBuildExtensions.csproj" DotNetBuildPass="2" />
15-
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSTemplateLocator\VSTemplateLocator.csproj" DotNetBuildPass="2" />
14+
<ProjectToBuild Include="$(RepoRoot)src\VSMSBuildExtensions\VSMSBuildExtensions.proj" DotNetBuildPass="2" />
15+
<ProjectToBuild Include="$(RepoRoot)src\VSTemplateLocator\VSTemplateLocator.proj" DotNetBuildPass="2" />
1616
</ItemGroup>
1717

1818
</Project>

0 commit comments

Comments
 (0)