Skip to content

Commit f0fc999

Browse files
SimonZhao888SimonZhao888
authored
[main] Source code updates from dotnet/dotnet (#49706)
2 parents 78a3bee + 7c140ef commit f0fc999

17 files changed

+1296
-357
lines changed

‎eng/Version.Details.xml‎

Lines changed: 229 additions & 229 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 112 additions & 112 deletions
Large diffs are not rendered by default.

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
88
},
99
"tools": {
10-
"dotnet": "10.0.100-preview.6.25315.102",
10+
"dotnet": "10.0.100-preview.7.25322.101",
1111
"runtimes": {
1212
"dotnet": [
1313
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.106",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25351.106",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25359.101",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25359.101",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0"
2828
}

‎src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<Import Project="..\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems" Label="Shared" />
34
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
45
<Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
6+
57
<PropertyGroup>
68
<!--
79
dotnet-watch may inject this assembly to .NET 6.0+ app.
@@ -15,11 +17,15 @@
1517
<!-- NuGet -->
1618
<IsPackable>true</IsPackable>
1719
<PackageId>Microsoft.DotNet.HotReload.Agent.Host</PackageId>
18-
<PackageDescription>
19-
Package containing Hot Reload agent host.
20-
</PackageDescription>
20+
<PackageDescription>Package containing Hot Reload agent host.</PackageDescription>
21+
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
2122
</PropertyGroup>
2223

24+
<!-- Reference 6.0.0 targeting packs in Source Build -->
25+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(TargetFramework)' == 'net6.0'">
26+
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
27+
</ItemGroup>
28+
2329
<ItemGroup>
2430
<InternalsVisibleTo Include="Microsoft.Extensions.DotNetDeltaApplier.Tests" />
2531
</ItemGroup>

‎src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<!--
45
Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.
@@ -14,16 +15,22 @@
1415
<IsSourcePackage>true</IsSourcePackage>
1516
<PackageId>Microsoft.DotNet.HotReload.Agent</PackageId>
1617
<IncludeBuildOutput>false</IncludeBuildOutput>
17-
<PackageDescription>
18-
Package containing sources of Hot Reload agent.
19-
</PackageDescription>
18+
<PackageDescription>Package containing sources of Hot Reload agent.</PackageDescription>
2019
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
2120
<NoWarn>$(NoWarn);NU5128</NoWarn>
21+
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
2222
</PropertyGroup>
2323

24+
<!-- Reference 6.0.0 targeting packs in Source Build -->
25+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
26+
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
27+
</ItemGroup>
28+
2429
<!-- Make sure the shared source files do not require any global usings -->
2530
<ItemGroup>
2631
<Using Remove="@(Using)" />
2732
</ItemGroup>
33+
2834
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
35+
2936
</Project>

‎src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ internal static class WorkloadCommandParser
2828
{
2929
public static readonly string DocsLink = "https://aka.ms/dotnet-workload";
3030

31-
private static readonly Command Command = ConstructCommand();
32-
3331
public static readonly Option<bool> InfoOption = new("--info")
3432
{
3533
Description = CliCommandStrings.WorkloadInfoDescription,
@@ -44,11 +42,11 @@ internal static class WorkloadCommandParser
4442

4543
public static Command GetCommand()
4644
{
47-
Command.Options.Add(InfoOption);
48-
Command.Options.Add(VersionOption);
4945
return Command;
5046
}
5147

48+
private static readonly Command Command = ConstructCommand();
49+
5250
internal static string GetWorkloadsVersion(WorkloadInfoHelper workloadInfoHelper = null)
5351
{
5452
workloadInfoHelper ??= new WorkloadInfoHelper(false);
@@ -169,6 +167,9 @@ private static Command ConstructCommand()
169167
command.Subcommands.Add(WorkloadConfigCommandParser.GetCommand());
170168
command.Subcommands.Add(WorkloadHistoryCommandParser.GetCommand());
171169

170+
command.Options.Add(InfoOption);
171+
command.Options.Add(VersionOption);
172+
172173
command.Validators.Add(commandResult =>
173174
{
174175
if (commandResult.GetResult(InfoOption) is null && commandResult.GetResult(VersionOption) is null && !commandResult.Children.Any(child => child is System.CommandLine.Parsing.CommandResult))

‎src/Layout/pkg/dotnet-sdk.proj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
99
<BuildDebPackage Condition="'$(BuildSdkDeb)' == 'true'">true</BuildDebPackage>
1010
<BuildRpmPackage Condition="'$(BuildSdkRpm)' == 'true'">true</BuildRpmPackage>
11+
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
1112
<ProductBrandPrefix>Microsoft .NET</ProductBrandPrefix>
1213
<LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>
1314
<InstallerName>dotnet-sdk</InstallerName>
@@ -98,7 +99,7 @@
9899
</Target>
99100

100101
<Target Name="AddLinuxPackageInformation"
101-
BeforeTargets="GetAdditionalLinuxInstallerProperties"
102+
BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties"
102103
DependsOnTargets="CalculateLinuxNativeInstallerDependencyVersions">
103104

104105
<PropertyGroup>

‎src/Layout/redist/targets/BundledManifests.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
DestinationPath="%(BundledManifests.FeatureBand)/$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/%(BundledManifests.Version)/localize" />
104104
</ItemGroup>
105105

106-
<Error Text="No workload manifest content found." Condition="'@(ManifestContent->Count())' == '0'" />
106+
<Error Text="No workload manifest content found." Condition="'@(BundledManifests)' != '' and '@(ManifestContent)' == ''" />
107107

108108
<Copy SourceFiles="@(ManifestContent)"
109109
DestinationFolder="$(RedistInstallerLayoutPath)sdk-manifests/%(DestinationPath)" />

‎src/Layout/redist/targets/GenerateArchives.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<Target Name="GenerateArchives"
44
DependsOnTargets="GenerateInstallerLayout"
5-
Condition="'$(SkipBuildingInstallers)' != 'true'"
65
AfterTargets="AfterBuild">
76
<!-- When running in Docker under a Windows host, tar is warning "file changed as we read it" for several files and returning exit code 1.
87
So this flag allows that to be ignored. -->

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json‎

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3788,6 +3788,29 @@
37883788
"FileLength": -1,
37893789
"LastWriteTime": "0001-01-01T00:00:00+00:00"
37903790
},
3791+
{
3792+
"Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Threading.AccessControl.wasm",
3793+
"SourceId": "blazorwasm-minimal",
3794+
"SourceType": "Computed",
3795+
"ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\",
3796+
"BasePath": "/",
3797+
"RelativePath": "_framework/System.Threading.AccessControl.wasm",
3798+
"AssetKind": "Build",
3799+
"AssetMode": "All",
3800+
"AssetRole": "Primary",
3801+
"AssetMergeBehavior": "",
3802+
"AssetMergeSource": "",
3803+
"RelatedAsset": "",
3804+
"AssetTraitName": "WasmResource",
3805+
"AssetTraitValue": "runtime",
3806+
"Fingerprint": "__fingerprint__",
3807+
"Integrity": "__integrity__",
3808+
"CopyToOutputDirectory": "PreserveNewest",
3809+
"CopyToPublishDirectory": "Never",
3810+
"OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\System.Threading.AccessControl.wasm",
3811+
"FileLength": -1,
3812+
"LastWriteTime": "0001-01-01T00:00:00+00:00"
3813+
},
37913814
{
37923815
"Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Threading.Channels.wasm",
37933816
"SourceId": "blazorwasm-minimal",
@@ -8503,6 +8526,29 @@
85038526
"FileLength": -1,
85048527
"LastWriteTime": "0001-01-01T00:00:00+00:00"
85058528
},
8529+
{
8530+
"Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Threading.AccessControl.wasm.gz",
8531+
"SourceId": "blazorwasm-minimal",
8532+
"SourceType": "Computed",
8533+
"ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\",
8534+
"BasePath": "/",
8535+
"RelativePath": "_framework/System.Threading.AccessControl.wasm.gz",
8536+
"AssetKind": "Build",
8537+
"AssetMode": "All",
8538+
"AssetRole": "Alternative",
8539+
"AssetMergeBehavior": "",
8540+
"AssetMergeSource": "",
8541+
"RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Threading.AccessControl.wasm",
8542+
"AssetTraitName": "Content-Encoding",
8543+
"AssetTraitValue": "gzip",
8544+
"Fingerprint": "__fingerprint__",
8545+
"Integrity": "__integrity__",
8546+
"CopyToOutputDirectory": "PreserveNewest",
8547+
"CopyToPublishDirectory": "Never",
8548+
"OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\System.Threading.AccessControl.wasm.gz",
8549+
"FileLength": -1,
8550+
"LastWriteTime": "0001-01-01T00:00:00+00:00"
8551+
},
85068552
{
85078553
"Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Threading.Channels.wasm.gz",
85088554
"SourceId": "blazorwasm-minimal",
@@ -15654,6 +15700,43 @@
1565415700
}
1565515701
]
1565615702
},
15703+
{
15704+
"Route": "_framework/System.Threading.AccessControl.wasm",
15705+
"AssetFile": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Threading.AccessControl.wasm",
15706+
"Selectors": [],
15707+
"ResponseHeaders": [
15708+
{
15709+
"Name": "Accept-Ranges",
15710+
"Value": "bytes"
15711+
},
15712+
{
15713+
"Name": "Cache-Control",
15714+
"Value": "no-cache"
15715+
},
15716+
{
15717+
"Name": "Content-Length",
15718+
"Value": "__content-length__"
15719+
},
15720+
{
15721+
"Name": "Content-Type",
15722+
"Value": "application/wasm"
15723+
},
15724+
{
15725+
"Name": "ETag",
15726+
"Value": "__etag__"
15727+
},
15728+
{
15729+
"Name": "Last-Modified",
15730+
"Value": "__last-modified__"
15731+
}
15732+
],
15733+
"EndpointProperties": [
15734+
{
15735+
"Name": "integrity",
15736+
"Value": "__integrity__"
15737+
}
15738+
]
15739+
},
1565715740
{
1565815741
"Route": "_framework/System.Threading.Channels.wasm",
1565915742
"AssetFile": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Threading.Channels.wasm",
@@ -33595,6 +33678,106 @@
3359533678
}
3359633679
]
3359733680
},
33681+
{
33682+
"Route": "_framework/System.Threading.AccessControl.wasm.gz",
33683+
"AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Threading.AccessControl.wasm.gz",
33684+
"Selectors": [],
33685+
"ResponseHeaders": [
33686+
{
33687+
"Name": "Accept-Ranges",
33688+
"Value": "bytes"
33689+
},
33690+
{
33691+
"Name": "Cache-Control",
33692+
"Value": "no-cache"
33693+
},
33694+
{
33695+
"Name": "Content-Encoding",
33696+
"Value": "gzip"
33697+
},
33698+
{
33699+
"Name": "Content-Length",
33700+
"Value": "__content-length__"
33701+
},
33702+
{
33703+
"Name": "Content-Type",
33704+
"Value": "application/wasm"
33705+
},
33706+
{
33707+
"Name": "ETag",
33708+
"Value": "__etag__"
33709+
},
33710+
{
33711+
"Name": "Last-Modified",
33712+
"Value": "__last-modified__"
33713+
},
33714+
{
33715+
"Name": "Vary",
33716+
"Value": "Content-Encoding"
33717+
}
33718+
],
33719+
"EndpointProperties": [
33720+
{
33721+
"Name": "integrity",
33722+
"Value": "__integrity__"
33723+
}
33724+
]
33725+
},
33726+
{
33727+
"Route": "_framework/System.Threading.AccessControl.wasm",
33728+
"AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Threading.AccessControl.wasm.gz",
33729+
"Selectors": [
33730+
{
33731+
"Name": "Content-Encoding",
33732+
"Value": "gzip",
33733+
"Quality": "__quality__"
33734+
}
33735+
],
33736+
"ResponseHeaders": [
33737+
{
33738+
"Name": "Accept-Ranges",
33739+
"Value": "bytes"
33740+
},
33741+
{
33742+
"Name": "Cache-Control",
33743+
"Value": "no-cache"
33744+
},
33745+
{
33746+
"Name": "Content-Encoding",
33747+
"Value": "gzip"
33748+
},
33749+
{
33750+
"Name": "Content-Length",
33751+
"Value": "__content-length__"
33752+
},
33753+
{
33754+
"Name": "Content-Type",
33755+
"Value": "application/wasm"
33756+
},
33757+
{
33758+
"Name": "ETag",
33759+
"Value": "__etag__"
33760+
},
33761+
{
33762+
"Name": "ETag",
33763+
"Value": "__etag__"
33764+
},
33765+
{
33766+
"Name": "Last-Modified",
33767+
"Value": "__last-modified__"
33768+
},
33769+
{
33770+
"Name": "Vary",
33771+
"Value": "Content-Encoding"
33772+
}
33773+
],
33774+
"EndpointProperties": [
33775+
{
33776+
"Name": "integrity",
33777+
"Value": "__integrity__"
33778+
}
33779+
]
33780+
},
3359833781
{
3359933782
"Route": "_framework/System.Threading.Channels.wasm.gz",
3360033783
"AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Threading.Channels.wasm.gz",

0 commit comments

Comments
 (0)