Skip to content

Commit fe4cefc

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'main' into copilot/fix-24591
2 parents ae4e61f + b64c645 commit fe4cefc

File tree

124 files changed

+12925
-1270
lines changed

Some content is hidden

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

124 files changed

+12925
-1270
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
]

‎.github/workflows/remove-lockdown-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ jobs:
6868
name: 'Branch Lockdown'
6969
});
7070
console.log(`Removed Branch Lockdown label from PR #${pr.number}`);
71-
}
71+
}

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

‎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: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,17 @@
189189
<Uri>https://github.com/nuget/nuget.client</Uri>
190190
<Sha>c21ba3b47e224cf84490bdc53b89e7f9ebcc1841</Sha>
191191
</Dependency>
192-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="18.0.0-preview-25366-02">
192+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="18.0.0-preview-25366-05">
193193
<Uri>https://github.com/microsoft/vstest</Uri>
194-
<Sha>8b102963a8cce7809a6956fe0a6df5cb93b2447a</Sha>
194+
<Sha>ab6e14292ec4aac0c228a6c75e420f0a0461b0e1</Sha>
195195
</Dependency>
196-
<Dependency Name="Microsoft.TestPlatform.CLI" Version="18.0.0-preview-25366-02">
196+
<Dependency Name="Microsoft.TestPlatform.CLI" Version="18.0.0-preview-25366-05">
197197
<Uri>https://github.com/microsoft/vstest</Uri>
198-
<Sha>8b102963a8cce7809a6956fe0a6df5cb93b2447a</Sha>
198+
<Sha>ab6e14292ec4aac0c228a6c75e420f0a0461b0e1</Sha>
199199
</Dependency>
200-
<Dependency Name="Microsoft.TestPlatform.Build" Version="18.0.0-preview-25366-02">
200+
<Dependency Name="Microsoft.TestPlatform.Build" Version="18.0.0-preview-25366-05">
201201
<Uri>https://github.com/microsoft/vstest</Uri>
202-
<Sha>8b102963a8cce7809a6956fe0a6df5cb93b2447a</Sha>
202+
<Sha>ab6e14292ec4aac0c228a6c75e420f0a0461b0e1</Sha>
203203
</Dependency>
204204
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.7.25359.101">
205205
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -225,6 +225,39 @@
225225
<Uri>https://github.com/dotnet/dotnet</Uri>
226226
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
227227
</Dependency>
228+
<!-- Do not use properties based on:
229+
- Microsoft.WindowsDesktop.App.Ref
230+
- Microsoft.WindowsDesktop.App.Internal
231+
- Microsoft.NET.Sdk.WindowsDesktop
232+
- Microsoft.Dotnet.WinForms.ProjectTemplates
233+
- Microsoft.DotNet.Wpf.ProjectTemplates
234+
In VMR builds on non-Windows, they aren't built. Instead, use the following:
235+
- Microsoft.WindowsDesktop.App.Ref - Microsoft.NETCore.App.Ref
236+
- Microsoft.WindowsDesktop.App.Internal - Microsoft.NETCore.Platforms
237+
- Microsoft.NET.Sdk.WindowsDesktop - Microsoft.NETCore.App.Ref
238+
- Microsoft.Dotnet.WinForms.ProjectTemplates - Microsoft.NETCore.Platforms
239+
- Microsoft.DotNet.Wpf.ProjectTemplates - Microsoft.NETCore.Platforms
240+
-->
241+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.7.25359.101">
242+
<Uri>https://github.com/dotnet/dotnet</Uri>
243+
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
244+
</Dependency>
245+
<Dependency Name="Microsoft.WindowsDesktop.App.Internal" Version="10.0.0-preview.7.25359.101">
246+
<Uri>https://github.com/dotnet/dotnet</Uri>
247+
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
248+
</Dependency>
249+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.7.25359.101">
250+
<Uri>https://github.com/dotnet/dotnet</Uri>
251+
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
252+
</Dependency>
253+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.7.25359.101">
254+
<Uri>https://github.com/dotnet/dotnet</Uri>
255+
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
256+
</Dependency>
257+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.7.25359.101">
258+
<Uri>https://github.com/dotnet/dotnet</Uri>
259+
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
260+
</Dependency>
228261
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.7.25359.101">
229262
<Uri>https://github.com/dotnet/dotnet</Uri>
230263
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
@@ -520,21 +553,21 @@
520553
<Uri>https://github.com/dotnet/dotnet</Uri>
521554
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
522555
</Dependency>
523-
<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">
524557
<Uri>https://github.com/dotnet/arcade-services</Uri>
525-
<Sha>afa79da3b68fd0fe48d90ea7fcbffbf7789c6d7f</Sha>
558+
<Sha>448a29d2d2e4e27303f728202602708ed45838f5</Sha>
526559
</Dependency>
527-
<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">
528561
<Uri>https://github.com/dotnet/arcade-services</Uri>
529-
<Sha>afa79da3b68fd0fe48d90ea7fcbffbf7789c6d7f</Sha>
562+
<Sha>448a29d2d2e4e27303f728202602708ed45838f5</Sha>
530563
</Dependency>
531-
<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">
532565
<Uri>https://github.com/microsoft/testfx</Uri>
533-
<Sha>ad90815c3000f49b310707d78c054400f5b8b214</Sha>
566+
<Sha>62a0339db2a558ec8bb67f9f17fe6491ccd56c5b</Sha>
534567
</Dependency>
535-
<Dependency Name="MSTest" Version="3.10.0-preview.25364.2">
568+
<Dependency Name="MSTest" Version="3.10.0-preview.25367.8">
536569
<Uri>https://github.com/microsoft/testfx</Uri>
537-
<Sha>ad90815c3000f49b310707d78c054400f5b8b214</Sha>
570+
<Sha>62a0339db2a558ec8bb67f9f17fe6491ccd56c5b</Sha>
538571
</Dependency>
539572
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.7.25359.101">
540573
<Uri>https://github.com/dotnet/dotnet</Uri>

0 commit comments

Comments
 (0)