Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into dev/shech/mergeFormat
Browse files Browse the repository at this point in the history
Cosifne committed Mar 8, 2024
2 parents 67ab69a + 383d2f8 commit 6797e2e
Showing 126 changed files with 12,531 additions and 1,379 deletions.
5 changes: 3 additions & 2 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
@@ -122,10 +122,11 @@ stages:
agentOs: Windows_NT_TestAsTools
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
vmImage: 'windows-2019'
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals 1es-windows-2022-open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
demands: ImageOverride -equals 1es-windows-2022
strategy:
matrix:
Build_Debug:
8 changes: 4 additions & 4 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@
/src/Assets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
/src/Assets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
/src/Assets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
/src/RazorSdk/ @dotnet/aspnet-blazor-eng
/src/RazorSdk/ @dotnet/razor-compiler
/test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @dotnet/aspnet-blazor-eng
/test/Microsoft.NET.Sdk.Razor.Tests/ @dotnet/aspnet-blazor-eng
/test/Microsoft.NET.Sdk.Razor.Tool.Tests/ @dotnet/aspnet-blazor-eng
/test/Microsoft.NET.Sdk.Razor.Tests/ @dotnet/razor-compiler
/test/Microsoft.NET.Sdk.Razor.Tool.Tests/ @dotnet/razor-compiler
/src/Assets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
/src/src/Assets/TestProjects/Razor*/ @dotnet/aspnet-blazor-eng
/src/src/Assets/TestProjects/Razor*/ @dotnet/razor-compiler

# Area-Wasm
/src/WasmSdk @lewing @radical @pavelsavara @maraf
268 changes: 134 additions & 134 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

86 changes: 43 additions & 43 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -30,12 +30,12 @@
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.3.24155.8</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.3.24156.25</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.3.24155.8</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.3.24156.25</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
<SystemCommandLineRenderingVersion>0.4.0-alpha.24112.1</SystemCommandLineRenderingVersion>
@@ -48,19 +48,19 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.3.24155.8</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.3.24155.8</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.3.24155.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.3.24156.25</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.3.24156.25</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.3.24156.25</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.3.24155.8</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.3.24155.8</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.3.24155.8</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.3.24156.25</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.3.24156.25</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.3.24156.25</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.3.24155.8</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.3.24155.8</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.3.24155.8</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.3.24155.8</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.3.24155.8</SystemServiceProcessServiceControllerVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.3.24156.25</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.3.24156.25</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.3.24156.25</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.3.24156.25</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.3.24156.25</SystemServiceProcessServiceControllerVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -87,9 +87,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>9.0.0-preview.3.24155.8</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.3.24155.8</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.3.24155.8</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>9.0.0-preview.3.24156.25</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.3.24156.25</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.3.24156.25</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
@@ -117,13 +117,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/templating -->
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.3.24156.11</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.3.24156.12</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
<!-- test dependencies -->
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.3.24156.11</MicrosoftTemplateEngineMocksPackageVersion>
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.3.24156.12</MicrosoftTemplateEngineMocksPackageVersion>
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -134,34 +134,34 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24155.13</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.10.0-3.24155.13</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-3.24155.13</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.10.0-3.24155.13</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.10.0-3.24155.13</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-3.24155.13</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.10.0-3.24155.13</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24156.11</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.10.0-3.24156.11</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-3.24156.11</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.10.0-3.24156.11</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.10.0-3.24156.11</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-3.24156.11</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.10.0-3.24156.11</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.3.24155.10</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.3.24155.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.3.24155.10</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.3.24155.10</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.3.24155.10</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.3.24155.10</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.3.24155.10</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.3.24156.20</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.3.24156.20</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.3.24156.20</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.3.24156.20</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.3.24156.20</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.3.24156.20</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.3.24156.20</MicrosoftAspNetCoreTestHostPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
<PropertyGroup>
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24154.9</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24154.9</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24154.9</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24157.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24157.5</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24157.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.3.24155.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.3.24156.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -175,12 +175,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24154.2</MicrosoftBuildTasksGitVersion>
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24154.2</MicrosoftSourceLinkCommonVersion>
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24154.2</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24154.2</MicrosoftSourceLinkGitHubVersion>
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24154.2</MicrosoftSourceLinkGitLabVersion>
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24154.2</MicrosoftSourceLinkBitbucketGitVersion>
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24155.2</MicrosoftBuildTasksGitVersion>
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24155.2</MicrosoftSourceLinkCommonVersion>
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24155.2</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24155.2</MicrosoftSourceLinkGitHubVersion>
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24155.2</MicrosoftSourceLinkGitLabVersion>
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24155.2</MicrosoftSourceLinkBitbucketGitVersion>
</PropertyGroup>
<!-- Get .NET Framework reference assemblies from NuGet packages -->
<PropertyGroup>
@@ -206,7 +206,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Workloads from dotnet/emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.3.24128.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.3.24155.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</PropertyGroup>

<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.GenerateBlazorWebAssemblyBootJson50" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.UpgradeLegacyWasmStaticWebAssets" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BlazorWriteSatelliteAssemblyFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BlazorReadSatelliteAssemblyFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BrotliCompress" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
@@ -282,15 +283,19 @@ Copyright (c) .NET Foundation. All rights reserved.
<Target Name="_UpdateBlazorWasmStaticWebAssetsForV2" DependsOnTargets="GetCurrentProjectStaticWebAssets">
<ItemGroup>
<_CurrentWasmProjectStaticWebAssets Include="@(_ThisProjectStaticWebAssets)" Condition="'%(SourceId)' == '$(PackageId)'" />
<_CurrentWasmProjectStaticWebAssets>
<!-- We set the asset kind explicitly to build because blazor before 6.0 did its own publishing and was
not fully integrated with static web assets, so we let it be even when called from 6.0 targets
-->
<AssetKind>Build</AssetKind>
</_CurrentWasmProjectStaticWebAssets>
</ItemGroup>

<UpgradeLegacyWasmStaticWebAssets
LegacyAssets="@(_CurrentWasmProjectStaticWebAssets)"
>
<Output TaskParameter="UpgradedAssets" ItemName="_UpgradedWasmProjectStaticWebAssets" />
</UpgradeLegacyWasmStaticWebAssets>

<ItemGroup>
<_ThisProjectStaticWebAssets Remove="@(_CurrentWasmProjectStaticWebAssets)" />
<_ThisProjectStaticWebAssets Include="@(_CurrentWasmProjectStaticWebAssets)" />
<_ThisProjectStaticWebAssets Include="@(_UpgradedWasmProjectStaticWebAssets)" />
</ItemGroup>

</Target>

<Target Name="_BlazorWasmPrepareForRun" DependsOnTargets="_ProcessBlazorWasmOutputs" BeforeTargets="_RazorPrepareForRun" AfterTargets="GetCurrentProjectStaticWebAssets">
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
<BlazorWasmSdkRoot>$(RepoRoot)\src\BlazorWasmSdk\</BlazorWasmSdkRoot>
<PackageId>Microsoft.NET.Sdk.BlazorWebAssembly</PackageId>
<OutDirName>$(Configuration)\Sdks\$(PackageId)\tools</OutDirName>
<DefineConstants>$(DefineConstants);WASM_TASKS</DefineConstants>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
@@ -63,6 +64,7 @@

<ItemGroup>
<Compile Include="**\*.cs" />
<Compile LinkBase="StaticWebAssets" Include="..\..\StaticWebAssetsSdk\Tasks\Data\**\StaticwebAsset.cs" />
</ItemGroup>

<Target Name="PrepareAdditionalFilesToLayout" BeforeTargets="AssignTargetPaths">
Loading
Oops, something went wrong.

0 comments on commit 6797e2e

Please sign in to comment.