Skip to content

Commit 3121786

Browse files
SimonZhao888SimonZhao888
authored
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-b4c17b4f-68f7-452d-82c7-fe886bc1fc96
2 parents f6e9db8 + 033cdee commit 3121786

12 files changed

+101
-45
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ Coding Style and Changes:
66
Testing:
77
- Large changes should always include test changes.
88
- The Skip parameter of the Fact attribute to point to the specific issue link.
9+
- To run tests in this repo:
10+
- Use the repo-local dotnet instance: `./.dotnet/dotnet`
11+
- For MSTest-style projects: `dotnet test path/to/project.csproj --filter "FullyQualifiedName~TestName"`
12+
- For XUnit test assemblies: `dotnet exec artifacts/bin/redist/Debug/TestAssembly.dll -method "*TestMethodName*"`
13+
- Examples:
14+
- `dotnet test test/dotnet.Tests/dotnet.Tests.csproj --filter "Name~ItShowsTheAppropriateMessageToTheUser"`
15+
- `dotnet exec artifacts/bin/redist/Debug/dotnet.Tests.dll -method "*ItShowsTheAppropriateMessageToTheUser*"`
916

1017
Output Considerations:
1118
- When considering how output should look, solicit advice from baronfel.

‎eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ This file should be imported by eng/Versions.props
141141
<!-- dotnet/core-setup dependencies -->
142142
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
143143
<!-- microsoft/testfx dependencies -->
144-
<MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25425.5</MicrosoftTestingPlatformPackageVersion>
145-
<MSTestPackageVersion>3.11.0-preview.25425.5</MSTestPackageVersion>
144+
<MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25426.4</MicrosoftTestingPlatformPackageVersion>
145+
<MSTestPackageVersion>3.11.0-preview.25426.4</MSTestPackageVersion>
146146
</PropertyGroup>
147147
<!--Property group for alternate package version names-->
148148
<PropertyGroup>

‎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>619d5633513d1b31c528db4360833fce52f51829</Sha>
555555
</Dependency>
556-
<Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25425.5">
556+
<Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25426.4">
557557
<Uri>https://github.com/microsoft/testfx</Uri>
558-
<Sha>0956f7bd3e0fdf2aa34dd392bdefe1dd7619603a</Sha>
558+
<Sha>d2ced942a709b5936d3e7f18d2f16705b391f519</Sha>
559559
</Dependency>
560-
<Dependency Name="MSTest" Version="3.11.0-preview.25425.5">
560+
<Dependency Name="MSTest" Version="3.11.0-preview.25426.4">
561561
<Uri>https://github.com/microsoft/testfx</Uri>
562-
<Sha>0956f7bd3e0fdf2aa34dd392bdefe1dd7619603a</Sha>
562+
<Sha>d2ced942a709b5936d3e7f18d2f16705b391f519</Sha>
563563
</Dependency>
564564
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rc.2.25420.109">
565565
<Uri>https://github.com/dotnet/dotnet</Uri>

‎src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<!-- Intentionally pinned. This feature is supported in projects targeting 8.0 or newer.-->
4-
<!-- This should always use the oldest supported TFM -->
5-
<TargetFramework>net8.0</TargetFramework>
3+
<!--
4+
This assembly may be loaded .NET 6.0+ web server.
5+
When updating the TFM also update minimal supported version in BrowserConnector.cs.
6+
-->
7+
<TargetFramework>net6.0</TargetFramework>
68
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
79

8-
<IsPackable>false</IsPackable>
10+
<IsPackable>true</IsPackable>
11+
<PackageId>Microsoft.DotNet.HotReload.Web.Middleware</PackageId>
12+
<PackageDescription>Package containing Hot Reload middleware.</PackageDescription>
13+
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
914
</PropertyGroup>
1015

1116
<ItemGroup>
@@ -17,9 +22,9 @@
1722
</ItemGroup>
1823

1924
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
20-
<!-- Reference 8.0.0 targeting packs in Source Build -->
21-
<FrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="8.0.0" />
22-
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="8.0.0" />
25+
<!-- Reference 6.0.0 targeting packs in Source Build -->
26+
<FrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="6.0.0" />
27+
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
2328
</ItemGroup>
2429

2530
<ItemGroup>

‎src/BuiltInTools/dotnet-watch/dotnet-watch.csproj‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,25 @@
4949

5050
<ItemGroup>
5151
<ProjectReference Include="$(RepoRoot)\src\Cli\dotnet\dotnet.csproj" />
52-
<ProjectReference Include="..\BrowserRefresh\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework;TargetFrameworks" OutputItemType="Content" TargetPath="middleware\Microsoft.AspNetCore.Watch.BrowserRefresh.dll" CopyToOutputDirectory="PreserveNewest" />
53-
<ProjectReference Include="..\DotNetWatchTasks\DotNetWatchTasks.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework;TargetFrameworks" OutputItemType="Content" CopyToOutputDirectory="PreserveNewest" />
52+
53+
<ProjectReference Include="..\DotNetWatchTasks\DotNetWatchTasks.csproj">
54+
<PrivateAssets>all</PrivateAssets>
55+
<OutputItemType>Content</OutputItemType>
56+
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
57+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
58+
<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
59+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
60+
</ProjectReference>
61+
62+
<ProjectReference Include="..\BrowserRefresh\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj">
63+
<PrivateAssets>all</PrivateAssets>
64+
<OutputItemType>Content</OutputItemType>
65+
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
66+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
67+
<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
68+
<TargetPath>middleware\Microsoft.AspNetCore.Watch.BrowserRefresh.dll</TargetPath>
69+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
70+
</ProjectReference>
5471

5572
<ProjectReference Include="..\DotNetDeltaApplier\Microsoft.Extensions.DotNetDeltaApplier.csproj">
5673
<PrivateAssets>all</PrivateAssets>

‎src/Cli/dotnet/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ private static void ConfigureDotNetForFirstTimeUse(
389389
var environmentPath = EnvironmentPathFactory.CreateEnvironmentPath(isDotnetBeingInvokedFromNativeInstaller, environmentProvider);
390390
_ = new DotNetCommandFactory(alwaysRunOutOfProc: true);
391391
var aspnetCertificateGenerator = new AspNetCoreCertificateGenerator();
392-
var reporter = Reporter.Output;
392+
var reporter = Reporter.Error;
393393
var dotnetConfigurer = new DotnetFirstTimeUseConfigurer(
394394
firstTimeUseNoticeSentinel,
395395
aspNetCertificateSentinel,

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -185,20 +185,28 @@ Copyright (c) .NET Foundation. All rights reserved.
185185
</PropertyGroup>
186186

187187
<!-- Add conditional compilation symbols for the target framework (for example NET461, NETSTANDARD2_0, NETCOREAPP1_0) -->
188-
<PropertyGroup Condition=" '$(DisableImplicitFrameworkDefines)' != 'true' and '$(TargetFrameworkIdentifier)' != '.NETPortable' and '$(TargetFrameworkIdentifier)' != ''">
189-
<_FrameworkIdentifierForImplicitDefine>$(TargetFrameworkIdentifier.Replace('.', '').ToUpperInvariant())</_FrameworkIdentifierForImplicitDefine>
190-
<_FrameworkIdentifierForImplicitDefine Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) ">NET</_FrameworkIdentifierForImplicitDefine>
191-
<VersionlessImplicitFrameworkDefine>$(_FrameworkIdentifierForImplicitDefine)</VersionlessImplicitFrameworkDefine>
192-
<_FrameworkIdentifierForImplicitDefine Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework'">NET</_FrameworkIdentifierForImplicitDefine>
188+
<Target Name="GenerateTargetFrameworkDefineConstants"
189+
Condition=" '$(DisableImplicitFrameworkDefines)' != 'true' and '$(TargetFrameworkIdentifier)' != '.NETPortable' and '$(TargetFrameworkIdentifier)' != ''">
190+
<PropertyGroup>
191+
<_FrameworkIdentifierForImplicitDefine>$(TargetFrameworkIdentifier.Replace('.', '').ToUpperInvariant())</_FrameworkIdentifierForImplicitDefine>
192+
<_FrameworkIdentifierForImplicitDefine Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) ">NET</_FrameworkIdentifierForImplicitDefine>
193+
<VersionlessImplicitFrameworkDefine>$(_FrameworkIdentifierForImplicitDefine)</VersionlessImplicitFrameworkDefine>
194+
<_FrameworkIdentifierForImplicitDefine Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework'">NET</_FrameworkIdentifierForImplicitDefine>
193195

194-
<_FrameworkVersionForImplicitDefine>$(TargetFrameworkVersion.TrimStart('vV'))</_FrameworkVersionForImplicitDefine>
195-
<_FrameworkVersionForImplicitDefine>$(_FrameworkVersionForImplicitDefine.Replace('.', '_'))</_FrameworkVersionForImplicitDefine>
196-
<_FrameworkVersionForImplicitDefine Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework'">$(_FrameworkVersionForImplicitDefine.Replace('_', ''))</_FrameworkVersionForImplicitDefine>
196+
<_FrameworkVersionForImplicitDefine>$(TargetFrameworkVersion.TrimStart('vV'))</_FrameworkVersionForImplicitDefine>
197+
<_FrameworkVersionForImplicitDefine>$(_FrameworkVersionForImplicitDefine.Replace('.', '_'))</_FrameworkVersionForImplicitDefine>
198+
<_FrameworkVersionForImplicitDefine Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework'">$(_FrameworkVersionForImplicitDefine.Replace('_', ''))</_FrameworkVersionForImplicitDefine>
197199

198-
<ImplicitFrameworkDefine>$(_FrameworkIdentifierForImplicitDefine)$(_FrameworkVersionForImplicitDefine)</ImplicitFrameworkDefine>
200+
<ImplicitFrameworkDefine>$(_FrameworkIdentifierForImplicitDefine)$(_FrameworkVersionForImplicitDefine)</ImplicitFrameworkDefine>
199201

200-
<BackwardsCompatFrameworkDefine Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))">$(TargetFrameworkIdentifier.Replace('.', '').ToUpperInvariant())</BackwardsCompatFrameworkDefine>
201-
</PropertyGroup>
202+
<BackwardsCompatFrameworkDefine Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))">$(TargetFrameworkIdentifier.Replace('.', '').ToUpperInvariant())</BackwardsCompatFrameworkDefine>
203+
</PropertyGroup>
204+
<ItemGroup>
205+
<_ImplicitDefineConstant Include="$(VersionlessImplicitFrameworkDefine)" />
206+
<_ImplicitDefineConstant Include="$(ImplicitFrameworkDefine)" />
207+
<_ImplicitDefineConstant Include="$(BackwardsCompatFrameworkDefine)" />
208+
</ItemGroup>
209+
</Target>
202210

203211
<!-- Add conditional compilation symbols for the target platform (for example ANDROID, IOS, WINDOWS) -->
204212
<Target Name="GenerateTargetPlatformDefineConstants"
@@ -242,7 +250,7 @@ Copyright (c) .NET Foundation. All rights reserved.
242250
<!-- Remove TRACE when DisableDiagnosticTracing is true -->
243251
<Target Name="_DisableDiagnosticTracing"
244252
Condition="'$(DisableDiagnosticTracing)' == 'true'"
245-
DependsOnTargets="GenerateTargetPlatformDefineConstants;GenerateNETCompatibleDefineConstants;GeneratePlatformCompatibleDefineConstants"
253+
DependsOnTargets="GenerateTargetFrameworkDefineConstants;GenerateTargetPlatformDefineConstants;GenerateNETCompatibleDefineConstants;GeneratePlatformCompatibleDefineConstants"
246254
BeforeTargets="CoreCompile">
247255
<ItemGroup>
248256
<_DefineConstantsWithoutTrace Include="$(DefineConstants)" />
@@ -264,7 +272,7 @@ Copyright (c) .NET Foundation. All rights reserved.
264272
-->
265273
<Target Name="AddImplicitDefineConstants"
266274
Condition=" '$(DisableImplicitFrameworkDefines)' != 'true' "
267-
DependsOnTargets="GenerateTargetPlatformDefineConstants;GenerateNETCompatibleDefineConstants;GeneratePlatformCompatibleDefineConstants;_DisableDiagnosticTracing"
275+
DependsOnTargets="GenerateTargetFrameworkDefineConstants;GenerateTargetPlatformDefineConstants;GenerateNETCompatibleDefineConstants;GeneratePlatformCompatibleDefineConstants;_DisableDiagnosticTracing"
268276
AfterTargets="PrepareForBuild" >
269277
<PropertyGroup>
270278
<DefineConstants Condition=" '@(_ImplicitDefineConstant)' != '' " >$(DefineConstants);@(_ImplicitDefineConstant)</DefineConstants>

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.CSharp.targets‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ Copyright (c) .NET Foundation. All rights reserved.
3030
<ImplicitConfigurationDefine>$(ImplicitConfigurationDefine.Replace(' ', '_'))</ImplicitConfigurationDefine>
3131
<DefineConstants>$(DefineConstants);$(ImplicitConfigurationDefine)</DefineConstants>
3232
</PropertyGroup>
33-
<PropertyGroup>
34-
<DefineConstants>$(DefineConstants);$(VersionlessImplicitFrameworkDefine);$(ImplicitFrameworkDefine);$(BackwardsCompatFrameworkDefine)</DefineConstants>
35-
</PropertyGroup>
3633

3734
<!-- Enable hot reload in 6.0 and newer C# projects -->
3835
<ItemGroup Condition="'$(SupportsHotReload)' != 'false' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0'))">

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FSharp.targets‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,4 @@ Copyright (c) .NET Foundation. All rights reserved.
2424
</PropertyGroup>
2525
<Import Condition=" '$(UseBundledFSharpTargets)' == 'true' and '$(IsCrossTargetingBuild)' != 'true' and Exists('$(FSharpOverridesTargetsShim)') " Project="$(FSharpOverridesTargetsShim)" />
2626

27-
<PropertyGroup>
28-
<DefineConstants>$(DefineConstants);$(VersionlessImplicitFrameworkDefine);$(ImplicitFrameworkDefine);$(BackwardsCompatFrameworkDefine)</DefineConstants>
29-
</PropertyGroup>
30-
3127
</Project>

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.VisualBasic.targets‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ Copyright (c) .NET Foundation. All rights reserved.
5656
</PropertyGroup>
5757

5858
<PropertyGroup>
59-
<FinalDefineConstants Condition="'$(VersionlessImplicitFrameworkDefine)' != ''">$(FinalDefineConstants),$(VersionlessImplicitFrameworkDefine)=-1</FinalDefineConstants>
60-
<FinalDefineConstants Condition="'$(ImplicitFrameworkDefine)' != ''">$(FinalDefineConstants),$(ImplicitFrameworkDefine)=-1</FinalDefineConstants>
61-
<FinalDefineConstants Condition="'$(BackwardsCompatFrameworkDefine)' != ''">$(FinalDefineConstants),$(BackwardsCompatFrameworkDefine)=-1</FinalDefineConstants>
6259
<FinalDefineConstants Condition="'$(DefineDebug)' != 'true' and '$(ImplicitConfigurationDefine)' != ''">$(FinalDefineConstants),$(ImplicitConfigurationDefine)=-1</FinalDefineConstants>
6360
</PropertyGroup>
6461

0 commit comments

Comments
 (0)