Skip to content

Commit 9477201

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'main' into PinAspireTo80
2 parents a4b77a4 + c5e082f commit 9477201

File tree

152 files changed

+4156
-564
lines changed

Some content is hidden

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

152 files changed

+4156
-564
lines changed

‎eng/Version.Details.xml

Lines changed: 110 additions & 110 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
6969
</PropertyGroup>
7070
<PropertyGroup Label="Production dependencies">
71-
<MicrosoftWebXdtPackageVersion>9.0.0-preview.24310.1</MicrosoftWebXdtPackageVersion>
71+
<MicrosoftWebXdtPackageVersion>9.0.0-preview.24317.2</MicrosoftWebXdtPackageVersion>
7272
<MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
7373
<MicrosoftApplicationInsightsPackageVersion>2.22.0</MicrosoftApplicationInsightsPackageVersion>
7474
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
@@ -119,14 +119,14 @@
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Dependency from https://github.com/dotnet/winforms -->
122-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.6.24307.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
122+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.6.24317.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
123123
</PropertyGroup>
124124
<PropertyGroup>
125125
<!-- Dependency from https://github.com/dotnet/test-templates -->
126126
<!-- Supported versions -->
127127
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
128128
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
129-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24303.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
129+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24317.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -149,25 +149,25 @@
149149
</PropertyGroup>
150150
<PropertyGroup>
151151
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
152-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24312.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
153-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.6.24312.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
154-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.6.24312.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
155-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.6.24312.1</MicrosoftWindowsDesktopAppRefPackageVersion>
152+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24317.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
153+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.6.24317.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
154+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.6.24317.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
155+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.6.24317.2</MicrosoftWindowsDesktopAppRefPackageVersion>
156156
</PropertyGroup>
157157
<PropertyGroup>
158158
<!-- Dependencies from https://github.com/nuget/nuget.client -->
159-
<NuGetBuildTasksPackageVersion>6.11.0-rc.95</NuGetBuildTasksPackageVersion>
160-
<NuGetBuildTasksConsolePackageVersion>6.11.0-rc.95</NuGetBuildTasksConsolePackageVersion>
161-
<NuGetLocalizationPackageVersion>6.11.0-rc.95</NuGetLocalizationPackageVersion>
162-
<NuGetBuildTasksPackPackageVersion>6.11.0-rc.95</NuGetBuildTasksPackPackageVersion>
163-
<NuGetCommandLineXPlatPackageVersion>6.11.0-rc.95</NuGetCommandLineXPlatPackageVersion>
164-
<NuGetProjectModelPackageVersion>6.11.0-rc.95</NuGetProjectModelPackageVersion>
165-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.11.0-rc.95</MicrosoftBuildNuGetSdkResolverPackageVersion>
166-
<NuGetCommonPackageVersion>6.11.0-rc.95</NuGetCommonPackageVersion>
167-
<NuGetConfigurationPackageVersion>6.11.0-rc.95</NuGetConfigurationPackageVersion>
168-
<NuGetFrameworksPackageVersion>6.11.0-rc.95</NuGetFrameworksPackageVersion>
169-
<NuGetPackagingPackageVersion>6.11.0-rc.95</NuGetPackagingPackageVersion>
170-
<NuGetVersioningPackageVersion>6.11.0-rc.95</NuGetVersioningPackageVersion>
159+
<NuGetBuildTasksPackageVersion>6.11.0-rc.101</NuGetBuildTasksPackageVersion>
160+
<NuGetBuildTasksConsolePackageVersion>6.11.0-rc.101</NuGetBuildTasksConsolePackageVersion>
161+
<NuGetLocalizationPackageVersion>6.11.0-rc.101</NuGetLocalizationPackageVersion>
162+
<NuGetBuildTasksPackPackageVersion>6.11.0-rc.101</NuGetBuildTasksPackPackageVersion>
163+
<NuGetCommandLineXPlatPackageVersion>6.11.0-rc.101</NuGetCommandLineXPlatPackageVersion>
164+
<NuGetProjectModelPackageVersion>6.11.0-rc.101</NuGetProjectModelPackageVersion>
165+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.11.0-rc.101</MicrosoftBuildNuGetSdkResolverPackageVersion>
166+
<NuGetCommonPackageVersion>6.11.0-rc.101</NuGetCommonPackageVersion>
167+
<NuGetConfigurationPackageVersion>6.11.0-rc.101</NuGetConfigurationPackageVersion>
168+
<NuGetFrameworksPackageVersion>6.11.0-rc.101</NuGetFrameworksPackageVersion>
169+
<NuGetPackagingPackageVersion>6.11.0-rc.101</NuGetPackagingPackageVersion>
170+
<NuGetVersioningPackageVersion>6.11.0-rc.101</NuGetVersioningPackageVersion>
171171
</PropertyGroup>
172172
<PropertyGroup>
173173
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -183,8 +183,8 @@
183183
</PropertyGroup>
184184
<PropertyGroup>
185185
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
186-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24306.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
187-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.24306.2</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
186+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24313.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
187+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.24313.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
188188
</PropertyGroup>
189189
<PropertyGroup>
190190
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -201,37 +201,37 @@
201201
then use that in Directory.Packages.props.
202202
203203
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
204-
<MicrosoftBuildVersion>17.11.0-preview-24312-02</MicrosoftBuildVersion>
205-
<MicrosoftBuildLocalizationVersion>17.11.0-preview-24312-02</MicrosoftBuildLocalizationVersion>
204+
<MicrosoftBuildVersion>17.11.0-preview-24317-01</MicrosoftBuildVersion>
205+
<MicrosoftBuildLocalizationVersion>17.11.0-preview-24317-01</MicrosoftBuildLocalizationVersion>
206206
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
207207
</PropertyGroup>
208208
<PropertyGroup>
209209
<!-- Dependencies from https://github.com/dotnet/templating -->
210-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.6.24310.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
210+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.6.24313.5</MicrosoftTemplateEngineAbstractionsPackageVersion>
211211
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
212212
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
213213
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
214214
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
215215
<!-- test dependencies -->
216-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.6.24310.2</MicrosoftTemplateEngineMocksPackageVersion>
216+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.6.24313.5</MicrosoftTemplateEngineMocksPackageVersion>
217217
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
218218
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
219219
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
223-
<MicrosoftFSharpCompilerPackageVersion>12.8.400-beta.24305.3</MicrosoftFSharpCompilerPackageVersion>
223+
<MicrosoftFSharpCompilerPackageVersion>12.8.400-beta.24317.3</MicrosoftFSharpCompilerPackageVersion>
224224
</PropertyGroup>
225225
<PropertyGroup>
226226
<!-- Dependencies from https://github.com/dotnet/roslyn -->
227-
<MicrosoftNetCompilersToolsetVersion>4.11.0-3.24311.10</MicrosoftNetCompilersToolsetVersion>
228-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.11.0-3.24311.10</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
229-
<MicrosoftCodeAnalysisPackageVersion>4.11.0-3.24311.10</MicrosoftCodeAnalysisPackageVersion>
230-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.11.0-3.24311.10</MicrosoftCodeAnalysisCSharpPackageVersion>
231-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.11.0-3.24311.10</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
232-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.11.0-3.24311.10</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
233-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.11.0-3.24311.10</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
234-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.11.0-3.24311.10</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
227+
<MicrosoftNetCompilersToolsetVersion>4.11.0-3.24317.42</MicrosoftNetCompilersToolsetVersion>
228+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.11.0-3.24317.42</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
229+
<MicrosoftCodeAnalysisPackageVersion>4.11.0-3.24317.42</MicrosoftCodeAnalysisPackageVersion>
230+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.11.0-3.24317.42</MicrosoftCodeAnalysisCSharpPackageVersion>
231+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.11.0-3.24317.42</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
232+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.11.0-3.24317.42</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
233+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.11.0-3.24317.42</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
234+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.11.0-3.24317.42</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -257,8 +257,8 @@
257257
</PropertyGroup>
258258
<PropertyGroup>
259259
<!-- Dependencies from https://github.com/dotnet/wpf -->
260-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.6.24307.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
261-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.6.24307.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
260+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.6.24317.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
261+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.6.24317.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
262262
</PropertyGroup>
263263
<PropertyGroup Label="Runtime and Apphost aliases">
264264
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
@@ -302,10 +302,10 @@
302302
</PropertyGroup>
303303
<PropertyGroup>
304304
<!-- Dependencies from https://github.com/dotnet/arcade -->
305-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
306-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24311.10</MicrosoftDotNetSignToolVersion>
307-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24311.10</MicrosoftDotNetXliffTasksVersion>
308-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24311.10</MicrosoftDotNetXUnitExtensionsVersion>
305+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24314.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
306+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24314.1</MicrosoftDotNetSignToolVersion>
307+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24314.1</MicrosoftDotNetXliffTasksVersion>
308+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24314.1</MicrosoftDotNetXUnitExtensionsVersion>
309309
</PropertyGroup>
310310
<PropertyGroup>
311311
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/cross/build-rootfs.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ __AlpineKeys='
131131
__Keyring=
132132
__SkipSigCheck=0
133133
__UseMirror=0
134+
__UseDeb822Format=0
134135

135136
__UnprocessedBuildArgs=
136137
while :; do
@@ -181,7 +182,6 @@ while :; do
181182
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
182183
__QEMUArch=riscv64
183184
__UbuntuArch=riscv64
184-
__UbuntuRepo="http://deb.debian.org/debian"
185185
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
186186
unset __LLDB_Package
187187

@@ -288,6 +288,12 @@ while :; do
288288
__CodeName=jammy
289289
fi
290290
;;
291+
noble) # Ubuntu 24.04
292+
if [[ "$__CodeName" != "jessie" ]]; then
293+
__CodeName=noble
294+
fi
295+
__UseDeb822Format=1
296+
;;
291297
jessie) # Debian 8
292298
__CodeName=jessie
293299

@@ -732,8 +738,11 @@ elif [[ -n "$__CodeName" ]]; then
732738
fi
733739

734740
# shellcheck disable=SC2086
741+
echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
735742
debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
736-
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list"
743+
mkdir -p "$__RootfsDir/etc/apt/sources.list.d/"
744+
grep -q "Types:" "$__CrossDir/$__BuildArch/sources.list.$__CodeName" && filename="$__CodeName.sources" || filename="$__CodeName.list"
745+
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list.d/$filename"
737746
chroot "$__RootfsDir" apt-get update
738747
chroot "$__RootfsDir" apt-get -f -y install
739748
# shellcheck disable=SC2086

‎eng/common/cross/riscv64/sources.list.noble

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Types: deb
2+
URIs: http://ports.ubuntu.com/ubuntu-ports/
3+
Suites: noble noble-updates noble-backports
4+
Components: main universe restricted multiverse
5+
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
6+
7+
Types: deb
8+
URIs: http://ports.ubuntu.com/ubuntu-ports/
9+
Suites: noble-security
10+
Components: main universe restricted multiverse
11+
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg

‎eng/common/post-build/nuget-validation.ps1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ param(
55
[Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are
66
)
77

8+
# `tools.ps1` checks $ci to perform some actions. Since the post-build
9+
# scripts don't necessarily execute in the same agent that run the
10+
# build.ps1/sh script this variable isn't automatically set.
11+
$ci = $true
12+
$disableConfigureToolsetImport = $true
13+
. $PSScriptRoot\..\tools.ps1
14+
815
try {
916
& $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
1017
}

‎eng/dependabot/Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<ItemGroup>
66
<!--Test dependencies-->
7-
<PackageVersion Include="Verify.Xunit" Version="22.5.0" />
8-
<PackageVersion Include="Verify.DiffPlex" Version="2.3.0" />
7+
<PackageVersion Include="Verify.Xunit" Version="25.0.2" />
8+
<PackageVersion Include="Verify.DiffPlex" Version="3.0.0" />
99
<PackageVersion Include="FakeItEasy" Version="8.0.0" />
1010
<PackageVersion Include="Wcwidth.Sources" Version="2.0.0" />
1111
</ItemGroup>

‎eng/pipelines/templates/jobs/sdk-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ jobs:
113113
displayName: Build
114114
env:
115115
BuildConfig: $(buildConfiguration)
116-
TestFullMSBuild: ${{ parameters.testFullMSBuild }}
117116
118117
############### TESTING ###############
119118
- ${{ if eq(parameters.runTests, true) }}:

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.5.24269.5",
3+
"dotnet": "9.0.100-preview.5.24307.3",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.10",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.10",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24314.1",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2929
<StaticWebAssetProjectMode Condition="'$(StaticWebAssetProjectMode)' == ''">Root</StaticWebAssetProjectMode>
3030
<StaticWebAssetsAdditionalPublishProperties>$(StaticWebAssetsAdditionalPublishProperties);_PublishingBlazorWasmProject=true</StaticWebAssetsAdditionalPublishProperties>
3131
<StaticWebAssetsAdditionalEmbeddedPublishProperties>$(StaticWebAssetsAdditionalEmbeddedPublishProperties);_PublishingBlazorWasmProject=true</StaticWebAssetsAdditionalEmbeddedPublishProperties>
32-
32+
<StaticWebAssetStandaloneHosting Condition="'$(StaticWebAssetStandaloneHosting)' == '' and '$(StaticWebAssetProjectMode)' == 'Root'">true</StaticWebAssetStandaloneHosting>
3333
<StaticWebAssetsGetEmbeddedPublishAssetsTargets>ComputeFilesToPublish;GetCurrentProjectEmbeddedPublishStaticWebAssetItems</StaticWebAssetsGetEmbeddedPublishAssetsTargets>
3434
</PropertyGroup>
3535

‎src/Cli/dotnet/commands/dotnet-help/HelpUsageText.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ internal static class HelpUsageText
2727
2828
sdk-options:
2929
-d|--diagnostics {LocalizableStrings.SDKDiagnosticsCommandDefinition}
30-
-h|--help {LocalizableStrings.HelpDefinition}
30+
-h|--help {LocalizableStrings.SDKOptionsHelpDefinition}
3131
--info {LocalizableStrings.SDKInfoCommandDefinition}
3232
--list-runtimes {LocalizableStrings.SDKListRuntimesCommandDefinition}
3333
--list-sdks {LocalizableStrings.SDKListSdksCommandDefinition}

0 commit comments

Comments
 (0)