Skip to content

Commit a8bfeaf

Browse files
javiercnjaviercn
committed
Update SDK
1 parent 4e0d56f commit a8bfeaf

File tree

5 files changed

+87
-8
lines changed

5 files changed

+87
-8
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: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<StaticWebAssetBasePath>Identity</StaticWebAssetBasePath>
1515
<ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
1616
<DisableStaticWebAssetsBuildPropsFileGeneration>true</DisableStaticWebAssetsBuildPropsFileGeneration>
17+
<DisableStaticWebAssetEndpointsBuildPropsFileGeneration>true</DisableStaticWebAssetEndpointsBuildPropsFileGeneration>
1718
<StaticWebAssetsDisableProjectBuildPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildPropsFileGeneration>
1819
<StaticWebAssetsDisableProjectBuildMultiTargetingPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildMultiTargetingPropsFileGeneration>
1920
<StaticWebAssetsDisableProjectBuildTransitivePropsFileGeneration>true</StaticWebAssetsDisableProjectBuildTransitivePropsFileGeneration>
@@ -89,15 +90,44 @@
8990
<RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
9091
</V5AssetsCandidates>
9192
</ItemGroup>
92-
<DefineStaticWebAssets Condition="'@(V4AssetsCandidates-&gt;Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">
93+
94+
<DefineStaticWebAssets Condition="'@(V4AssetsCandidates->Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">
9395
<Output TaskParameter="Assets" ItemName="V4Assets" />
9496
</DefineStaticWebAssets>
95-
<DefineStaticWebAssets Condition="'@(V5AssetsCandidates-&gt;Count())' != '0'" CandidateAssets="@(V5AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V5" BasePath="$(StaticWebAssetBasePath)">
97+
<DefineStaticWebAssets Condition="'@(V5AssetsCandidates->Count())' != '0'" CandidateAssets="@(V5AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V5" BasePath="$(StaticWebAssetBasePath)">
9698
<Output TaskParameter="Assets" ItemName="V5Assets" />
9799
</DefineStaticWebAssets>
98100

99-
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
100-
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
101+
<DefineStaticWebAssetEndpoints
102+
Condition="'@(V4Assets)' != ''"
103+
CandidateAssets="@(V4Assets)"
104+
ExistingEndpoints="@()"
105+
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
106+
>
107+
<Output TaskParameter="Endpoints" ItemName="V4AssetEndpoints" />
108+
</DefineStaticWebAssetEndpoints>
109+
110+
<DefineStaticWebAssetEndpoints
111+
Condition="'@(V5Assets)' != ''"
112+
CandidateAssets="@(V5Assets)"
113+
ExistingEndpoints="@()"
114+
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
115+
>
116+
<Output TaskParameter="Endpoints" ItemName="V5AssetEndpoints" />
117+
</DefineStaticWebAssetEndpoints>
118+
119+
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
120+
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
121+
122+
<GenerateStaticWebAssetEndpointsPropsFile
123+
StaticWebAssets="@(V4Assets)"
124+
StaticWebAssetEndpoints="@(V4AssetEndpoints)"
125+
TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets" />
126+
127+
<GenerateStaticWebAssetEndpointsPropsFile
128+
StaticWebAssets="@(V5Assets)"
129+
StaticWebAssetEndpoints="@(V5AssetEndpoints)"
130+
TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets" />
101131

102132
<ComputeStaticWebAssetsTargetPaths Assets="@(V4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
103133
<Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
@@ -110,9 +140,15 @@
110140
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V4.targets">
111141
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V4.targets</PackagePath>
112142
</StaticWebAssetPackageFile>
143+
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets">
144+
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V4.endpoints.targets</PackagePath>
145+
</StaticWebAssetPackageFile>
113146
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V5.targets">
114147
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V5.targets</PackagePath>
115148
</StaticWebAssetPackageFile>
149+
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets">
150+
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V5.endpoints.targets</PackagePath>
151+
</StaticWebAssetPackageFile>
116152
</ItemGroup>
117153
</Target>
118154
</Project>

‎src/Identity/UI/src/build/Microsoft.AspNetCore.StaticWebAssets.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<Project>
22
<Import Condition="'$(IdentityUIFrameworkVersion)' == 'Bootstrap4'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.V4.targets"/>
3+
<Import Condition="'$(IdentityUIFrameworkVersion)' == 'Bootstrap4'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.V4.endpoints.targets"/>
34
<Import Condition="'$(IdentityUIFrameworkVersion)' == 'Bootstrap5'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.V5.targets"/>
5+
<Import Condition="'$(IdentityUIFrameworkVersion)' == 'Bootstrap5'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.V5.endpoints.targets"/>
46
</Project>

0 commit comments

Comments
 (0)