Skip to content

Commit 70e7c55

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'main' into copilot/fix-24591
2 parents fe4cefc + 049672a commit 70e7c55

File tree

54 files changed

+897
-493
lines changed

Some content is hidden

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

54 files changed

+897
-493
lines changed

‎.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2727
- name: Do an initial build to ensure all dependencies are restored
28+
continue-on-error: true
2829
run: |
2930
./build.sh
3031
- name: Put repo-local dotnet install on PATH

‎CODEOWNERS

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,16 @@
3434
/test/dotnet-format.UnitTests @arunchndr
3535

3636
# Area-NuGet
37-
/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team
38-
/test/dotnet-add-package.Tests @dotnet/nuget-team
39-
/src/Cli/dotnet/commands/dotnet-nuget @dotnet/nuget-team
40-
/test/dotnet-nuget.UnitTests @dotnet/nuget-team
41-
/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package @dotnet/nuget-team
42-
/test/dotnet-list-package.Tests @dotnet/nuget-team
37+
/src/Cli/dotnet/Commands/NuGet @dotnet/nuget-team
38+
/src/Cli/dotnet/Commands/Pack @dotnet/nuget-team
39+
/src/Cli/dotnet/Commands/Package @dotnet/nuget-team
40+
/src/Cli/dotnet/Commands/Restore @dotnet/nuget-team
41+
/test/Microsoft.NET.Restore.Tests @dotnet/nuget-team
42+
/test/Microsoft.NET.Pack.Tests @dotnet/nuget-team
43+
/test/dotnet.Tests/CommandTests/NuGet @dotnet/nuget-team
44+
/test/dotnet.Tests/CommandTests/Pack @dotnet/nuget-team
45+
/test/dotnet.Tests/CommandTests/Package @dotnet/nuget-team
46+
/test/dotnet.Tests/CommandTests/Restore @dotnet/nuget-team
4347

4448
# Area-FSharp
4549
/src/Cli/dotnet/commands/dotnet-fsi @dotnet/fsharp

‎Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
<PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)" />
109109
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)" />
110110
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
111+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
111112
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
112113
<PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
113114
<!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ Additionally, the implicit project file has the following customizations:
4545
string? directoryPath = AppContext.GetData("EntryPointFileDirectoryPath") as string;
4646
```
4747

48+
- `FileBasedProgram` property is set to `true` and can be used by SDK targets to detect file-based apps.
49+
4850
## Grow up
4951

5052
When file-based programs reach an inflection point where build customizations in a project file are needed,

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,13 +561,13 @@
561561
<Uri>https://github.com/dotnet/arcade-services</Uri>
562562
<Sha>448a29d2d2e4e27303f728202602708ed45838f5</Sha>
563563
</Dependency>
564-
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25367.8">
564+
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25371.5">
565565
<Uri>https://github.com/microsoft/testfx</Uri>
566-
<Sha>62a0339db2a558ec8bb67f9f17fe6491ccd56c5b</Sha>
566+
<Sha>4a8fcdaacd6ff086be895fc4aaf9e5c7d49e9f24</Sha>
567567
</Dependency>
568-
<Dependency Name="MSTest" Version="3.10.0-preview.25367.8">
568+
<Dependency Name="MSTest" Version="3.10.0-preview.25371.5">
569569
<Uri>https://github.com/microsoft/testfx</Uri>
570-
<Sha>62a0339db2a558ec8bb67f9f17fe6491ccd56c5b</Sha>
570+
<Sha>4a8fcdaacd6ff086be895fc4aaf9e5c7d49e9f24</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: 12 additions & 11 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.25367.8</MicrosoftTestingPlatformVersion>
33+
<MicrosoftTestingPlatformVersion>1.8.0-preview.25371.5</MicrosoftTestingPlatformVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Servicing version information">
3636
<VersionFeature21>30</VersionFeature21>
@@ -39,8 +39,8 @@
3939
<VersionFeature60>36</VersionFeature60>
4040
<VersionFeature70>20</VersionFeature70>
4141
<!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
42-
<VersionFeature80>16</VersionFeature80>
43-
<VersionFeature90>5</VersionFeature90>
42+
<VersionFeature80>17</VersionFeature80>
43+
<VersionFeature90>6</VersionFeature90>
4444
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4545
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4646
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -119,6 +119,7 @@
119119
<SystemCompositionHostingPackageVersion>10.0.0-preview.7.25359.101</SystemCompositionHostingPackageVersion>
120120
<SystemCompositionRuntimePackageVersion>10.0.0-preview.7.25359.101</SystemCompositionRuntimePackageVersion>
121121
<SystemCompositionTypedPartsPackageVersion>10.0.0-preview.7.25359.101</SystemCompositionTypedPartsPackageVersion>
122+
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.0-preview.7.25359.101</SystemDiagnosticsDiagnosticSourcePackageVersion>
122123
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.7.25359.101</SystemConfigurationConfigurationManagerPackageVersion>
123124
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25359.101</SystemReflectionMetadataLoadContextVersion>
124125
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.7.25359.101</SystemResourcesExtensionsPackageVersion>
@@ -307,19 +308,19 @@
307308
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
308309
<AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
309310
<MoqPackageVersion>4.18.4</MoqPackageVersion>
310-
<MSTestVersion>3.10.0-preview.25367.8</MSTestVersion>
311+
<MSTestVersion>3.10.0-preview.25371.5</MSTestVersion>
311312
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
312313
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
313314
<BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>
314315
</PropertyGroup>
315316
<PropertyGroup Label="Workload manifest package versions">
316-
<MauiFeatureBand>10.0.100-preview.5</MauiFeatureBand>
317-
<MauiWorkloadManifestVersion>10.0.0-preview.5.25306.5</MauiWorkloadManifestVersion>
318-
<XamarinAndroidWorkloadManifestVersion>36.0.0-preview.5.116</XamarinAndroidWorkloadManifestVersion>
319-
<XamarinIOSWorkloadManifestVersion>18.4.10622-net10-p5</XamarinIOSWorkloadManifestVersion>
320-
<XamarinMacCatalystWorkloadManifestVersion>18.4.10622-net10-p5</XamarinMacCatalystWorkloadManifestVersion>
321-
<XamarinMacOSWorkloadManifestVersion>15.4.10622-net10-p5</XamarinMacOSWorkloadManifestVersion>
322-
<XamarinTvOSWorkloadManifestVersion>18.4.10622-net10-p5</XamarinTvOSWorkloadManifestVersion>
317+
<MauiFeatureBand>10.0.100-preview.6</MauiFeatureBand>
318+
<MauiWorkloadManifestVersion>10.0.0-preview.6.25359.8</MauiWorkloadManifestVersion>
319+
<XamarinAndroidWorkloadManifestVersion>36.0.0-preview.6.169</XamarinAndroidWorkloadManifestVersion>
320+
<XamarinIOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinIOSWorkloadManifestVersion>
321+
<XamarinMacCatalystWorkloadManifestVersion>18.5.10415-net10-p6</XamarinMacCatalystWorkloadManifestVersion>
322+
<XamarinMacOSWorkloadManifestVersion>15.5.10415-net10-p6</XamarinMacOSWorkloadManifestVersion>
323+
<XamarinTvOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinTvOSWorkloadManifestVersion>
323324
</PropertyGroup>
324325
<PropertyGroup Label="Pinned dependency">
325326
<!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Diagnostics;
5+
6+
namespace Microsoft.DotNet.Cli.Utils;
7+
8+
/// <summary>
9+
/// Contains helpers for working with <see cref="System.Diagnostics.Activity">Activities</see> in the .NET CLI.
10+
/// </summary>
11+
public static class Activities
12+
{
13+
14+
/// <summary>
15+
/// The main entrypoint for creating <see cref="Activity">Activities</see> in the .NET CLI.
16+
/// All activities created in the CLI should use this <see cref="ActivitySource"/>, to allow
17+
/// consumers to easily filter and trace CLI activities.
18+
/// </summary>
19+
public static ActivitySource Source { get; } = new("dotnet-cli", Product.Version);
20+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal class ForwardingAppImplementation
1919
private readonly string? _depsFile;
2020
private readonly string? _runtimeConfig;
2121
private readonly string? _additionalProbingPath;
22-
private Dictionary<string, string> _environmentVariables;
22+
private Dictionary<string, string?> _environmentVariables;
2323

2424
private readonly string[] _allArgs;
2525

@@ -29,7 +29,7 @@ public ForwardingAppImplementation(
2929
string? depsFile = null,
3030
string? runtimeConfig = null,
3131
string? additionalProbingPath = null,
32-
Dictionary<string, string>? environmentVariables = null)
32+
Dictionary<string, string?>? environmentVariables = null)
3333
{
3434
_forwardApplicationPath = forwardApplicationPath;
3535
_argsToForward = argsToForward;
@@ -86,7 +86,7 @@ public ProcessStartInfo GetProcessStartInfo()
8686
return processInfo;
8787
}
8888

89-
public ForwardingAppImplementation WithEnvironmentVariable(string name, string value)
89+
public ForwardingAppImplementation WithEnvironmentVariable(string name, string? value)
9090
{
9191
_environmentVariables.Add(name, value);
9292

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static string MSBuildVersion
3939
// True if, given current state of the class, MSBuild would be executed in its own process.
4040
public bool ExecuteMSBuildOutOfProc => _forwardingApp != null;
4141

42-
private readonly Dictionary<string, string> _msbuildRequiredEnvironmentVariables = GetMSBuildRequiredEnvironmentVariables();
42+
private readonly Dictionary<string, string?> _msbuildRequiredEnvironmentVariables = GetMSBuildRequiredEnvironmentVariables();
4343

4444
private readonly List<string> _msbuildRequiredParameters = [ "-maxcpucount", "--verbosity:m" ];
4545

@@ -112,7 +112,7 @@ private static string EmitProperty(KeyValuePair<string, string> property, string
112112
: $"--{label}:{property.Key}={property.Value}";
113113
}
114114

115-
public void EnvironmentVariable(string name, string value)
115+
public void EnvironmentVariable(string name, string? value)
116116
{
117117
if (_forwardingApp != null)
118118
{
@@ -153,7 +153,7 @@ public int ExecuteInProc(string[] arguments)
153153
Dictionary<string, string?> savedEnvironmentVariables = [];
154154
try
155155
{
156-
foreach (KeyValuePair<string, string> kvp in _msbuildRequiredEnvironmentVariables)
156+
foreach (KeyValuePair<string, string?> kvp in _msbuildRequiredEnvironmentVariables)
157157
{
158158
savedEnvironmentVariables[kvp.Key] = Environment.GetEnvironmentVariable(kvp.Key);
159159
Environment.SetEnvironmentVariable(kvp.Key, kvp.Value);
@@ -218,7 +218,7 @@ private static string GetDotnetPath()
218218
return new Muxer().MuxerPath;
219219
}
220220

221-
internal static Dictionary<string, string> GetMSBuildRequiredEnvironmentVariables()
221+
internal static Dictionary<string, string?> GetMSBuildRequiredEnvironmentVariables()
222222
{
223223
return new()
224224
{

‎src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" PrivateAssets="all" />
5555
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" PrivateAssets="all" />
5656
<PackageReference Include="System.CommandLine" />
57+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
5758
<PackageReference Include="System.IO.Hashing" />
5859
</ItemGroup>
5960

0 commit comments

Comments
 (0)