Skip to content

Commit b6489c5

Browse files
committed
Update SDK
1 parent 4e0d56f commit b6489c5

File tree

4 files changed

+47
-6
lines changed

4 files changed

+47
-6
lines changed

src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,21 @@
3232
RelativePathFilter="**.js"
3333
RelativePathPattern="**"
3434
>
35-
<Output TaskParameter="Assets" ItemName="StaticWebAsset" />
35+
<Output TaskParameter="Assets" ItemName="_JSBuildStaticWebAsset" />
3636
</DefineStaticWebAssets>
3737

38+
<DefineStaticWebAssetEndpoints
39+
Condition="'@(_JsBuildOutput)' != ''"
40+
CandidateAssets="@(_JSBuildStaticWebAsset)"
41+
ExistingEndpoints="@()"
42+
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
43+
>
44+
<Output TaskParameter="Endpoints" ItemName="_JSBuildStaticWebAssetEndpoint" />
45+
</DefineStaticWebAssetEndpoints>
46+
3847
<ItemGroup>
48+
<StaticWebAsset Include="@(_JSBuildStaticWebAsset)" />
49+
<StaticWebAssetEndpoint Include="@(_JSBuildStaticWebAssetEndpoint)" />
3950
<_JsBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
4051
<FileWrites Include="$(_JsBuildOutput)" />
4152
</ItemGroup>

src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,21 @@
4444
CandidateAssets="@(_InteropBuildOutput)"
4545
RelativePathFilter="**.js"
4646
>
47-
<Output TaskParameter="Assets" ItemName="StaticWebAsset" />
47+
<Output TaskParameter="Assets" ItemName="_InteropBuildStaticWebAsset" />
4848
</DefineStaticWebAssets>
4949

50+
<DefineStaticWebAssetEndpoints
51+
Condition="'@(_InteropBuildOutput)' != ''"
52+
CandidateAssets="@(_InteropBuildStaticWebAsset)"
53+
ExistingEndpoints="@()"
54+
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
55+
>
56+
<Output TaskParameter="Endpoints" ItemName="_InteropBuildStaticWebAssetEndpoint" />
57+
</DefineStaticWebAssetEndpoints>
58+
5059
<ItemGroup>
60+
<StaticWebAsset Include="@(_InteropBuildStaticWebAsset)" />
61+
<StaticWebAssetEndpoint Include="@(_InteropBuildStaticWebAssetEndpoint)" />
5162
<_InteropBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
5263
<FileWrites Include="$(_InteropBuildOutput)" />
5364
</ItemGroup>

src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,30 @@
4040
<_InteropBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
4141
</ItemGroup>
4242

43-
<DefineStaticWebAssets Condition="'@(_InteropBuildOutput)' != ''" SourceType="Computed" SourceId="$(PackageId)" ContentRoot="$(InteropWorkingDir)dist\$(Configuration)\" BasePath="_content/$(PackageId)" CandidateAssets="@(_InteropBuildOutput)" RelativePathFilter="**.js">
44-
<Output TaskParameter="Assets" ItemName="StaticWebAsset" />
43+
<DefineStaticWebAssets
44+
Condition="'@(_InteropBuildOutput)' != ''"
45+
SourceType="Computed"
46+
SourceId="$(PackageId)"
47+
ContentRoot="$(InteropWorkingDir)dist\$(Configuration)\"
48+
BasePath="_content/$(PackageId)"
49+
CandidateAssets="@(_InteropBuildOutput)"
50+
RelativePathFilter="**.js"
51+
>
52+
<Output TaskParameter="Assets" ItemName="_InteropBuildStaticWebAsset" />
4553
</DefineStaticWebAssets>
4654

55+
<DefineStaticWebAssetEndpoints
56+
Condition="'@(_InteropBuildOutput)' != ''"
57+
CandidateAssets="@(_InteropBuildStaticWebAsset)"
58+
ExistingEndpoints="@()"
59+
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
60+
>
61+
<Output TaskParameter="Endpoints" ItemName="_InteropBuildStaticWebAssetEndpoint" />
62+
</DefineStaticWebAssetEndpoints>
63+
4764
<ItemGroup>
65+
<StaticWebAsset Include="@(_InteropBuildStaticWebAsset)" />
66+
<StaticWebAssetEndpoint Include="@(_InteropBuildStaticWebAssetEndpoint)" />
4867
<_InteropBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
4968
<FileWrites Include="$(_InteropBuildOutput)" />
5069
</ItemGroup>

src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
<Output TaskParameter="Assets" ItemName="V5Assets" />
9797
</DefineStaticWebAssets>
9898

99-
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
100-
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
99+
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
100+
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
101101

102102
<ComputeStaticWebAssetsTargetPaths Assets="@(V4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
103103
<Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />

0 commit comments

Comments
 (0)