Skip to content

Commit 4f08ff1

Browse files
marcpopMSFTmarcpopMSFT
authored
[main] Source code updates from dotnet/dotnet (#49468)
2 parents af64d64 + fde285c commit 4f08ff1

File tree

12 files changed

+557
-357
lines changed

12 files changed

+557
-357
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('ILLUMOS'))">illumos</HostOSName>
2424
<HostOSName Condition="'$(HostOSName)' == '' AND '$(IsLinux)' == 'true'">linux</HostOSName>
2525

26+
<OSName Condition="'$(OSName)' == '' AND $(PortableTargetRid) != ''">$(PortableTargetRid.Substring(0, $(PortableTargetRid.LastIndexOf('-'))))</OSName>
2627
<OSName Condition="'$(OSName)' == '' AND $(TargetRid) != ''">$(TargetRid.Substring(0, $(TargetRid.LastIndexOf('-'))))</OSName>
2728
<OSName Condition="'$(OSName)' == ''">$(HostOSName)</OSName>
2829
</PropertyGroup>

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

‎eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ steps:
3030
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
3131
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
3232
useEsrpCli: true
33+
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
34+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
35+
${{ else }}:
36+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
3337
env:
3438
TeamName: $(_TeamName)
3539
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ steps:
3838
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3939
fi
4040
41-
baseRidArgs=
42-
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
43-
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
44-
fi
45-
4641
portableBuildArgs=
4742
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
4843
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
@@ -55,7 +50,6 @@ steps:
5550
${{ parameters.platform.buildArguments }} \
5651
$internalRuntimeDownloadArgs \
5752
$targetRidArgs \
58-
$baseRidArgs \
5953
$portableBuildArgs \
6054
displayName: Build
6155

‎eng/common/templates/vmr-build-pr.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
2+
#
3+
# It will run a full set of verification jobs defined in:
4+
# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
5+
#
6+
# For repos that do not need to run the full set, you would do the following:
7+
#
8+
# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
9+
#
10+
# 2. Add `verifications` parameter to VMR template reference
11+
#
12+
# Examples:
13+
# - For source-build stage 1 verification, add the following:
14+
# verifications: [ "source-build-stage1" ]
15+
#
16+
# - For Windows only verifications, add the following:
17+
# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
18+
119
trigger: none
220
pr: none
321

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.6.25302.104",
3+
"dotnet": "10.0.100-preview.6.25315.102",
44
"runtimes": {
55
"dotnet": [
66
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25316.103",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25316.103",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25324.103",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25324.103",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

‎src/Layout/Directory.Build.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
<TargetRid Condition="'$(TargetRid)' == ''">$(OSName)-$(TargetArchitecture)</TargetRid>
3434
<ProductMonikerRid>$(TargetRid)</ProductMonikerRid>
3535

36-
<PortableOSName Condition="'$(PortableOSName)' == ''">$(OSName)</PortableOSName>
37-
<PortableRid>$(PortableOSName)-$(TargetArchitecture)</PortableRid>
38-
<PortableProductMonikerRid>$(PortableRid)</PortableProductMonikerRid>
36+
<PortableTargetRid Condition="'$(PortableTargetRid)' == ''">$(OSName)-$(TargetArchitecture)</PortableTargetRid>
37+
<PortableProductMonikerRid>$(PortableTargetRid)</PortableProductMonikerRid>
3938
</PropertyGroup>
4039

4140
<PropertyGroup>

‎src/Layout/redist/targets/GenerateBundledVersions.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
win-x86;
399399
" />
400400

401-
<!-- ILCompiler target RIDs that are officially supported, plus the architecture we are building the product for (OutputRID). See:
401+
<!-- ILCompiler target RIDs that are officially supported, plus the architecture we are building the product for (TargetRid). See:
402402
https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
403403
<ILCompilerSupportedRids Include="
404404
@(Net90ILCompilerSupportedRids);

‎src/RazorSdk/Tool/TagHelperDescriptorJsonConverter.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,6 @@ private static void WriteBoundAttribute(JsonWriter writer, BoundAttributeDescrip
170170
{
171171
writer.WriteStartObject();
172172

173-
writer.WritePropertyName(nameof(BoundAttributeDescriptor.Kind));
174-
writer.WriteValue(boundAttribute.Kind);
175-
176173
writer.WritePropertyName(nameof(BoundAttributeDescriptor.Name));
177174
writer.WriteValue(boundAttribute.Name);
178175

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm",
2626
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.wasm",
2727
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Primitives.wasm",
28+
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Validation.wasm",
2829
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.JSInterop.WebAssembly.wasm",
2930
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.JSInterop.wasm",
3031
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.VisualBasic.Core.wasm",
@@ -267,6 +268,7 @@
267268
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz",
268269
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.wasm.gz",
269270
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Primitives.wasm.gz",
271+
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Validation.wasm.gz",
270272
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.JSInterop.WebAssembly.wasm.gz",
271273
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.JSInterop.wasm.gz",
272274
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.VisualBasic.Core.wasm.gz",
@@ -539,6 +541,8 @@
539541
"${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Options.wasm.gz",
540542
"${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Primitives.wasm",
541543
"${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Primitives.wasm.gz",
544+
"${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Validation.wasm",
545+
"${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Validation.wasm.gz",
542546
"${OutputPath}\\wwwroot\\_framework\\Microsoft.JSInterop.WebAssembly.wasm",
543547
"${OutputPath}\\wwwroot\\_framework\\Microsoft.JSInterop.WebAssembly.wasm.gz",
544548
"${OutputPath}\\wwwroot\\_framework\\Microsoft.JSInterop.wasm",

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

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,29 @@
690690
"FileLength": -1,
691691
"LastWriteTime": "0001-01-01T00:00:00+00:00"
692692
},
693+
{
694+
"Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Validation.wasm",
695+
"SourceId": "blazorwasm",
696+
"SourceType": "Computed",
697+
"ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\",
698+
"BasePath": "/",
699+
"RelativePath": "_framework/Microsoft.Extensions.Validation.wasm",
700+
"AssetKind": "Build",
701+
"AssetMode": "All",
702+
"AssetRole": "Primary",
703+
"AssetMergeBehavior": "",
704+
"AssetMergeSource": "",
705+
"RelatedAsset": "",
706+
"AssetTraitName": "WasmResource",
707+
"AssetTraitValue": "runtime",
708+
"Fingerprint": "__fingerprint__",
709+
"Integrity": "__integrity__",
710+
"CopyToOutputDirectory": "PreserveNewest",
711+
"CopyToPublishDirectory": "Never",
712+
"OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\Microsoft.Extensions.Validation.wasm",
713+
"FileLength": -1,
714+
"LastWriteTime": "0001-01-01T00:00:00+00:00"
715+
},
693716
{
694717
"Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.JSInterop.WebAssembly.wasm",
695718
"SourceId": "blazorwasm",
@@ -6279,6 +6302,29 @@
62796302
"FileLength": -1,
62806303
"LastWriteTime": "0001-01-01T00:00:00+00:00"
62816304
},
6305+
{
6306+
"Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Validation.wasm.gz",
6307+
"SourceId": "blazorwasm",
6308+
"SourceType": "Computed",
6309+
"ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\",
6310+
"BasePath": "/",
6311+
"RelativePath": "_framework/Microsoft.Extensions.Validation.wasm.gz",
6312+
"AssetKind": "Build",
6313+
"AssetMode": "All",
6314+
"AssetRole": "Alternative",
6315+
"AssetMergeBehavior": "",
6316+
"AssetMergeSource": "",
6317+
"RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Validation.wasm",
6318+
"AssetTraitName": "Content-Encoding",
6319+
"AssetTraitValue": "gzip",
6320+
"Fingerprint": "__fingerprint__",
6321+
"Integrity": "__integrity__",
6322+
"CopyToOutputDirectory": "PreserveNewest",
6323+
"CopyToPublishDirectory": "Never",
6324+
"OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\Microsoft.Extensions.Validation.wasm.gz",
6325+
"FileLength": -1,
6326+
"LastWriteTime": "0001-01-01T00:00:00+00:00"
6327+
},
62826328
{
62836329
"Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.JSInterop.WebAssembly.wasm.gz",
62846330
"SourceId": "blazorwasm",
@@ -12630,6 +12676,43 @@
1263012676
}
1263112677
]
1263212678
},
12679+
{
12680+
"Route": "_framework/Microsoft.Extensions.Validation.wasm",
12681+
"AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Validation.wasm",
12682+
"Selectors": [],
12683+
"ResponseHeaders": [
12684+
{
12685+
"Name": "Accept-Ranges",
12686+
"Value": "bytes"
12687+
},
12688+
{
12689+
"Name": "Cache-Control",
12690+
"Value": "no-cache"
12691+
},
12692+
{
12693+
"Name": "Content-Length",
12694+
"Value": "__content-length__"
12695+
},
12696+
{
12697+
"Name": "Content-Type",
12698+
"Value": "application/wasm"
12699+
},
12700+
{
12701+
"Name": "ETag",
12702+
"Value": "__etag__"
12703+
},
12704+
{
12705+
"Name": "Last-Modified",
12706+
"Value": "__last-modified__"
12707+
}
12708+
],
12709+
"EndpointProperties": [
12710+
{
12711+
"Name": "integrity",
12712+
"Value": "__integrity__"
12713+
}
12714+
]
12715+
},
1263312716
{
1263412717
"Route": "_framework/Microsoft.JSInterop.WebAssembly.wasm",
1263512718
"AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.JSInterop.WebAssembly.wasm",
@@ -23346,6 +23429,106 @@
2334623429
}
2334723430
]
2334823431
},
23432+
{
23433+
"Route": "_framework/Microsoft.Extensions.Validation.wasm.gz",
23434+
"AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Validation.wasm.gz",
23435+
"Selectors": [],
23436+
"ResponseHeaders": [
23437+
{
23438+
"Name": "Accept-Ranges",
23439+
"Value": "bytes"
23440+
},
23441+
{
23442+
"Name": "Cache-Control",
23443+
"Value": "no-cache"
23444+
},
23445+
{
23446+
"Name": "Content-Encoding",
23447+
"Value": "gzip"
23448+
},
23449+
{
23450+
"Name": "Content-Length",
23451+
"Value": "__content-length__"
23452+
},
23453+
{
23454+
"Name": "Content-Type",
23455+
"Value": "application/wasm"
23456+
},
23457+
{
23458+
"Name": "ETag",
23459+
"Value": "__etag__"
23460+
},
23461+
{
23462+
"Name": "Last-Modified",
23463+
"Value": "__last-modified__"
23464+
},
23465+
{
23466+
"Name": "Vary",
23467+
"Value": "Content-Encoding"
23468+
}
23469+
],
23470+
"EndpointProperties": [
23471+
{
23472+
"Name": "integrity",
23473+
"Value": "__integrity__"
23474+
}
23475+
]
23476+
},
23477+
{
23478+
"Route": "_framework/Microsoft.Extensions.Validation.wasm",
23479+
"AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Validation.wasm.gz",
23480+
"Selectors": [
23481+
{
23482+
"Name": "Content-Encoding",
23483+
"Value": "gzip",
23484+
"Quality": "__quality__"
23485+
}
23486+
],
23487+
"ResponseHeaders": [
23488+
{
23489+
"Name": "Accept-Ranges",
23490+
"Value": "bytes"
23491+
},
23492+
{
23493+
"Name": "Cache-Control",
23494+
"Value": "no-cache"
23495+
},
23496+
{
23497+
"Name": "Content-Encoding",
23498+
"Value": "gzip"
23499+
},
23500+
{
23501+
"Name": "Content-Length",
23502+
"Value": "__content-length__"
23503+
},
23504+
{
23505+
"Name": "Content-Type",
23506+
"Value": "application/wasm"
23507+
},
23508+
{
23509+
"Name": "ETag",
23510+
"Value": "__etag__"
23511+
},
23512+
{
23513+
"Name": "ETag",
23514+
"Value": "__etag__"
23515+
},
23516+
{
23517+
"Name": "Last-Modified",
23518+
"Value": "__last-modified__"
23519+
},
23520+
{
23521+
"Name": "Vary",
23522+
"Value": "Content-Encoding"
23523+
}
23524+
],
23525+
"EndpointProperties": [
23526+
{
23527+
"Name": "integrity",
23528+
"Value": "__integrity__"
23529+
}
23530+
]
23531+
},
2334923532
{
2335023533
"Route": "_framework/Microsoft.JSInterop.WebAssembly.wasm.gz",
2335123534
"AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.JSInterop.WebAssembly.wasm.gz",

0 commit comments

Comments
 (0)