Skip to content

Update .NET SDK to 9.0.100-preview.4.24218.26 #55218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Update .NET SDK to 9.0.100-preview.4.24218.26 #55218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0d56f
Update .NET SDK
github-actions[bot] Apr 19, 2024
a8bfeaf
Update SDK
javiercn Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "9.0.100-preview.4.24215.2"
"version": "9.0.100-preview.4.24218.26"
},
"tools": {
"dotnet": "9.0.100-preview.4.24215.2",
"dotnet": "9.0.100-preview.4.24218.26",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
Expand Down
13 changes: 12 additions & 1 deletion src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,21 @@
RelativePathFilter="**.js"
RelativePathPattern="**"
>
<Output TaskParameter="Assets" ItemName="StaticWebAsset" />
<Output TaskParameter="Assets" ItemName="_JSBuildStaticWebAsset" />
</DefineStaticWebAssets>

<DefineStaticWebAssetEndpoints
Condition="'@(_JsBuildOutput)' != ''"
CandidateAssets="@(_JSBuildStaticWebAsset)"
ExistingEndpoints="@()"
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
>
<Output TaskParameter="Endpoints" ItemName="_JSBuildStaticWebAssetEndpoint" />
</DefineStaticWebAssetEndpoints>

<ItemGroup>
<StaticWebAsset Include="@(_JSBuildStaticWebAsset)" />
<StaticWebAssetEndpoint Include="@(_JSBuildStaticWebAssetEndpoint)" />
<_JsBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
<FileWrites Include="$(_JsBuildOutput)" />
</ItemGroup>
Expand Down
13 changes: 12 additions & 1 deletion ...ents/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,21 @@
CandidateAssets="@(_InteropBuildOutput)"
RelativePathFilter="**.js"
>
<Output TaskParameter="Assets" ItemName="StaticWebAsset" />
<Output TaskParameter="Assets" ItemName="_InteropBuildStaticWebAsset" />
</DefineStaticWebAssets>

<DefineStaticWebAssetEndpoints
Condition="'@(_InteropBuildOutput)' != ''"
CandidateAssets="@(_InteropBuildStaticWebAsset)"
ExistingEndpoints="@()"
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
>
<Output TaskParameter="Endpoints" ItemName="_InteropBuildStaticWebAssetEndpoint" />
</DefineStaticWebAssetEndpoints>

<ItemGroup>
<StaticWebAsset Include="@(_InteropBuildStaticWebAsset)" />
<StaticWebAssetEndpoint Include="@(_InteropBuildStaticWebAssetEndpoint)" />
<_InteropBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
<FileWrites Include="$(_InteropBuildOutput)" />
</ItemGroup>
Expand Down
23 changes: 21 additions & 2 deletions ...mbly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,30 @@
<_InteropBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
</ItemGroup>

<DefineStaticWebAssets Condition="'@(_InteropBuildOutput)' != ''" SourceType="Computed" SourceId="$(PackageId)" ContentRoot="$(InteropWorkingDir)dist\$(Configuration)\" BasePath="_content/$(PackageId)" CandidateAssets="@(_InteropBuildOutput)" RelativePathFilter="**.js">
<Output TaskParameter="Assets" ItemName="StaticWebAsset" />
<DefineStaticWebAssets
Condition="'@(_InteropBuildOutput)' != ''"
SourceType="Computed"
SourceId="$(PackageId)"
ContentRoot="$(InteropWorkingDir)dist\$(Configuration)\"
BasePath="_content/$(PackageId)"
CandidateAssets="@(_InteropBuildOutput)"
RelativePathFilter="**.js"
>
<Output TaskParameter="Assets" ItemName="_InteropBuildStaticWebAsset" />
</DefineStaticWebAssets>

<DefineStaticWebAssetEndpoints
Condition="'@(_InteropBuildOutput)' != ''"
CandidateAssets="@(_InteropBuildStaticWebAsset)"
ExistingEndpoints="@()"
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
>
<Output TaskParameter="Endpoints" ItemName="_InteropBuildStaticWebAssetEndpoint" />
</DefineStaticWebAssetEndpoints>

<ItemGroup>
<StaticWebAsset Include="@(_InteropBuildStaticWebAsset)" />
<StaticWebAssetEndpoint Include="@(_InteropBuildStaticWebAssetEndpoint)" />
<_InteropBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
<FileWrites Include="$(_InteropBuildOutput)" />
</ItemGroup>
Expand Down
44 changes: 40 additions & 4 deletions src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<StaticWebAssetBasePath>Identity</StaticWebAssetBasePath>
<ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
<DisableStaticWebAssetsBuildPropsFileGeneration>true</DisableStaticWebAssetsBuildPropsFileGeneration>
<DisableStaticWebAssetEndpointsBuildPropsFileGeneration>true</DisableStaticWebAssetEndpointsBuildPropsFileGeneration>
<StaticWebAssetsDisableProjectBuildPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildPropsFileGeneration>
<StaticWebAssetsDisableProjectBuildMultiTargetingPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildMultiTargetingPropsFileGeneration>
<StaticWebAssetsDisableProjectBuildTransitivePropsFileGeneration>true</StaticWebAssetsDisableProjectBuildTransitivePropsFileGeneration>
Expand Down Expand Up @@ -89,15 +90,44 @@
<RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
</V5AssetsCandidates>
</ItemGroup>
<DefineStaticWebAssets Condition="'@(V4AssetsCandidates-&gt;Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">

<DefineStaticWebAssets Condition="'@(V4AssetsCandidates->Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">
<Output TaskParameter="Assets" ItemName="V4Assets" />
</DefineStaticWebAssets>
<DefineStaticWebAssets Condition="'@(V5AssetsCandidates-&gt;Count())' != '0'" CandidateAssets="@(V5AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V5" BasePath="$(StaticWebAssetBasePath)">
<DefineStaticWebAssets Condition="'@(V5AssetsCandidates->Count())' != '0'" CandidateAssets="@(V5AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V5" BasePath="$(StaticWebAssetBasePath)">
<Output TaskParameter="Assets" ItemName="V5Assets" />
</DefineStaticWebAssets>

<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
<DefineStaticWebAssetEndpoints
Condition="'@(V4Assets)' != ''"
CandidateAssets="@(V4Assets)"
ExistingEndpoints="@()"
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
>
<Output TaskParameter="Endpoints" ItemName="V4AssetEndpoints" />
</DefineStaticWebAssetEndpoints>

<DefineStaticWebAssetEndpoints
Condition="'@(V5Assets)' != ''"
CandidateAssets="@(V5Assets)"
ExistingEndpoints="@()"
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
>
<Output TaskParameter="Endpoints" ItemName="V5AssetEndpoints" />
</DefineStaticWebAssetEndpoints>

<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />

<GenerateStaticWebAssetEndpointsPropsFile
StaticWebAssets="@(V4Assets)"
StaticWebAssetEndpoints="@(V4AssetEndpoints)"
TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets" />

<GenerateStaticWebAssetEndpointsPropsFile
StaticWebAssets="@(V5Assets)"
StaticWebAssetEndpoints="@(V5AssetEndpoints)"
TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets" />

<ComputeStaticWebAssetsTargetPaths Assets="@(V4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
<Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
Expand All @@ -110,9 +140,15 @@
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V4.targets">
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V4.targets</PackagePath>
</StaticWebAssetPackageFile>
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets">
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V4.endpoints.targets</PackagePath>
</StaticWebAssetPackageFile>
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V5.targets">
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V5.targets</PackagePath>
</StaticWebAssetPackageFile>
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets">
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V5.endpoints.targets</PackagePath>
</StaticWebAssetPackageFile>
</ItemGroup>
</Target>
</Project>
2 changes: 2 additions & 0 deletions src/Identity/UI/src/build/Microsoft.AspNetCore.StaticWebAssets.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<Project>
<Import Condition="'$(IdentityUIFrameworkVersion)' == 'Bootstrap4'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.V4.targets"/>
<Import Condition="'$(IdentityUIFrameworkVersion)' == 'Bootstrap4'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.V4.endpoints.targets"/>
<Import Condition="'$(IdentityUIFrameworkVersion)' == 'Bootstrap5'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.V5.targets"/>
<Import Condition="'$(IdentityUIFrameworkVersion)' == 'Bootstrap5'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.V5.endpoints.targets"/>
</Project>