Skip to content

Commit 07620ea

Browse files
author
v-wuzhai
authored
[automated] Merge branch 'release/9.0.3xx' => 'main' (#48775)
2 parents c8d913c + e047956 commit 07620ea

17 files changed

+833
-17
lines changed

‎src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetPathPattern.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public StaticWebAssetPathPattern(List<StaticWebAssetPathSegment> segments)
6565
// and other features. This is why we want to bake into the format itself the information that specifies under which paths the file will
6666
// be available at runtime so that tasks/tools can operate independently and produce correct results.
6767
// The current token we support is the 'fingerprint' token, which computes a web friendly version of the hash of the file suitable
68-
// to be embedded in other contexts.
68+
// to be embedded in other contexts.
6969
// We might include other tokens in the future, like `[{basepath}]` to give a file the ability to have its path be relative to the consuming
7070
// project base path, etc.
7171
public static StaticWebAssetPathPattern Parse(ReadOnlyMemory<char> rawPathMemory, string assetIdentity = null)
@@ -296,7 +296,7 @@ public static StaticWebAssetPathPattern Parse(string rawPath, string assetIdenti
296296
public IEnumerable<StaticWebAssetPathPattern> ExpandPatternExpression()
297297
{
298298
// We are going to analyze each segment and produce the following:
299-
// - For literals, we just concatenate
299+
// - For literals, we just concatenate
300300
// - For parameter expressions without '?' we return the parameter expression.
301301
// - For parameter expressions with '?' we return
302302
// For example:

‎src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssetEndpoints.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ private void CreateAnAddEndpoints(
189189
// If in the future we change it to sha384 or sha512, the runtime will not need to be updated.
190190
properties[i++] = new StaticWebAssetEndpointProperty { Name = "integrity", Value = $"sha256-{asset.Integrity}" };
191191

192-
var finalRoute = asset.IsProject() || asset.IsPackage() ? StaticWebAsset.Normalize(Path.Combine(asset.BasePath, route)) : route;
192+
var finalRoute = asset.IsProject() || asset.IsPackage() ? StaticWebAsset.Normalize(Path.Combine(asset.BasePath, route)) : route;
193193

194194
var endpoint = new StaticWebAssetEndpoint()
195195
{

‎src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2626
<!-- Removing the tooling artifacts from all other globs and adding it to the none glob. This ensures that the
2727
up-to-date check is unimpacted by the changes to the tooling artifacts -->
2828
<None Remove="@(_WebToolingArtifacts)" />
29-
<None Include="@(_WebToolingArtifacts)"
29+
<None Include="@(_WebToolingArtifacts->Distinct())"
3030
CopyToOutputDirectory="Never"
3131
CopyToPublishDirectory="Never"
3232
ExcludeFromSingleFile="true" />

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16795,6 +16795,30 @@
1679516795
}
1679616796
],
1679716797
"EndpointProperties": [
16798+
{
16799+
"Name": "PreloadAs",
16800+
"Value": "script"
16801+
},
16802+
{
16803+
"Name": "PreloadCrossorigin",
16804+
"Value": "anonymous"
16805+
},
16806+
{
16807+
"Name": "PreloadGroup",
16808+
"Value": "webassembly"
16809+
},
16810+
{
16811+
"Name": "PreloadOrder",
16812+
"Value": "1"
16813+
},
16814+
{
16815+
"Name": "PreloadPriority",
16816+
"Value": "high"
16817+
},
16818+
{
16819+
"Name": "PreloadRel",
16820+
"Value": "preload"
16821+
},
1679816822
{
1679916823
"Name": "integrity",
1680016824
"Value": "__integrity__"
@@ -36665,6 +36689,30 @@
3666536689
}
3666636690
],
3666736691
"EndpointProperties": [
36692+
{
36693+
"Name": "PreloadAs",
36694+
"Value": "script"
36695+
},
36696+
{
36697+
"Name": "PreloadCrossorigin",
36698+
"Value": "anonymous"
36699+
},
36700+
{
36701+
"Name": "PreloadGroup",
36702+
"Value": "webassembly"
36703+
},
36704+
{
36705+
"Name": "PreloadOrder",
36706+
"Value": "1"
36707+
},
36708+
{
36709+
"Name": "PreloadPriority",
36710+
"Value": "high"
36711+
},
36712+
{
36713+
"Name": "PreloadRel",
36714+
"Value": "preload"
36715+
},
3666836716
{
3666936717
"Name": "integrity",
3667036718
"Value": "__integrity__"

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19109,6 +19109,30 @@
1910919109
}
1911019110
],
1911119111
"EndpointProperties": [
19112+
{
19113+
"Name": "PreloadAs",
19114+
"Value": "script"
19115+
},
19116+
{
19117+
"Name": "PreloadCrossorigin",
19118+
"Value": "anonymous"
19119+
},
19120+
{
19121+
"Name": "PreloadGroup",
19122+
"Value": "webassembly"
19123+
},
19124+
{
19125+
"Name": "PreloadOrder",
19126+
"Value": "1"
19127+
},
19128+
{
19129+
"Name": "PreloadPriority",
19130+
"Value": "high"
19131+
},
19132+
{
19133+
"Name": "PreloadRel",
19134+
"Value": "preload"
19135+
},
1911219136
{
1911319137
"Name": "integrity",
1911419138
"Value": "__integrity__"
@@ -40967,6 +40991,30 @@
4096740991
}
4096840992
],
4096940993
"EndpointProperties": [
40994+
{
40995+
"Name": "PreloadAs",
40996+
"Value": "script"
40997+
},
40998+
{
40999+
"Name": "PreloadCrossorigin",
41000+
"Value": "anonymous"
41001+
},
41002+
{
41003+
"Name": "PreloadGroup",
41004+
"Value": "webassembly"
41005+
},
41006+
{
41007+
"Name": "PreloadOrder",
41008+
"Value": "1"
41009+
},
41010+
{
41011+
"Name": "PreloadPriority",
41012+
"Value": "high"
41013+
},
41014+
{
41015+
"Name": "PreloadRel",
41016+
"Value": "preload"
41017+
},
4097041018
{
4097141019
"Name": "integrity",
4097241020
"Value": "__integrity__"

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

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"Source": "blazorwasm",
1313
"GetPublishAssetsTargets": "ComputeFilesToPublish;GetCurrentProjectPublishStaticWebAssetItems",
1414
"AdditionalPublishProperties": "_PublishingBlazorWasmProject=true;BuildProjectReferences=false;ResolveAssemblyReferencesFindRelatedSatellites=true",
15-
"AdditionalPublishPropertiesToRemove": "NoBuild;RuntimeIdentifier;WebPublishProfileFile;TargetFramework",
15+
"AdditionalPublishPropertiesToRemove": "NoBuild;RuntimeIdentifier;WebPublishProfileFile;TargetFramework;RuntimeIdentifier;SelfContained",
1616
"GetBuildAssetsTargets": "GetCurrentProjectBuildStaticWebAssetItems",
1717
"AdditionalBuildProperties": "",
18-
"AdditionalBuildPropertiesToRemove": "RuntimeIdentifier;SelfContained;WebPublishProfileFile;TargetFramework"
18+
"AdditionalBuildPropertiesToRemove": "RuntimeIdentifier;SelfContained;WebPublishProfileFile;TargetFramework;RuntimeIdentifier;SelfContained"
1919
},
2020
{
2121
"Identity": "${ProjectPath}\\razorclasslibrary\\RazorClassLibrary.csproj",
@@ -17450,6 +17450,30 @@
1745017450
}
1745117451
],
1745217452
"EndpointProperties": [
17453+
{
17454+
"Name": "PreloadAs",
17455+
"Value": "script"
17456+
},
17457+
{
17458+
"Name": "PreloadCrossorigin",
17459+
"Value": "anonymous"
17460+
},
17461+
{
17462+
"Name": "PreloadGroup",
17463+
"Value": "webassembly"
17464+
},
17465+
{
17466+
"Name": "PreloadOrder",
17467+
"Value": "1"
17468+
},
17469+
{
17470+
"Name": "PreloadPriority",
17471+
"Value": "high"
17472+
},
17473+
{
17474+
"Name": "PreloadRel",
17475+
"Value": "preload"
17476+
},
1745317477
{
1745417478
"Name": "integrity",
1745517479
"Value": "__integrity__"
@@ -37620,6 +37644,30 @@
3762037644
}
3762137645
],
3762237646
"EndpointProperties": [
37647+
{
37648+
"Name": "PreloadAs",
37649+
"Value": "script"
37650+
},
37651+
{
37652+
"Name": "PreloadCrossorigin",
37653+
"Value": "anonymous"
37654+
},
37655+
{
37656+
"Name": "PreloadGroup",
37657+
"Value": "webassembly"
37658+
},
37659+
{
37660+
"Name": "PreloadOrder",
37661+
"Value": "1"
37662+
},
37663+
{
37664+
"Name": "PreloadPriority",
37665+
"Value": "high"
37666+
},
37667+
{
37668+
"Name": "PreloadRel",
37669+
"Value": "preload"
37670+
},
3762337671
{
3762437672
"Name": "integrity",
3762537673
"Value": "__integrity__"

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18954,6 +18954,30 @@
1895418954
}
1895518955
],
1895618956
"EndpointProperties": [
18957+
{
18958+
"Name": "PreloadAs",
18959+
"Value": "script"
18960+
},
18961+
{
18962+
"Name": "PreloadCrossorigin",
18963+
"Value": "anonymous"
18964+
},
18965+
{
18966+
"Name": "PreloadGroup",
18967+
"Value": "webassembly"
18968+
},
18969+
{
18970+
"Name": "PreloadOrder",
18971+
"Value": "1"
18972+
},
18973+
{
18974+
"Name": "PreloadPriority",
18975+
"Value": "high"
18976+
},
18977+
{
18978+
"Name": "PreloadRel",
18979+
"Value": "preload"
18980+
},
1895718981
{
1895818982
"Name": "integrity",
1895918983
"Value": "__integrity__"
@@ -19054,6 +19078,30 @@
1905419078
}
1905519079
],
1905619080
"EndpointProperties": [
19081+
{
19082+
"Name": "PreloadAs",
19083+
"Value": "script"
19084+
},
19085+
{
19086+
"Name": "PreloadCrossorigin",
19087+
"Value": "anonymous"
19088+
},
19089+
{
19090+
"Name": "PreloadGroup",
19091+
"Value": "webassembly"
19092+
},
19093+
{
19094+
"Name": "PreloadOrder",
19095+
"Value": "1"
19096+
},
19097+
{
19098+
"Name": "PreloadPriority",
19099+
"Value": "high"
19100+
},
19101+
{
19102+
"Name": "PreloadRel",
19103+
"Value": "preload"
19104+
},
1905719105
{
1905819106
"Name": "integrity",
1905919107
"Value": "__integrity__"
@@ -20499,6 +20547,30 @@
2049920547
}
2050020548
],
2050120549
"EndpointProperties": [
20550+
{
20551+
"Name": "PreloadAs",
20552+
"Value": "script"
20553+
},
20554+
{
20555+
"Name": "PreloadCrossorigin",
20556+
"Value": "anonymous"
20557+
},
20558+
{
20559+
"Name": "PreloadGroup",
20560+
"Value": "webassembly"
20561+
},
20562+
{
20563+
"Name": "PreloadOrder",
20564+
"Value": "1"
20565+
},
20566+
{
20567+
"Name": "PreloadPriority",
20568+
"Value": "high"
20569+
},
20570+
{
20571+
"Name": "PreloadRel",
20572+
"Value": "preload"
20573+
},
2050220574
{
2050320575
"Name": "integrity",
2050420576
"Value": "__integrity__"

0 commit comments

Comments
 (0)