Skip to content

Commit fa373f7

Browse files
baronfelbaronfel
authored
Merge branch 'main' into update-man-page-2025-06-01
2 parents 85f30f9 + 427918c commit fa373f7

File tree

51 files changed

+1706
-519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1706
-519
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25279.2",
6+
"version": "1.1.0-beta.25302.4",
77
"commands": [
88
"darc"
99
]

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -117,74 +117,74 @@
117117
<Uri>https://github.com/dotnet/dotnet</Uri>
118118
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
119119
</Dependency>
120-
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.65">
120+
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.70">
121121
<Uri>https://github.com/nuget/nuget.client</Uri>
122-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
122+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
123123
</Dependency>
124-
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.65">
124+
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.70">
125125
<Uri>https://github.com/nuget/nuget.client</Uri>
126-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
126+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
127127
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
128128
</Dependency>
129-
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.65">
129+
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.70">
130130
<Uri>https://github.com/nuget/nuget.client</Uri>
131-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
131+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
132132
</Dependency>
133-
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.65">
133+
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.70">
134134
<Uri>https://github.com/nuget/nuget.client</Uri>
135-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
135+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
136136
</Dependency>
137-
<Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.65">
137+
<Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.70">
138138
<Uri>https://github.com/nuget/nuget.client</Uri>
139-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
139+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
140140
</Dependency>
141-
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.65">
141+
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.70">
142142
<Uri>https://github.com/nuget/nuget.client</Uri>
143-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
143+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
144144
</Dependency>
145-
<Dependency Name="NuGet.Common" Version="6.15.0-preview.1.65">
145+
<Dependency Name="NuGet.Common" Version="6.15.0-preview.1.70">
146146
<Uri>https://github.com/nuget/nuget.client</Uri>
147-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
147+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
148148
</Dependency>
149-
<Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.65">
149+
<Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.70">
150150
<Uri>https://github.com/nuget/nuget.client</Uri>
151-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
151+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
152152
</Dependency>
153-
<Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.65">
153+
<Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.70">
154154
<Uri>https://github.com/nuget/nuget.client</Uri>
155-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
155+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
156156
</Dependency>
157-
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.65">
157+
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.70">
158158
<Uri>https://github.com/nuget/nuget.client</Uri>
159-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
159+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
160160
</Dependency>
161-
<Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.65">
161+
<Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.70">
162162
<Uri>https://github.com/nuget/nuget.client</Uri>
163-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
163+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
164164
</Dependency>
165-
<Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.65">
165+
<Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.70">
166166
<Uri>https://github.com/nuget/nuget.client</Uri>
167-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
167+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
168168
</Dependency>
169-
<Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.65">
169+
<Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.70">
170170
<Uri>https://github.com/nuget/nuget.client</Uri>
171-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
171+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
172172
</Dependency>
173-
<Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.65">
173+
<Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.70">
174174
<Uri>https://github.com/nuget/nuget.client</Uri>
175-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
175+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
176176
</Dependency>
177-
<Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.65">
177+
<Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.70">
178178
<Uri>https://github.com/nuget/nuget.client</Uri>
179-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
179+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
180180
</Dependency>
181-
<Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.65">
181+
<Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.70">
182182
<Uri>https://github.com/nuget/nuget.client</Uri>
183-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
183+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
184184
</Dependency>
185-
<Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.65">
185+
<Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.70">
186186
<Uri>https://github.com/nuget/nuget.client</Uri>
187-
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
187+
<Sha>fb8b14ee3c574f9b559fc2057cadd20d55a75526</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.15.0-preview-25265-101">
190190
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -538,21 +538,21 @@
538538
<Uri>https://github.com/dotnet/dotnet</Uri>
539539
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
540540
</Dependency>
541-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25279.2">
541+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25302.4">
542542
<Uri>https://github.com/dotnet/arcade-services</Uri>
543-
<Sha>87c79a328247ccec3af39deaadbd138278451e6a</Sha>
543+
<Sha>8adf0ac5236cea59c0ad336cc818f9acaf8286ec</Sha>
544544
</Dependency>
545-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25279.2">
545+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25302.4">
546546
<Uri>https://github.com/dotnet/arcade-services</Uri>
547-
<Sha>87c79a328247ccec3af39deaadbd138278451e6a</Sha>
547+
<Sha>8adf0ac5236cea59c0ad336cc818f9acaf8286ec</Sha>
548548
</Dependency>
549-
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25279.5">
549+
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25303.2">
550550
<Uri>https://github.com/microsoft/testfx</Uri>
551-
<Sha>3ad345b8c799f4bea89e534acdf2cd70b3055e2d</Sha>
551+
<Sha>fe4cee5f737f70f11657780ab1bd9c0815617b29</Sha>
552552
</Dependency>
553-
<Dependency Name="MSTest" Version="3.10.0-preview.25279.5">
553+
<Dependency Name="MSTest" Version="3.10.0-preview.25303.2">
554554
<Uri>https://github.com/microsoft/testfx</Uri>
555-
<Sha>3ad345b8c799f4bea89e534acdf2cd70b3055e2d</Sha>
555+
<Sha>fe4cee5f737f70f11657780ab1bd9c0815617b29</Sha>
556556
</Dependency>
557557
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.5.25265.101">
558558
<Uri>https://github.com/dotnet/dotnet</Uri>

‎eng/Versions.props

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<UsingToolVSSDK>true</UsingToolVSSDK>
3131
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
3232
<!-- This property is only used in the dotnet test integration tests. -->
33-
<MicrosoftTestingPlatformVersion>1.8.0-preview.25279.5</MicrosoftTestingPlatformVersion>
33+
<MicrosoftTestingPlatformVersion>1.8.0-preview.25303.2</MicrosoftTestingPlatformVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Servicing version information">
3636
<VersionFeature21>30</VersionFeature21>
@@ -63,8 +63,8 @@
6363
<SystemDataSqlClientPackageVersion>4.8.6</SystemDataSqlClientPackageVersion>
6464
<StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
6565
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
66-
<SystemCommandLineVersion>2.0.0-beta5.25265.101</SystemCommandLineVersion>
67-
<SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25227.101</SystemCommandLineNamingConventionBinderVersion>
66+
<SystemCommandLineVersion>2.0.0-beta5.25279.2</SystemCommandLineVersion>
67+
<SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25279.2</SystemCommandLineNamingConventionBinderVersion>
6868
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
6969
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
7070
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
@@ -89,7 +89,7 @@
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependency from https://github.com/dotnet/arcade-services -->
92-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25279.2</MicrosoftDotNetDarcLibVersion>
92+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25302.4</MicrosoftDotNetDarcLibVersion>
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependency from https://github.com/dotnet/aspire -->
@@ -155,18 +155,18 @@
155155
</PropertyGroup>
156156
<PropertyGroup>
157157
<!-- Dependencies from https://github.com/nuget/nuget.client -->
158-
<NuGetBuildTasksPackageVersion>6.15.0-preview.1.65</NuGetBuildTasksPackageVersion>
159-
<NuGetBuildTasksConsolePackageVersion>6.15.0-preview.1.65</NuGetBuildTasksConsolePackageVersion>
160-
<NuGetLocalizationPackageVersion>6.15.0-preview.1.65</NuGetLocalizationPackageVersion>
161-
<NuGetBuildTasksPackPackageVersion>6.15.0-preview.1.65</NuGetBuildTasksPackPackageVersion>
162-
<NuGetCommandLineXPlatPackageVersion>6.15.0-preview.1.65</NuGetCommandLineXPlatPackageVersion>
163-
<NuGetProjectModelPackageVersion>6.15.0-preview.1.65</NuGetProjectModelPackageVersion>
164-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.15.0-preview.1.65</MicrosoftBuildNuGetSdkResolverPackageVersion>
165-
<NuGetCommonPackageVersion>6.15.0-preview.1.65</NuGetCommonPackageVersion>
166-
<NuGetConfigurationPackageVersion>6.15.0-preview.1.65</NuGetConfigurationPackageVersion>
167-
<NuGetFrameworksPackageVersion>6.15.0-preview.1.65</NuGetFrameworksPackageVersion>
168-
<NuGetPackagingPackageVersion>6.15.0-preview.1.65</NuGetPackagingPackageVersion>
169-
<NuGetVersioningPackageVersion>6.15.0-preview.1.65</NuGetVersioningPackageVersion>
158+
<NuGetBuildTasksPackageVersion>6.15.0-preview.1.70</NuGetBuildTasksPackageVersion>
159+
<NuGetBuildTasksConsolePackageVersion>6.15.0-preview.1.70</NuGetBuildTasksConsolePackageVersion>
160+
<NuGetLocalizationPackageVersion>6.15.0-preview.1.70</NuGetLocalizationPackageVersion>
161+
<NuGetBuildTasksPackPackageVersion>6.15.0-preview.1.70</NuGetBuildTasksPackPackageVersion>
162+
<NuGetCommandLineXPlatPackageVersion>6.15.0-preview.1.70</NuGetCommandLineXPlatPackageVersion>
163+
<NuGetProjectModelPackageVersion>6.15.0-preview.1.70</NuGetProjectModelPackageVersion>
164+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.15.0-preview.1.70</MicrosoftBuildNuGetSdkResolverPackageVersion>
165+
<NuGetCommonPackageVersion>6.15.0-preview.1.70</NuGetCommonPackageVersion>
166+
<NuGetConfigurationPackageVersion>6.15.0-preview.1.70</NuGetConfigurationPackageVersion>
167+
<NuGetFrameworksPackageVersion>6.15.0-preview.1.70</NuGetFrameworksPackageVersion>
168+
<NuGetPackagingPackageVersion>6.15.0-preview.1.70</NuGetPackagingPackageVersion>
169+
<NuGetVersioningPackageVersion>6.15.0-preview.1.70</NuGetVersioningPackageVersion>
170170
</PropertyGroup>
171171
<PropertyGroup>
172172
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -241,7 +241,6 @@
241241
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-preview.5.25265.101</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
242242
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-preview.5.25265.101</MicrosoftAspNetCoreAnalyzersPackageVersion>
243243
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-preview.5.25265.101</MicrosoftAspNetCoreTestHostPackageVersion>
244-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25265.101</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
245244
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-preview.5.25265.101</MicrosoftAspNetCoreAppRefInternalPackageVersion>
246245
<MicrosoftAspNetCoreAuthenticationFacebookVersion>10.0.0-preview.5.25265.101</MicrosoftAspNetCoreAuthenticationFacebookVersion>
247246
<MicrosoftAspNetCoreAuthenticationGoogleVersion>10.0.0-preview.5.25265.101</MicrosoftAspNetCoreAuthenticationGoogleVersion>
@@ -260,7 +259,6 @@
260259
<MicrosoftExtensionsFileProvidersEmbeddedVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsFileProvidersEmbeddedVersion>
261260
<MicrosoftDotNetWebItemTemplates100PackageVersion>10.0.0-preview.5.25265.101</MicrosoftDotNetWebItemTemplates100PackageVersion>
262261
<MicrosoftDotNetWebProjectTemplates100PackageVersion>10.0.0-preview.5.25265.101</MicrosoftDotNetWebProjectTemplates100PackageVersion>
263-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25265.101</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
264262
<dotnetdevcertsPackageVersion>10.0.0-preview.5.25265.101</dotnetdevcertsPackageVersion>
265263
<dotnetuserjwtsPackageVersion>10.0.0-preview.5.25265.101</dotnetuserjwtsPackageVersion>
266264
<dotnetusersecretsPackageVersion>10.0.0-preview.5.25265.101</dotnetusersecretsPackageVersion>
@@ -322,7 +320,7 @@
322320
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
323321
<AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
324322
<MoqPackageVersion>4.18.4</MoqPackageVersion>
325-
<MSTestVersion>3.10.0-preview.25279.5</MSTestVersion>
323+
<MSTestVersion>3.10.0-preview.25303.2</MSTestVersion>
326324
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
327325
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
328326
</PropertyGroup>

‎eng/pipelines/templates/jobs/sdk-job-matrix.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ parameters:
4545
container: centosStream9
4646
helixTargetContainer: $(helixTargetContainerPrefix)centos-stream9-helix
4747
osProperties: /p:OSName=linux
48-
# Skipping all container-based testing for now.
49-
# See: https://github.com/dotnet/sdk/issues/40935
50-
runTests: false
48+
runTests: true
5149
- categoryName: ContainerBased
5250
container: debian12Amd64
5351
helixTargetContainer: $(helixTargetContainerPrefix)debian-11-helix-amd64

‎src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ Copyright (c) .NET Foundation. All rights reserved.
115115
<_BlazorJsFile>
116116
<RelativePath>_framework/%(Filename)%(Extension)</RelativePath>
117117
</_BlazorJsFile>
118+
<!-- Fingerprint only javascript files -->
118119
<_BlazorJSFingerprintPattern Include="Js" Pattern="*.js" Expression="#[.{fingerprint}]!" />
119120

120121
<!-- A missing blazor.webassembly.js is our packaging error. Produce an error so it's discovered early. -->
@@ -158,9 +159,13 @@ Copyright (c) .NET Foundation. All rights reserved.
158159
</Target>
159160

160161
<Target Name="_ReplaceFingerprintedBlazorJsForPublish" DependsOnTargets="ProcessPublishFilesForWasm" Condition="'$(WasmBuildingForNestedPublish)' != 'true' and '$(BlazorFingerprintBlazorJs)' == 'true'">
162+
<PropertyGroup>
163+
<_BlazorJSFileNames>;@(_BlazorJSFile->'%(FileName)');</_BlazorJSFileNames>
164+
</PropertyGroup>
161165
<ItemGroup>
162-
<_BlazorJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(FileName)' == '%(_BlazorJSFile.FileName)'" />
163-
<_BlazorJSPublishCandidate Include="%(_BlazorJSStaticWebAsset.RelativeDir)%(_BlazorJSStaticWebAsset.FileName).%(_BlazorJSStaticWebAsset.Fingerprint)%(_BlazorJSStaticWebAsset.Extension)" />
166+
<_BlazorJSJSStaticWebAsset Include="@(StaticWebAsset)" Condition="$(_BlazorJSFileNames.Contains(';%(FileName);')) and '%(Extension)' == '.js'" />
167+
<_BlazorJSPublishCandidate Include="%(_BlazorJSJSStaticWebAsset.RelativeDir)%(_BlazorJSJSStaticWebAsset.FileName).%(_BlazorJSJSStaticWebAsset.Fingerprint)%(_BlazorJSJSStaticWebAsset.Extension)" />
168+
<_BlazorJSPublishCandidate Remove="@(_BlazorJSPublishCandidate)" Condition="'%(Extension)' == '.map'" />
164169
<_BlazorJSPublishCandidate>
165170
<RelativePath>_framework/$([System.IO.Path]::GetFileNameWithoutExtension('%(Filename)'))%(Extension)</RelativePath>
166171
</_BlazorJSPublishCandidate>
@@ -179,36 +184,36 @@ Copyright (c) .NET Foundation. All rights reserved.
179184
AssetTraitValue="boot"
180185
CopyToOutputDirectory="Never"
181186
CopyToPublishDirectory="PreserveNewest"
182-
ContentRoot="%(_BlazorJSStaticWebAsset.ContentRoot)"
183-
BasePath="%(_BlazorJSStaticWebAsset.BasePath)"
187+
ContentRoot="%(_BlazorJSJSStaticWebAsset.ContentRoot)"
188+
BasePath="%(_BlazorJSJSStaticWebAsset.BasePath)"
184189
>
185-
<Output TaskParameter="Assets" ItemName="_BlazorJSPublishStaticWebAssets" />
190+
<Output TaskParameter="Assets" ItemName="_BlazorJSJSPublishStaticWebAssets" />
186191
</DefineStaticWebAssets>
187192
<DefineStaticWebAssetEndpoints
188-
CandidateAssets="@(_BlazorJSPublishStaticWebAssets)"
193+
CandidateAssets="@(_BlazorJSJSPublishStaticWebAssets)"
189194
ExistingEndpoints="@(StaticWebAssetEndpoint)"
190195
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
191196
>
192-
<Output TaskParameter="Endpoints" ItemName="_BlazorJSPublishStaticWebAssetsEndpoint" />
197+
<Output TaskParameter="Endpoints" ItemName="_BlazorJSJSPublishStaticWebAssetsEndpoint" />
193198
</DefineStaticWebAssetEndpoints>
194199
<PropertyGroup>
195-
<_BlazorJSStaticWebAssetFullPath>@(_BlazorJSStaticWebAsset->'%(FullPath)')</_BlazorJSStaticWebAssetFullPath>
200+
<_BlazorJSJSStaticWebAssetFullPath>@(_BlazorJSJSStaticWebAsset->'%(FullPath)')</_BlazorJSJSStaticWebAssetFullPath>
196201
</PropertyGroup>
197202
<ItemGroup>
198-
<_BlazorJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' == 'Content-Encoding' and '%(RelatedAsset)' == '$(_BlazorJSStaticWebAssetFullPath)'" />
203+
<_BlazorJSJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' == 'Content-Encoding' and '%(RelatedAsset)' == '$(_BlazorJSJSStaticWebAssetFullPath)'" />
199204
</ItemGroup>
200-
<FilterStaticWebAssetEndpoints Condition="'@(_BlazorJSStaticWebAsset)' != ''"
205+
<FilterStaticWebAssetEndpoints Condition="'@(_BlazorJSJSStaticWebAsset)' != ''"
201206
Endpoints="@(StaticWebAssetEndpoint)"
202-
Assets="@(_BlazorJSStaticWebAsset)"
207+
Assets="@(_BlazorJSJSStaticWebAsset)"
203208
Filters=""
204209
>
205210
<Output TaskParameter="FilteredEndpoints" ItemName="_BlazorJSEndpointsToRemove" />
206211
</FilterStaticWebAssetEndpoints>
207212
<ItemGroup>
208-
<StaticWebAsset Remove="@(_BlazorJSStaticWebAsset)" />
209-
<StaticWebAsset Include="@(_BlazorJSPublishStaticWebAssets)" />
213+
<StaticWebAsset Remove="@(_BlazorJSJSStaticWebAsset)" />
214+
<StaticWebAsset Include="@(_BlazorJSJSPublishStaticWebAssets)" />
210215
<StaticWebAssetEndpoint Remove="@(_BlazorJSEndpointsToRemove)" />
211-
<StaticWebAssetEndpoint Include="@(_BlazorJSPublishStaticWebAssetsEndpoint)" />
216+
<StaticWebAssetEndpoint Include="@(_BlazorJSJSPublishStaticWebAssetsEndpoint)" />
212217
</ItemGroup>
213218
</Target>
214219

‎src/Cli/Microsoft.TemplateEngine.Cli/ChoiceTemplateParameter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.CommandLine;
5-
using System.CommandLine.Help;
65
using System.CommandLine.Parsing;
76
using Microsoft.TemplateEngine.Abstractions;
87
using Microsoft.TemplateEngine.Cli.Commands;
8+
using Microsoft.TemplateEngine.Cli.Help;
99
using Microsoft.TemplateEngine.Utils;
1010

1111
namespace Microsoft.TemplateEngine.Cli

0 commit comments

Comments
 (0)