Skip to content

Commit 0d2c4d3

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-8e1823b6-d702-445f-a632-001a3c02bc6c
2 parents 3f70537 + e761e9c commit 0d2c4d3

File tree

41 files changed

+200
-107
lines changed

Some content is hidden

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

41 files changed

+200
-107
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.25358.3",
6+
"version": "1.1.0-beta.25367.1",
77
"commands": [
88
"darc"
99
]

‎.vsconfig‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
5+
"Microsoft.Component.MSBuild",
6+
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
7+
"Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime",
8+
"Microsoft.VisualStudio.Component.SQL.CLR",
9+
"Microsoft.VisualStudio.Component.CoreEditor",
10+
"Microsoft.VisualStudio.Workload.CoreEditor",
11+
"Microsoft.Net.Component.4.8.SDK",
12+
"Microsoft.Net.Component.4.7.2.TargetingPack",
13+
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
14+
"Microsoft.VisualStudio.Component.TypeScript.TSServer",
15+
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
16+
"Microsoft.VisualStudio.Component.JavaScript.TypeScript",
17+
"Microsoft.VisualStudio.Component.TextTemplating",
18+
"Microsoft.VisualStudio.Component.NuGet",
19+
"Microsoft.Component.ClickOnce",
20+
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
21+
"Microsoft.NetCore.Component.Runtime.10.0",
22+
"Microsoft.NetCore.Component.SDK",
23+
"Microsoft.VisualStudio.Component.FSharp",
24+
"Microsoft.ComponentGroup.ClickOnce.Publish",
25+
"Microsoft.NetCore.Component.DevelopmentTools",
26+
"Microsoft.Net.Component.4.8.TargetingPack",
27+
"Microsoft.Net.ComponentGroup.4.8.DeveloperTools",
28+
"Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd",
29+
"Microsoft.VisualStudio.Component.DiagnosticTools",
30+
"Microsoft.VisualStudio.Component.EntityFramework",
31+
"Microsoft.VisualStudio.Component.LiveUnitTesting",
32+
"Microsoft.VisualStudio.Component.Debugger.JustInTime",
33+
"Component.Microsoft.VisualStudio.LiveShare.2022",
34+
"Microsoft.VisualStudio.Component.IntelliCode",
35+
"Component.VisualStudio.GitHub.Copilot",
36+
"Microsoft.VisualStudio.Component.ClassDesigner",
37+
"Microsoft.VisualStudio.Component.GraphDocument",
38+
"Microsoft.VisualStudio.Component.CodeMap",
39+
"Microsoft.VisualStudio.Component.VC.CoreIde",
40+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
41+
"Microsoft.VisualStudio.Component.Graphics.Tools",
42+
"Microsoft.VisualStudio.Component.VC.DiagnosticTools",
43+
"Microsoft.VisualStudio.Component.Windows11SDK.26100",
44+
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
45+
"Microsoft.VisualStudio.Component.DotNetModelBuilder",
46+
"Microsoft.ComponentGroup.Blend",
47+
"Microsoft.VisualStudio.Component.Debugger.VsDbgExe",
48+
"Microsoft.VisualStudio.Workload.ManagedDesktop",
49+
"Microsoft.VisualStudio.Component.VC.ATL",
50+
"Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native",
51+
"Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
52+
"Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
53+
"Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit",
54+
"Microsoft.VisualStudio.Component.CppBuildInsights",
55+
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake",
56+
"Microsoft.VisualStudio.Component.VC.CMake.Project",
57+
"Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest",
58+
"Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest",
59+
"Microsoft.VisualStudio.Component.VC.ASAN",
60+
"Microsoft.VisualStudio.Component.Vcpkg",
61+
"Microsoft.VisualStudio.Workload.NativeDesktop",
62+
"Microsoft.NetCore.Component.Runtime.8.0",
63+
"Microsoft.Net.Component.4.6.TargetingPack",
64+
"Microsoft.VisualStudio.Component.VSSDK",
65+
"Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites",
66+
"Microsoft.Component.CodeAnalysis.SDK",
67+
"Microsoft.VisualStudio.Workload.VisualStudioExtension"
68+
],
69+
"extensions": []
70+
}

‎.vsts-ci.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ extends:
6464
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6565
parameters:
6666
containers:
67-
azureLinux30Net10BuildAmd64:
67+
azureLinux30Amd64:
6868
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
6969

7070
sdl:
@@ -192,7 +192,7 @@ extends:
192192
runTests: false
193193
### musl ###
194194
- categoryName: musl
195-
container: azureLinux30Net10BuildAmd64
195+
container: azureLinux30Amd64
196196
runtimeIdentifier: linux-musl-x64
197197
publishArgument: $(_publishArgument)
198198
officialBuildProperties: $(_officialBuildProperties)
@@ -201,14 +201,18 @@ extends:
201201
# SBOM generation is not supported for alpine.
202202
enableSbom: false
203203
runTests: false
204+
# Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
205+
disableJob: true
204206
- categoryName: musl
205-
container: azureLinux30Net10BuildAmd64
207+
container: azureLinux30Amd64
206208
targetArchitecture: arm
207209
runtimeIdentifier: linux-musl-arm
208210
publishArgument: $(_publishArgument)
209211
officialBuildProperties: $(_officialBuildProperties)
210212
osProperties: /p:OSName=linux-musl
211213
runTests: false
214+
# Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
215+
disableJob: true
212216
- categoryName: musl
213217
targetArchitecture: arm64
214218
runtimeIdentifier: linux-musl-arm64

‎.vsts-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ variables:
2727

2828
resources:
2929
containers:
30-
- container: azureLinux30Net10BuildAmd64
30+
- container: azureLinux30Amd64
3131
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
3232

3333
stages:

‎Directory.Build.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<TestHostFolder>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)'))</TestHostFolder>
3434
<TestHostDotNetRoot>$([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet'))</TestHostDotNetRoot>
3535
<TestHostDotNetTool>$(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)'))</TestHostDotNetTool>
36+
<TestLayoutDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTmpDir)', 'testing'))</TestLayoutDir>
3637

3738
<PackageProjectUrl>https://github.com/dotnet/sdk</PackageProjectUrl>
3839
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -55,7 +56,8 @@
5556
<!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
5657
Microsoft.ApplicationInsights) -->
5758
<!-- NU1507 Disable multi-feed check as .NET uses multiple internal feeds intentionally -->
58-
<NoWarn>$(NoWarn);NU1701;NU1507;NU1202</NoWarn>
59+
<!-- NU5039 Disable NuGet is unable to find the readme file in the package. -->
60+
<NoWarn>$(NoWarn);NU1701;NU1507;NU1202;NU5039</NoWarn>
5961
<!-- do not enable analyzers on source build-->
6062
<EnforceCodeStyleInBuild Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</EnforceCodeStyleInBuild>
6163
<UseSharedCompilation Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</UseSharedCompilation>

‎build.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ if %errorlevel%==0 (
77
REM skip crossgen for inner-loop builds to save a ton of time
88
set skipFlags="/p:SkipUsingCrossgen=true /p:SkipBuildingInstallers=true"
99
)
10+
set DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT=true
1011
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %skipFlags% %*"
1112
exit /b %ErrorLevel%

‎build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ if [[ "$@" != *"-pack"* ]]; then
1313
skipFlags="/p:SkipUsingCrossgen=true /p:SkipBuildingInstallers=true"
1414
fi
1515

16+
export DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT="true"
1617
. "$ScriptRoot/eng/common/build.sh" --build --restore $skipFlags "$@"

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,13 +553,13 @@
553553
<Uri>https://github.com/dotnet/dotnet</Uri>
554554
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
555555
</Dependency>
556-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25358.3">
556+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25367.1">
557557
<Uri>https://github.com/dotnet/arcade-services</Uri>
558-
<Sha>afa79da3b68fd0fe48d90ea7fcbffbf7789c6d7f</Sha>
558+
<Sha>448a29d2d2e4e27303f728202602708ed45838f5</Sha>
559559
</Dependency>
560-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25358.3">
560+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25367.1">
561561
<Uri>https://github.com/dotnet/arcade-services</Uri>
562-
<Sha>afa79da3b68fd0fe48d90ea7fcbffbf7789c6d7f</Sha>
562+
<Sha>448a29d2d2e4e27303f728202602708ed45838f5</Sha>
563563
</Dependency>
564564
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25367.8">
565565
<Uri>https://github.com/microsoft/testfx</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependency from https://github.com/dotnet/arcade-services -->
92-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25358.3</MicrosoftDotNetDarcLibVersion>
92+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25367.1</MicrosoftDotNetDarcLibVersion>
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependency from https://github.com/dotnet/aspire -->

‎eng/dogfood.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ try {
5252
# Avoid downloading Microsoft.Net.Sdk.Compilers.Toolset from feed
5353
# Locally built SDK package version is Major.Minor.0-dev, which won't be available.
5454
$env:BuildWithNetFrameworkHostedCompiler = $false
55+
$env:DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT=$true
5556

5657
if ($command -eq $null -and $env:DOTNET_SDK_DOGFOOD_SHELL -ne $null) {
5758
$command = , $env:DOTNET_SDK_DOGFOOD_SHELL

0 commit comments

Comments
 (0)