Skip to content

Commit 84e034b

Browse files
joeloffjoeloff
committed
Merge main
2 parents 8bc686c + b64c645 commit 84e034b

File tree

96 files changed

+12407
-1028
lines changed

Some content is hidden

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

96 files changed

+12407
-1028
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
@@ -9,6 +9,7 @@ if %errorlevel%==0 (
99
REM skip crossgen for inner-loop builds to save a ton of time
1010
set skipFlags="/p:SkipUsingCrossgen=true /p:SkipBuildingInstallers=true"
1111
)
12+
set DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT=true
1213
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %skipFlags% %*"
1314

1415
endlocal

‎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 "$@"

‎documentation/general/dotnet-run-file.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ Similarly, implicit build files like `Directory.Build.props` or `Directory.Packa
125125
> [!CAUTION]
126126
> Multi-file support is postponed for .NET 11.
127127
> In .NET 10, only the single file passed as the command-line argument to `dotnet run` is part of the compilation.
128-
> Specifically, the virtual project has properties `EnableDefaultCompileItems=false` and `EnableDefaultEmbeddedResourceItems=false`
129-
> (which can be customized via `#:property` directives), and a `Compile` item for the entry point file.
128+
> Specifically, the virtual project has property `EnableDefaultCompileItems=false`
129+
> (which can be customized via `#:property` directive), and a `Compile` item for the entry point file.
130130
> During [conversion](#grow-up), any `Content`, `None`, `Compile`, and `EmbeddedResource` items that do not have metadata `ExcludeFromFileBasedAppConversion=true`
131131
> and that are files inside the entry point file's directory tree are copied to the converted directory.
132132
@@ -184,9 +184,12 @@ The subdirectory is created by the SDK CLI with permissions restricting access t
184184
Note that it is possible for multiple users to run the same file-based program, however each user's run uses different build artifacts since the base directory is unique per user.
185185
Apart from keeping the source directory clean, such artifact isolation also avoids clashes of build outputs that are not project-scoped, like `project.assets.json`, in the case of multiple entry-point files.
186186

187-
Artifacts are cleaned periodically by a background task that is started by `dotnet run` and
188-
removes current user's `dotnet run` build outputs that haven't been used in some time.
187+
Artifacts are cleaned periodically (every 2 days) by a background task that is started by `dotnet run` and
188+
removes current user's `dotnet run` build outputs that haven't been used in 30 days.
189189
They are not cleaned immediately because they can be re-used on subsequent runs for better performance.
190+
The automatic cleanup can be disabled by environment variable `DOTNET_CLI_DISABLE_FILE_BASED_APP_ARTIFACTS_AUTOMATIC_CLEANUP=true`,
191+
but other parameters of the automatic cleanup are currently not configurable.
192+
The same cleanup can be performed manually via command `dotnet clean-file-based-app-artifacts`.
190193

191194
## Directives for project metadata
192195

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -553,21 +553,21 @@
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>
564-
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25364.2">
564+
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25367.8">
565565
<Uri>https://github.com/microsoft/testfx</Uri>
566-
<Sha>ad90815c3000f49b310707d78c054400f5b8b214</Sha>
566+
<Sha>62a0339db2a558ec8bb67f9f17fe6491ccd56c5b</Sha>
567567
</Dependency>
568-
<Dependency Name="MSTest" Version="3.10.0-preview.25364.2">
568+
<Dependency Name="MSTest" Version="3.10.0-preview.25367.8">
569569
<Uri>https://github.com/microsoft/testfx</Uri>
570-
<Sha>ad90815c3000f49b310707d78c054400f5b8b214</Sha>
570+
<Sha>62a0339db2a558ec8bb67f9f17fe6491ccd56c5b</Sha>
571571
</Dependency>
572572
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.7.25359.101">
573573
<Uri>https://github.com/dotnet/dotnet</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<UsingToolVSSDK>true</UsingToolVSSDK>
3131
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
3232
<!-- This property is only used in the dotnet test integration tests. -->
33-
<MicrosoftTestingPlatformVersion>1.8.0-preview.25364.2</MicrosoftTestingPlatformVersion>
33+
<MicrosoftTestingPlatformVersion>1.8.0-preview.25367.8</MicrosoftTestingPlatformVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Servicing version information">
3636
<VersionFeature21>30</VersionFeature21>
@@ -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 -->
@@ -310,7 +310,7 @@
310310
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
311311
<AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
312312
<MoqPackageVersion>4.18.4</MoqPackageVersion>
313-
<MSTestVersion>3.10.0-preview.25364.2</MSTestVersion>
313+
<MSTestVersion>3.10.0-preview.25367.8</MSTestVersion>
314314
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
315315
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
316316
<BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>

0 commit comments

Comments
 (0)