Skip to content

Commit a5d2f36

Browse files
MiYanniMiYanni
committed
Merge branch 'main' into AddVSConfig
2 parents c8e4fca + 5b7b6d8 commit a5d2f36

File tree

70 files changed

+1691
-349
lines changed

Some content is hidden

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

70 files changed

+1691
-349
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+
}

‎.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:

‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<!-- Begin: Package sources from dotnet-aspire -->
77
<!-- End: Package sources from dotnet-aspire -->
88
<!-- Begin: Package sources from dotnet-runtime -->
9+
<add key="darc-int-dotnet-runtime-3875b54" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3875b54e/nuget/v3/index.json" />
910
<!-- End: Package sources from dotnet-runtime -->
1011
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1112
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -37,6 +38,7 @@
3738
<clear />
3839
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3940
<!-- Begin: Package sources from dotnet-runtime -->
41+
<add key="darc-int-dotnet-runtime-3875b54" value="true" />
4042
<!-- End: Package sources from dotnet-runtime -->
4143
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4244
</disabledPackageSources>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 46 additions & 13 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="17.15.0-preview-25359-101">
193-
<Uri>https://github.com/dotnet/dotnet</Uri>
194-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
192+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="18.0.0-preview-25366-05">
193+
<Uri>https://github.com/microsoft/vstest</Uri>
194+
<Sha>ab6e14292ec4aac0c228a6c75e420f0a0461b0e1</Sha>
195195
</Dependency>
196-
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.15.0-preview-25359-101">
197-
<Uri>https://github.com/dotnet/dotnet</Uri>
198-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
196+
<Dependency Name="Microsoft.TestPlatform.CLI" Version="18.0.0-preview-25366-05">
197+
<Uri>https://github.com/microsoft/vstest</Uri>
198+
<Sha>ab6e14292ec4aac0c228a6c75e420f0a0461b0e1</Sha>
199199
</Dependency>
200-
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.15.0-preview-25359-101">
201-
<Uri>https://github.com/dotnet/dotnet</Uri>
202-
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
200+
<Dependency Name="Microsoft.TestPlatform.Build" Version="18.0.0-preview-25366-05">
201+
<Uri>https://github.com/microsoft/vstest</Uri>
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,13 +553,13 @@
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>
531564
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25364.2">
532565
<Uri>https://github.com/microsoft/testfx</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
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 -->
@@ -161,9 +161,9 @@
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/Microsoft/vstest -->
164-
<MicrosoftNETTestSdkPackageVersion>17.15.0-preview-25359-101</MicrosoftNETTestSdkPackageVersion>
165-
<MicrosoftTestPlatformCLIPackageVersion>17.15.0-preview-25359-101</MicrosoftTestPlatformCLIPackageVersion>
166-
<MicrosoftTestPlatformBuildPackageVersion>17.15.0-preview-25359-101</MicrosoftTestPlatformBuildPackageVersion>
164+
<MicrosoftNETTestSdkPackageVersion>18.0.0-preview-25366-05</MicrosoftNETTestSdkPackageVersion>
165+
<MicrosoftTestPlatformCLIPackageVersion>18.0.0-preview-25366-05</MicrosoftTestPlatformCLIPackageVersion>
166+
<MicrosoftTestPlatformBuildPackageVersion>18.0.0-preview-25366-05</MicrosoftTestPlatformBuildPackageVersion>
167167
</PropertyGroup>
168168
<PropertyGroup>
169169
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

‎eng/pipelines/templates/jobs/sdk-job-matrix.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ parameters:
1212
runTestsAsTool: true
1313
# This job uses the build step for testing, so the extra test step is not necessary.
1414
runTests: false
15-
# Turn off template engine runs on Windows temporarily until agent images are updated
16-
#- categoryName: TemplateEngine
17-
# testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
18-
# publishXunitResults: true
15+
- categoryName: TemplateEngine
16+
testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
17+
publishXunitResults: true
1918
- categoryName: AoT
2019
runAoTTests: true
2120
### LINUX ###
@@ -29,10 +28,12 @@ parameters:
2928
# Don't run the tests on arm64. Only perform the build itself.
3029
runTests: false
3130
- categoryName: ContainerBased
32-
container: azureLinux30Net10BuildAmd64
31+
container: azureLinux30Amd64
3332
helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-24.04-helix-amd64
3433
osProperties: /p:OSName=linux /p:BuildSdkDeb=true
3534
runTests: true
35+
# Helix is hanging on this job using the container. See: https://github.com/dotnet/dnceng/issues/6000
36+
disableJob: true
3637
- categoryName: TemplateEngine
3738
osProperties: $(linuxOsglibcProperties)
3839
testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
@@ -64,19 +65,22 @@ jobs:
6465
# The parameters sent to this template are also passed to the job, which does include the os-specific jobParameterSets array, but that array itself isn't used in the job.
6566
- ${{ if eq(parameters.pool.os, 'windows') }}:
6667
- ${{ each jobParameters in parameters.windowsJobParameterSets }}:
67-
- template: /eng/pipelines/templates/jobs/sdk-build.yml
68-
parameters:
69-
${{ insert }}: ${{ parameters }}
70-
${{ insert }}: ${{ jobParameters }}
68+
- ${{ if not(jobParameters.disableJob) }}:
69+
- template: /eng/pipelines/templates/jobs/sdk-build.yml
70+
parameters:
71+
${{ insert }}: ${{ parameters }}
72+
${{ insert }}: ${{ jobParameters }}
7173
- ${{ if eq(parameters.pool.os, 'linux') }}:
7274
- ${{ each jobParameters in parameters.linuxJobParameterSets }}:
73-
- template: /eng/pipelines/templates/jobs/sdk-build.yml
74-
parameters:
75-
${{ insert }}: ${{ parameters }}
76-
${{ insert }}: ${{ jobParameters }}
75+
- ${{ if not(jobParameters.disableJob) }}:
76+
- template: /eng/pipelines/templates/jobs/sdk-build.yml
77+
parameters:
78+
${{ insert }}: ${{ parameters }}
79+
${{ insert }}: ${{ jobParameters }}
7780
- ${{ if eq(parameters.pool.os, 'macOS') }}:
7881
- ${{ each jobParameters in parameters.macOSJobParameterSets }}:
79-
- template: /eng/pipelines/templates/jobs/sdk-build.yml
80-
parameters:
81-
${{ insert }}: ${{ parameters }}
82-
${{ insert }}: ${{ jobParameters }}
82+
- ${{ if not(jobParameters.disableJob) }}:
83+
- template: /eng/pipelines/templates/jobs/sdk-build.yml
84+
parameters:
85+
${{ insert }}: ${{ parameters }}
86+
${{ insert }}: ${{ jobParameters }}

‎src/Cli/Microsoft.DotNet.Cli.Utils/Constants.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ public static class Constants
1919

2020
public static readonly string MSBUILD_EXE_PATH = nameof(MSBUILD_EXE_PATH);
2121
public static readonly string MSBuildExtensionsPath = nameof(MSBuildExtensionsPath);
22+
2223
public static readonly string EnableDefaultItems = nameof(EnableDefaultItems);
24+
public static readonly string EnableDefaultContentItems = nameof(EnableDefaultContentItems);
2325
public static readonly string EnableDefaultCompileItems = nameof(EnableDefaultCompileItems);
2426
public static readonly string EnableDefaultEmbeddedResourceItems = nameof(EnableDefaultEmbeddedResourceItems);
2527
public static readonly string EnableDefaultNoneItems = nameof(EnableDefaultNoneItems);

0 commit comments

Comments
 (0)